Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_frameworks_base into replicant-6.0

1522 files changed, 101203 insertions, 6171 deletions

diff --git a/Android.mk b/Android.mk
index e7a6038..03651fa 100644
--- a/Android.mk
+++ b/Android.mk
@@ -420,7 +420,7 @@ LOCAL_SRC_FILES += \
 	packages/services/PacProcessor/com/android/net/IProxyService.aidl \
 	packages/services/Proxy/com/android/net/IProxyCallback.aidl \
 	packages/services/Proxy/com/android/net/IProxyPortListener.aidl \
-	../../vendor/cmsdk/src/java/org/cyanogenmod/internal/themes/IIconCacheManager.aidl \
+	../../vendor/cmsdk/sdk/src/java/org/cyanogenmod/internal/themes/IIconCacheManager.aidl \
 
 # FRAMEWORKS_BASE_JAVA_SRC_DIRS comes from build/core/pathmap.mk
 LOCAL_AIDL_INCLUDES += $(FRAMEWORKS_BASE_JAVA_SRC_DIRS)
diff --git a/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java b/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java
index 3ec63b4..8dffe47 100644
--- a/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java
+++ b/cmds/appops/src/com/android/commands/appops/AppOpsCommand.java
@@ -47,7 +47,7 @@ public class AppOpsCommand extends BaseCommand {
                 + "       appops reset [--user <USER_ID>] [<PACKAGE>]\n"
                 + "  <PACKAGE> an Android package name.\n"
                 + "  <OP>      an AppOps operation.\n"
-                + "  <MODE>    one of allow, ignore, deny, or default\n"
+                + "  <MODE>    one of allow, ignore, deny, default, or ask\n"
                 + "  <USER_ID> the user id under which the package is installed. If --user is not\n"
                 + "            specified, the current user is assumed.\n");
     }
@@ -85,6 +85,7 @@ public class AppOpsCommand extends BaseCommand {
     private static final String MODE_DENY = "deny";
     private static final String MODE_IGNORE = "ignore";
     private static final String MODE_DEFAULT = "default";
+    private static final String MODE_ASK = "ask";
 
     private int strOpToOp(String op) {
         try {
@@ -154,6 +155,9 @@ public class AppOpsCommand extends BaseCommand {
             case MODE_DEFAULT:
                 modeInt = AppOpsManager.MODE_DEFAULT;
                 break;
+            case MODE_ASK:
+                modeInt = AppOpsManager.MODE_ASK;
+                break;
             default:
                 System.err.println("Error: Mode " + mode + " is not valid,");
                 return;
@@ -242,6 +246,9 @@ public class AppOpsCommand extends BaseCommand {
                     case AppOpsManager.MODE_DEFAULT:
                         System.out.print("default");
                         break;
+                    case AppOpsManager.MODE_ASK:
+                        System.out.print("ask");
+                        break;
                     default:
                         System.out.print("mode=");
                         System.out.print(ent.getMode());
diff --git a/cmds/bootanimation/Android.mk b/cmds/bootanimation/Android.mk
index 0c05ded..1715728 100644
--- a/cmds/bootanimation/Android.mk
+++ b/cmds/bootanimation/Android.mk
@@ -46,6 +46,10 @@ ifeq ($(TARGET_BOOTANIMATION_USE_RGB565),true)
     LOCAL_CFLAGS += -DUSE_565
 endif
 
+ifneq ($(TARGET_BOOTANIMATION_MULTITHREAD_DECODE),false)
+    LOCAL_CFLAGS += -DMULTITHREAD_DECODE
+endif
+
 LOCAL_MODULE:= bootanimation
 
 ifdef TARGET_32_BIT_SURFACEFLINGER
diff --git a/cmds/bootanimation/BootAnimation.cpp b/cmds/bootanimation/BootAnimation.cpp
index 4e7c9c4..8878d05 100644
--- a/cmds/bootanimation/BootAnimation.cpp
+++ b/cmds/bootanimation/BootAnimation.cpp
@@ -27,6 +27,7 @@
 #include <time.h>
 #include <pthread.h>
 #include <sys/select.h>
+#include <sys/syscall.h>
 
 #include <cutils/properties.h>
 
@@ -72,6 +73,7 @@
 #define OEM_SHUTDOWN_ANIMATION_FILE "/oem/media/shutdownanimation.zip"
 #define SYSTEM_SHUTDOWN_ANIMATION_FILE "/system/media/shutdownanimation.zip"
 #define SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE "/system/media/shutdownanimation-encrypted.zip"
+#define THEME_SHUTDOWN_ANIMATION_FILE "/data/system/theme/shutdownanimation.zip"
 
 #define OEM_BOOT_MUSIC_FILE "/oem/media/boot.wav"
 #define SYSTEM_BOOT_MUSIC_FILE "/system/media/boot.wav"
@@ -92,6 +94,11 @@ static pthread_cond_t mp_cond;
 static bool isMPlayerPrepared = false;
 static bool isMPlayerCompleted = false;
 
+#ifdef MULTITHREAD_DECODE
+static const int MAX_DECODE_THREADS = 2;
+static const int MAX_DECODE_CACHE = 3;
+#endif
+
 class MPlayerListener : public MediaPlayerListener
 {
     void notify(int msg, int /*ext1*/, int /*ext2*/, const Parcel * /*obj*/)
@@ -261,16 +268,16 @@ status_t BootAnimation::initTexture(Texture* texture, AssetManager& assets,
     return NO_ERROR;
 }
 
-status_t BootAnimation::initTexture(const Animation::Frame& frame)
+SkBitmap* BootAnimation::decode(const Animation::Frame& frame)
 {
-    //StopWatch watch("blah");
 
-    SkBitmap bitmap;
+    SkBitmap *bitmap = NULL;
     SkMemoryStream  stream(frame.map->getDataPtr(), frame.map->getDataLength());
     SkImageDecoder* codec = SkImageDecoder::Factory(&stream);
     if (codec != NULL) {
+        bitmap = new SkBitmap();
         codec->setDitherImage(false);
-        codec->decode(&stream, &bitmap,
+        codec->decode(&stream, bitmap,
                 #ifdef USE_565
                 kRGB_565_SkColorType,
                 #else
@@ -280,13 +287,23 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame)
         delete codec;
     }
 
-    // ensure we can call getPixels(). No need to call unlock, since the
-    // bitmap will go out of scope when we return from this method.
-    bitmap.lockPixels();
+    return bitmap;
+}
 
-    const int w = bitmap.width();
-    const int h = bitmap.height();
-    const void* p = bitmap.getPixels();
+status_t BootAnimation::initTexture(const Animation::Frame& frame)
+{
+    //StopWatch watch("blah");
+    return initTexture(decode(frame));
+}
+
+status_t BootAnimation::initTexture(SkBitmap *bitmap)
+{
+    // ensure we can call getPixels().
+    bitmap->lockPixels();
+
+    const int w = bitmap->width();
+    const int h = bitmap->height();
+    const void* p = bitmap->getPixels();
 
     GLint crop[4] = { 0, h, w, -h };
     int tw = 1 << (31 - __builtin_clz(w));
@@ -294,7 +311,7 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame)
     if (tw < w) tw <<= 1;
     if (th < h) th <<= 1;
 
-    switch (bitmap.colorType()) {
+    switch (bitmap->colorType()) {
         case kN32_SkColorType:
             if (tw != w || th != h) {
                 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tw, th, 0, GL_RGBA,
@@ -324,6 +341,8 @@ status_t BootAnimation::initTexture(const Animation::Frame& frame)
 
     glTexParameteriv(GL_TEXTURE_2D, GL_TEXTURE_CROP_RECT_OES, crop);
 
+    bitmap->unlockPixels();
+    delete bitmap;
     return NO_ERROR;
 }
 
@@ -407,14 +426,8 @@ status_t BootAnimation::readyToRun() {
             (access(getAnimationFileName(IMG_ENC), R_OK) == 0) &&
             ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_ENC))) != NULL)) ||
 
-            ((access(THEME_BOOTANIMATION_FILE, R_OK) == 0) &&
-            ((zipFile = ZipFileRO::open(THEME_BOOTANIMATION_FILE)) != NULL)) ||
-
-            ((access(OEM_BOOTANIMATION_FILE, R_OK) == 0) &&
-            ((zipFile = ZipFileRO::open(OEM_BOOTANIMATION_FILE)) != NULL)) ||
-
-            ((access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0) &&
-            ((zipFile = ZipFileRO::open(SYSTEM_BOOTANIMATION_FILE)) != NULL)) ||
+            ((access(getAnimationFileName(IMG_THM), R_OK) == 0) &&
+            ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_THM))) != NULL)) ||
 
             ((access(getAnimationFileName(IMG_DATA), R_OK) == 0) &&
             ((zipFile = ZipFileRO::open(getAnimationFileName(IMG_DATA))) != NULL)) ||
@@ -428,29 +441,26 @@ status_t BootAnimation::readyToRun() {
     // Preload the bootanimation zip on memory, so we don't stutter
     // when showing the animation
     FILE* fd;
-    if (encryptedAnimation && access(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, R_OK) == 0)
-        fd = fopen(SYSTEM_ENCRYPTED_BOOTANIMATION_FILE, "r");
-    else if (access(OEM_BOOTANIMATION_FILE, R_OK) == 0)
-        fd = fopen(OEM_BOOTANIMATION_FILE, "r");
-    else if (access(SYSTEM_BOOTANIMATION_FILE, R_OK) == 0)
-        fd = fopen(SYSTEM_BOOTANIMATION_FILE, "r");
+    if (encryptedAnimation && access(getAnimationFileName(IMG_ENC), R_OK) == 0)
+        fd = fopen(getAnimationFileName(IMG_ENC), "r");
+    else if (access(getAnimationFileName(IMG_THM), R_OK) == 0)
+        fd = fopen(getAnimationFileName(IMG_THM), "r");
+    else if (access(getAnimationFileName(IMG_DATA), R_OK) == 0)
+        fd = fopen(getAnimationFileName(IMG_DATA), "r");
+    else if (access(getAnimationFileName(IMG_SYS), R_OK) == 0)
+        fd = fopen(getAnimationFileName(IMG_SYS), "r");
     else
         return NO_ERROR;
 
     if (fd != NULL) {
-        // We could use readahead..
-        // ... if bionic supported it :(
-        //readahead(fd, 0, INT_MAX);
-        void *crappyBuffer = malloc(2*1024*1024);
-        if (crappyBuffer != NULL) {
-            // Read all the zip
-            while (!feof(fd))
-                fread(crappyBuffer, 1024, 2*1024, fd);
-
-            free(crappyBuffer);
-        } else {
-            ALOGW("Unable to allocate memory to preload the animation");
-        }
+        // Since including fcntl.h doesn't give us the wrapper, use the syscall.
+        // 32 bits takes LO/HI offset (we don't care about endianness of 0).
+#if defined(__aarch64__) || defined(__x86_64__)
+        if (syscall(__NR_readahead, fd, 0, INT_MAX))
+#else
+        if (syscall(__NR_readahead, fd, 0, 0, INT_MAX))
+#endif
+            ALOGW("Unable to cache the animation");
         fclose(fd);
     }
 #endif
@@ -635,11 +645,16 @@ bool BootAnimation::movie()
         char path[ANIM_ENTRY_NAME_MAX];
         char color[7] = "000000"; // default to black if unspecified
 
+        char value[PROPERTY_VALUE_MAX];
         char pathType;
+
+        property_get("persist.bootanimation.scale", value, "1");
+        double bas = atof(value);
+
         if (sscanf(l, "%d %d %d", &width, &height, &fps) == 3) {
             // ALOGD("> w=%d, h=%d, fps=%d", width, height, fps);
-            animation.width = width;
-            animation.height = height;
+            animation.width = width * bas;
+            animation.height = height * bas;
             animation.fps = fps;
         }
         else if (sscanf(l, " %c %d %d %s #%6s", &pathType, &count, &pause, path, color) >= 4) {
@@ -788,6 +803,14 @@ bool BootAnimation::movie()
                     part.backgroundColor[2],
                     1.0f);
 
+#ifdef MULTITHREAD_DECODE
+            FrameManager *frameManager = NULL;
+            if (r == 0 || needSaveMem) {
+                frameManager = new FrameManager(MAX_DECODE_THREADS,
+                    MAX_DECODE_CACHE, part.frames);
+            }
+#endif
+
             for (size_t j=0 ; j<fcount && (!exitPending() || part.playUntilComplete) ; j++) {
                 const Animation::Frame& frame(part.frames[j]);
                 nsecs_t lastFrame = systemTime();
@@ -801,7 +824,11 @@ bool BootAnimation::movie()
                         glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
                         glTexParameterx(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
                     }
+#ifdef MULTITHREAD_DECODE
+                    initTexture(frameManager->next());
+#else
                     initTexture(frame);
+#endif
                 }
 
                 if (!clearReg.isEmpty()) {
@@ -842,6 +869,12 @@ bool BootAnimation::movie()
 
             usleep(part.pause * ns2us(frameDuration));
 
+#ifdef MULTITHREAD_DECODE
+            if (frameManager) {
+                delete frameManager;
+            }
+#endif
+
             // For infinite parts, we've now played them at least once, so perhaps exit
             if(exitPending() && !part.count)
                 break;
@@ -892,12 +925,14 @@ bool BootAnimation::movie()
 
 const char *BootAnimation::getAnimationFileName(ImageID image)
 {
-    const char *fileName[2][3] = { { OEM_BOOTANIMATION_FILE,
+    const char *fileName[2][4] = { { OEM_BOOTANIMATION_FILE,
             SYSTEM_BOOTANIMATION_FILE,
-            SYSTEM_ENCRYPTED_BOOTANIMATION_FILE }, {
+            SYSTEM_ENCRYPTED_BOOTANIMATION_FILE,
+            THEME_BOOTANIMATION_FILE }, {
             OEM_SHUTDOWN_ANIMATION_FILE,
             SYSTEM_SHUTDOWN_ANIMATION_FILE,
-            SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE} };
+            SYSTEM_ENCRYPTED_SHUTDOWN_ANIMATION_FILE,
+            THEME_SHUTDOWN_ANIMATION_FILE} };
     int state;
     char sku[PROPERTY_VALUE_MAX];
     char skusuffix[PATH_MAX];
@@ -1017,6 +1052,119 @@ bool BootAnimation::checkBootState(void)
     return ret;
 }
 
+#ifdef MULTITHREAD_DECODE
+
+FrameManager::FrameManager(int numThreads, size_t maxSize, const SortedVector<BootAnimation::Animation::Frame>& frames) :
+    mMaxSize(maxSize),
+    mFrameCounter(0),
+    mNextIdx(0),
+    mFrames(frames),
+    mExit(false)
+{
+    pthread_mutex_init(&mBitmapsMutex, NULL);
+    pthread_cond_init(&mSpaceAvailableCondition, NULL);
+    pthread_cond_init(&mBitmapReadyCondition, NULL);
+    for (int i = 0; i < numThreads; i++) {
+        DecodeThread *thread = new DecodeThread(this);
+        thread->run("bootanimation", PRIORITY_URGENT_DISPLAY);
+        mThreads.add(thread);
+    }
+}
+
+FrameManager::~FrameManager()
+{
+    mExit = true;
+    pthread_cond_broadcast(&mSpaceAvailableCondition);
+    pthread_cond_broadcast(&mBitmapReadyCondition);
+    for (size_t i = 0; i < mThreads.size(); i++) {
+        mThreads.itemAt(i)->requestExitAndWait();
+    }
+
+    // Any bitmap left in the queue won't get cleaned up by
+    // the consumer.  Clean up now.
+    for(size_t i = 0; i < mDecodedFrames.size(); i++) {
+        delete mDecodedFrames[i].bitmap;
+    }
+}
+
+SkBitmap* FrameManager::next()
+{
+    pthread_mutex_lock(&mBitmapsMutex);
+
+    while(mDecodedFrames.size() == 0 ||
+            mDecodedFrames.itemAt(0).idx != mNextIdx) {
+        pthread_cond_wait(&mBitmapReadyCondition, &mBitmapsMutex);
+    }
+    DecodeWork work = mDecodedFrames.itemAt(0);
+    mDecodedFrames.removeAt(0);
+    mNextIdx++;
+    pthread_cond_signal(&mSpaceAvailableCondition);
+    pthread_mutex_unlock(&mBitmapsMutex);
+    // The caller now owns the bitmap
+    return work.bitmap;
+}
+
+FrameManager::DecodeWork FrameManager::getWork()
+{
+    DecodeWork work = {
+        .frame = NULL,
+        .bitmap = NULL,
+        .idx = 0
+    };
+
+    pthread_mutex_lock(&mBitmapsMutex);
+
+    while(mDecodedFrames.size() >= mMaxSize && !mExit) {
+        pthread_cond_wait(&mSpaceAvailableCondition, &mBitmapsMutex);
+    }
+
+    if (!mExit) {
+        work.frame = &mFrames.itemAt(mFrameCounter % mFrames.size());
+        work.idx = mFrameCounter;
+        mFrameCounter++;
+    }
+
+    pthread_mutex_unlock(&mBitmapsMutex);
+    return work;
+}
+
+void FrameManager::completeWork(DecodeWork work) {
+    size_t insertIdx;
+    pthread_mutex_lock(&mBitmapsMutex);
+
+    for(insertIdx = 0; insertIdx < mDecodedFrames.size(); insertIdx++) {
+        if (work.idx < mDecodedFrames.itemAt(insertIdx).idx) {
+            break;
+        }
+    }
+
+    mDecodedFrames.insertAt(work, insertIdx);
+    pthread_cond_signal(&mBitmapReadyCondition);
+
+    pthread_mutex_unlock(&mBitmapsMutex);
+}
+
+FrameManager::DecodeThread::DecodeThread(FrameManager* manager) :
+    Thread(false),
+    mManager(manager)
+{
+
+}
+
+bool FrameManager::DecodeThread::threadLoop()
+{
+    DecodeWork work = mManager->getWork();
+    if (work.frame != NULL) {
+        work.bitmap = BootAnimation::decode(*work.frame);
+        mManager->completeWork(work);
+        return true;
+    }
+
+    return false;
+}
+
+#endif
+
 // ---------------------------------------------------------------------------
 
 }; // namespace android
diff --git a/cmds/bootanimation/BootAnimation.h b/cmds/bootanimation/BootAnimation.h
index 5bc1e8a..090894f 100644
--- a/cmds/bootanimation/BootAnimation.h
+++ b/cmds/bootanimation/BootAnimation.h
@@ -26,6 +26,8 @@
 #include <EGL/egl.h>
 #include <GLES/gl.h>
 
+#include <utils/Thread.h>
+
 class SkBitmap;
 
 namespace android {
@@ -34,11 +36,17 @@ class AudioPlayer;
 class Surface;
 class SurfaceComposerClient;
 class SurfaceControl;
+#ifdef MULTITHREAD_DECODE
+class FrameManager;
+#endif
 
 // ---------------------------------------------------------------------------
 
 class BootAnimation : public Thread, public IBinder::DeathRecipient
 {
+#ifdef MULTITHREAD_DECODE
+    friend class FrameManager;
+#endif
 public:
     enum {
         eOrientationDefault     = 0,
@@ -89,11 +97,12 @@ private:
 
     status_t initTexture(Texture* texture, AssetManager& asset, const char* name);
     status_t initTexture(const Animation::Frame& frame);
+    status_t initTexture(SkBitmap *bitmap);
     bool android();
     bool readFile(const char* name, String8& outString);
     bool movie();
 
-    enum ImageID { IMG_DATA = 0, IMG_SYS = 1, IMG_ENC = 2 };
+    enum ImageID { IMG_DATA = 0, IMG_SYS = 1, IMG_ENC = 2, IMG_THM = 3 };
     const char *getAnimationFileName(ImageID image);
     const char *getBootRingtoneFileName(ImageID image);
     void playBackgroundMusic();
@@ -101,6 +110,8 @@ private:
     void checkExit();
     void checkShowAndroid();
 
+    static SkBitmap *decode(const Animation::Frame& frame);
+
     sp<SurfaceComposerClient>       mSession;
     sp<AudioPlayer>                 mAudioPlayer;
     AssetManager mAssets;
@@ -115,6 +126,50 @@ private:
     ZipFileRO   *mZip;
 };
 
+#ifdef MULTITHREAD_DECODE
+
+class FrameManager {
+public:
+    struct DecodeWork {
+        const BootAnimation::Animation::Frame *frame;
+        SkBitmap *bitmap;
+        size_t idx;
+    };
+
+    FrameManager(int numThreads, size_t maxSize, const SortedVector<BootAnimation::Animation::Frame>& frames);
+    virtual ~FrameManager();
+
+    SkBitmap* next();
+
+protected:
+    DecodeWork getWork();
+    void completeWork(DecodeWork work);
+
+private:
+
+    class DecodeThread : public Thread {
+    public:
+        DecodeThread(FrameManager* manager);
+        virtual ~DecodeThread() {}
+    private:
+        virtual bool threadLoop();
+        FrameManager *mManager;
+    };
+
+    size_t mMaxSize;
+    size_t mFrameCounter;
+    size_t mNextIdx;
+    const SortedVector<BootAnimation::Animation::Frame>& mFrames;
+    Vector<DecodeWork> mDecodedFrames;
+    pthread_mutex_t mBitmapsMutex;
+    pthread_cond_t mSpaceAvailableCondition;
+    pthread_cond_t mBitmapReadyCondition;
+    bool mExit;
+    Vector<sp<DecodeThread> > mThreads;
+};
+
+#endif
+
 // ---------------------------------------------------------------------------
 
 }; // namespace android
diff --git a/cmds/pm/src/com/android/commands/pm/Pm.java b/cmds/pm/src/com/android/commands/pm/Pm.java
index 58c3a9c..4869adf 100644
--- a/cmds/pm/src/com/android/commands/pm/Pm.java
+++ b/cmds/pm/src/com/android/commands/pm/Pm.java
@@ -262,6 +262,10 @@ public final class Pm {
             return runMovePrimaryStorage();
         }
 
+        if ("set-user-restriction".equals(op)) {
+            return runSetUserRestriction();
+        }
+
         try {
             if (args.length == 1) {
                 if (args[0].equalsIgnoreCase("-l")) {
@@ -1518,6 +1522,38 @@ public final class Pm {
         }
     }
 
+    public int runSetUserRestriction() {
+        int userId = UserHandle.USER_OWNER;
+        String opt = nextOption();
+        if (opt != null && "--user".equals(opt)) {
+            String arg = nextArg();
+            if (arg == null || !isNumber(arg)) {
+                System.err.println("Error: valid userId not specified");
+                return 1;
+            }
+            userId = Integer.parseInt(arg);
+        }
+
+        String restriction = nextArg();
+        String arg = nextArg();
+        boolean value;
+        if ("1".equals(arg)) {
+            value = true;
+        } else if ("0".equals(arg)) {
+            value = false;
+        } else {
+            System.err.println("Error: valid value not specified");
+            return 1;
+        }
+        try {
+            mUm.setUserRestriction(restriction, value, userId);
+            return 0;
+        } catch (RemoteException e) {
+            System.err.println(e.toString());
+            return 1;
+        }
+    }
+
     private int runUninstall() throws RemoteException {
         int flags = 0;
         int userId = UserHandle.USER_ALL;
diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java
index ff06b74..544331f 100644
--- a/core/java/android/app/ActivityManagerNative.java
+++ b/core/java/android/app/ActivityManagerNative.java
@@ -1600,9 +1600,10 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
 
         case START_BACKUP_AGENT_TRANSACTION: {
             data.enforceInterface(IActivityManager.descriptor);
-            ApplicationInfo info = ApplicationInfo.CREATOR.createFromParcel(data);
+            String packageName = data.readString();
             int backupRestoreMode = data.readInt();
-            boolean success = bindBackupAgent(info, backupRestoreMode);
+            int userId = data.readInt();
+            boolean success = bindBackupAgent(packageName, backupRestoreMode, userId);
             reply.writeNoException();
             reply.writeInt(success ? 1 : 0);
             return true;
@@ -2096,11 +2097,14 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM
             return true;
         }
 
-        case SHOW_BOOT_MESSAGE_TRANSACTION: {
+        case UPDATE_BOOT_PROGRESS_TRANSACTION: {
             data.enforceInterface(IActivityManager.descriptor);
-            CharSequence msg = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(data);
+            int stage = data.readInt();
+            ApplicationInfo info = ApplicationInfo.CREATOR.createFromParcel(data);
+            int current = data.readInt();
+            int total = data.readInt();
             boolean always = data.readInt() != 0;
-            showBootMessage(msg, always);
+            updateBootProgress(stage, info, current, total, always);
             reply.writeNoException();
             return true;
         }
@@ -3874,13 +3878,14 @@ class ActivityManagerProxy implements IActivityManager
         return binder;
     }
 
-    public boolean bindBackupAgent(ApplicationInfo app, int backupRestoreMode)
+    public boolean bindBackupAgent(String packageName, int backupRestoreMode, int userId)
             throws RemoteException {
         Parcel data = Parcel.obtain();
         Parcel reply = Parcel.obtain();
         data.writeInterfaceToken(IActivityManager.descriptor);
-        app.writeToParcel(data, 0);
+        data.writeString(packageName);
         data.writeInt(backupRestoreMode);
+        data.writeInt(userId);
         mRemote.transact(START_BACKUP_AGENT_TRANSACTION, data, reply, 0);
         reply.readException();
         boolean success = reply.readInt() != 0;
@@ -5283,13 +5288,17 @@ class ActivityManagerProxy implements IActivityManager
         return res;
     }
 
-    public void showBootMessage(CharSequence msg, boolean always) throws RemoteException {
+    public void updateBootProgress(int stage, ApplicationInfo optimizedApp,
+            int currentAppPos, int totalAppCount, boolean always) throws RemoteException {
         Parcel data = Parcel.obtain();
         Parcel reply = Parcel.obtain();
         data.writeInterfaceToken(IActivityManager.descriptor);
-        TextUtils.writeToParcel(msg, data, 0);
+        data.writeInt(stage);
+        optimizedApp.writeToParcel(data, 0);
+        data.writeInt(currentAppPos);
+        data.writeInt(totalAppCount);
         data.writeInt(always ? 1 : 0);
-        mRemote.transact(SHOW_BOOT_MESSAGE_TRANSACTION, data, reply, 0);
+        mRemote.transact(UPDATE_BOOT_PROGRESS_TRANSACTION, data, reply, 0);
         reply.readException();
         data.recycle();
         reply.recycle();
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index db4e123..c829daa 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -2048,9 +2048,11 @@ final class ApplicationPackageManager extends PackageManager {
 
     /** @hide */
     @Override
-    public boolean isComponentProtected(String callingPackage, ComponentName componentName) {
+    public boolean isComponentProtected(String callingPackage, int callingUid,
+            ComponentName componentName) {
         try {
-            return mPM.isComponentProtected(callingPackage, componentName, mContext.getUserId());
+            return mPM.isComponentProtected(callingPackage, callingUid, componentName,
+                    mContext.getUserId());
         } catch (RemoteException re) {
             Log.e(TAG, "Failed to get component protected setting", re);
             return false;
diff --git a/core/java/android/app/ComposedIconInfo.java b/core/java/android/app/ComposedIconInfo.java
index f49c230..71321c1 100644
--- a/core/java/android/app/ComposedIconInfo.java
+++ b/core/java/android/app/ComposedIconInfo.java
@@ -74,11 +74,9 @@ public class ComposedIconInfo implements Parcelable {
         iconPaletteBack = source.readInt();
         swatchType = SwatchType.values()[source.readInt()];
         int numDefaultColors = source.readInt();
-        if (numDefaultColors > 0) {
-            defaultSwatchColors = new int[numDefaultColors];
-            for (int i = 0; i < numDefaultColors; i++) {
-                defaultSwatchColors[i] = source.readInt();
-            }
+        defaultSwatchColors = new int[numDefaultColors];
+        for (int i = 0; i < numDefaultColors; i++) {
+            defaultSwatchColors[i] = source.readInt();
         }
     }
 
diff --git a/core/java/android/app/ContextImpl.java b/core/java/android/app/ContextImpl.java
index d443d80..6896c21 100644
--- a/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@ -2018,6 +2018,11 @@ class ContextImpl extends Context {
             }
             result.add(dir);
         }
+
+        // Make sure there is at least one element, let the callers handle that
+        if (result.size() == 0) {
+            result.add(null);
+        }
         return result.toArray(new File[result.size()]);
     }
 
diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java
index 682ab97..b382b76 100644
--- a/core/java/android/app/DownloadManager.java
+++ b/core/java/android/app/DownloadManager.java
@@ -1038,7 +1038,7 @@ public class DownloadManager {
             if (cursor.moveToFirst()) {
                 int status = cursor.getInt(cursor.getColumnIndexOrThrow(COLUMN_STATUS));
                 if (DownloadManager.STATUS_SUCCESSFUL == status) {
-                    return ContentUris.withAppendedId(Downloads.Impl.CONTENT_URI, id);
+                    return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
                 }
             }
         } finally {
@@ -1263,7 +1263,7 @@ public class DownloadManager {
      * @hide
      */
     public Uri getDownloadUri(long id) {
-        return ContentUris.withAppendedId(mBaseUri, id);
+        return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, id);
     }
 
     /**
@@ -1344,7 +1344,7 @@ public class DownloadManager {
 
             // return content URI for cache download
             long downloadId = getLong(getColumnIndex(Downloads.Impl._ID));
-            return ContentUris.withAppendedId(mBaseUri, downloadId).toString();
+            return ContentUris.withAppendedId(Downloads.Impl.ALL_DOWNLOADS_CONTENT_URI, downloadId).toString();
         }
 
         private long getReason(int status) {
diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java
index 6370268..75951cf 100644
--- a/core/java/android/app/IActivityManager.java
+++ b/core/java/android/app/IActivityManager.java
@@ -184,7 +184,7 @@ public interface IActivityManager extends IInterface {
     public IBinder peekService(Intent service, String resolvedType, String callingPackage)
             throws RemoteException;
 
-    public boolean bindBackupAgent(ApplicationInfo appInfo, int backupRestoreMode)
+    public boolean bindBackupAgent(String packageName, int backupRestoreMode, int userId)
             throws RemoteException;
     public void clearPendingBackup() throws RemoteException;
     public void backupAgentCreated(String packageName, IBinder agent) throws RemoteException;
@@ -408,7 +408,8 @@ public interface IActivityManager extends IInterface {
 
     public long[] getProcessPss(int[] pids) throws RemoteException;
 
-    public void showBootMessage(CharSequence msg, boolean always) throws RemoteException;
+    public void updateBootProgress(int stage, ApplicationInfo optimizedApp,
+            int currentAppPos, int totalAppCount, boolean always) throws RemoteException;
 
     public void keyguardWaitingForActivityDrawn() throws RemoteException;
 
@@ -622,6 +623,11 @@ public interface IActivityManager extends IInterface {
         }
     }
 
+    public static final int BOOT_STAGE_STARTING_APPS = 1;
+    public static final int BOOT_STAGE_FSTRIM = 2;
+    public static final int BOOT_STAGE_PREPARING_APPS = 3;
+    public static final int BOOT_STAGE_COMPLETE = 4;
+
     String descriptor = "android.app.IActivityManager";
 
     // Please keep these transaction codes the same -- they are also
@@ -757,7 +763,7 @@ public interface IActivityManager extends IInterface {
     int IS_INTENT_SENDER_TARGETED_TO_PACKAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+134;
     int UPDATE_PERSISTENT_CONFIGURATION_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+135;
     int GET_PROCESS_PSS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+136;
-    int SHOW_BOOT_MESSAGE_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+137;
+    int UPDATE_BOOT_PROGRESS_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+137;
     int KILL_ALL_BACKGROUND_PROCESSES_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+139;
     int GET_CONTENT_PROVIDER_EXTERNAL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+140;
     int REMOVE_CONTENT_PROVIDER_EXTERNAL_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION+141;
diff --git a/core/java/android/app/INotificationManager.aidl b/core/java/android/app/INotificationManager.aidl
index f78fb47..06c064f 100644
--- a/core/java/android/app/INotificationManager.aidl
+++ b/core/java/android/app/INotificationManager.aidl
@@ -55,6 +55,12 @@ interface INotificationManager
     void setPackageVisibilityOverride(String pkg, int uid, int visibility);
     int getPackageVisibilityOverride(String pkg, int uid);
 
+    void setShowNotificationForPackageOnKeyguard(String pkg, int uid, int status);
+    int getShowNotificationForPackageOnKeyguard(String pkg, int uid);
+
+    void setPackageNotificationSoundTimeout(String pkg, int uid, long timeout);
+    long getPackageNotificationSoundTimeout(String pkg, int uid);
+
     // TODO: Remove this when callers have been migrated to the equivalent
     // INotificationListener method.
     StatusBarNotification[] getActiveNotifications(String callingPkg);
@@ -77,7 +83,7 @@ interface INotificationManager
     void setInterruptionFilter(String pkg, int interruptionFilter);
 
     ComponentName getEffectsSuppressor();
-    boolean matchesCallFilter(in Bundle extras);
+    boolean[] matchesCallFilter(in Bundle extras);
     boolean isSystemConditionProviderEnabled(String path);
 
     int getZenMode();
@@ -97,4 +103,6 @@ interface INotificationManager
     void applyRestore(in byte[] payload, int user);
 
     ParceledListSlice getAppActiveNotifications(String callingPkg, int userId);
+
+    boolean deviceLightsCan(int lightCapability);
 }
diff --git a/core/java/android/app/IconPackHelper.java b/core/java/android/app/IconPackHelper.java
index 80fb401..9c71ddd 100644
--- a/core/java/android/app/IconPackHelper.java
+++ b/core/java/android/app/IconPackHelper.java
@@ -633,33 +633,42 @@ public class IconPackHelper {
             }
             TypedValue tempValue = new TypedValue();
             tempValue.setTo(outValue);
-            outValue.assetCookie = COMPOSED_ICON_COOKIE;
-            outValue.data = resId & (COMPOSED_ICON_COOKIE << 24 | 0x00ffffff);
-            outValue.string = getCachedIconPath(pkgName, resId, outValue.density);
-            int hashCode = outValue.string.hashCode() & 0x7fffffff;
-            int defaultSwatchColor = 0;
-
-            if (!(new File(outValue.string.toString()).exists())) {
-                // compose the icon and cache it
-                int back = 0;
-                if (iconInfo.swatchType != ComposedIconInfo.SwatchType.None) {
-                    back = iconInfo.iconPaletteBack;
-                    if (iconInfo.defaultSwatchColors.length > 0) {
-                        defaultSwatchColor =iconInfo.defaultSwatchColors[
-                                hashCode % iconInfo.defaultSwatchColors.length];
+            // Catch all exceptions and restore outValue to tempValue if one occurs
+            try {
+                outValue.assetCookie = COMPOSED_ICON_COOKIE;
+                outValue.data = resId & (COMPOSED_ICON_COOKIE << 24 | 0x00ffffff);
+                outValue.string = getCachedIconPath(pkgName, resId, outValue.density);
+                int hashCode = outValue.string.hashCode() & 0x7fffffff;
+                int defaultSwatchColor = 0;
+
+                if (!(new File(outValue.string.toString()).exists())) {
+                    // compose the icon and cache it
+                    int back = 0;
+                    if (iconInfo.swatchType != ComposedIconInfo.SwatchType.None) {
+                        back = iconInfo.iconPaletteBack;
+                        if (iconInfo.defaultSwatchColors.length > 0) {
+                            defaultSwatchColor = iconInfo.defaultSwatchColors[
+                                    hashCode % iconInfo.defaultSwatchColors.length];
+                        }
+                    } else if (iconInfo.iconBacks != null && iconInfo.iconBacks.length > 0) {
+                        back = iconInfo.iconBacks[hashCode % iconInfo.iconBacks.length];
+                    }
+                    if (DEBUG) {
+                        Log.d(TAG, "Composing icon for " + pkgName);
+                    }
+                    Bitmap bmp = createIconBitmap(baseIcon, res, back, defaultSwatchColor,
+                            iconInfo);
+                    if (!cacheComposedIcon(bmp,
+                            getCachedIconName(pkgName, resId, outValue.density))) {
+                        Log.w(TAG, "Unable to cache icon " + outValue.string);
+                        // restore the original TypedValue
+                        outValue.setTo(tempValue);
                     }
-                } else if (iconInfo.iconBacks != null && iconInfo.iconBacks.length > 0) {
-                    back = iconInfo.iconBacks[hashCode % iconInfo.iconBacks.length];
-                }
-                if (DEBUG) {
-                    Log.d(TAG, "Composing icon for " + pkgName);
-                }
-                Bitmap bmp = createIconBitmap(baseIcon, res, back, defaultSwatchColor, iconInfo);
-                if (!cacheComposedIcon(bmp, getCachedIconName(pkgName, resId, outValue.density))) {
-                    Log.w(TAG, "Unable to cache icon " + outValue.string);
-                    // restore the original TypedValue
-                    outValue.setTo(tempValue);
                 }
+            } catch (Exception e) {
+                // catch all, restore the original value and log it
+                outValue.setTo(tempValue);
+                Log.w(TAG, "getValue failed for " + outValue.string, e);
             }
         }
 
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index d8e01cd..8835a09 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -523,6 +523,21 @@ public class Notification implements Parcelable
     public int priority;
 
     /**
+     * Default.
+     * Show all notifications from an app on keyguard.
+     *
+     * @hide
+     */
+    public static final int SHOW_ALL_NOTI_ON_KEYGUARD = 0x01;
+
+    /**
+     * Show only notifications from an app which are not ongoing ones.
+     *
+     * @hide
+     */
+    public static final int SHOW_NO_ONGOING_NOTI_ON_KEYGUARD = 0x02;
+
+    /**
      * Accent color (an ARGB integer like the constants in {@link android.graphics.Color})
      * to be applied by the standard Style templates when presenting this notification.
      *
diff --git a/core/java/android/app/NotificationManager.java b/core/java/android/app/NotificationManager.java
index 605c006..eae2599 100644
--- a/core/java/android/app/NotificationManager.java
+++ b/core/java/android/app/NotificationManager.java
@@ -19,6 +19,7 @@ package android.app;
 import android.annotation.NonNull;
 import android.annotation.Nullable;
 import android.annotation.SdkConstant;
+import android.app.Notification;
 import android.app.Notification.Builder;
 import android.content.ComponentName;
 import android.content.Context;
@@ -340,12 +341,12 @@ public class NotificationManager
     /**
      * @hide
      */
-    public boolean matchesCallFilter(Bundle extras) {
+    public boolean[] matchesCallFilter(Bundle extras) {
         INotificationManager service = getService();
         try {
             return service.matchesCallFilter(extras);
         } catch (RemoteException e) {
-            return false;
+            return null;
         }
     }
 
@@ -512,6 +513,16 @@ public class NotificationManager
         return new ArraySet<String>();
     }
 
+    /** @hide */
+    public int getShowNotificationForPackageOnKeyguard(String pkg, int uid) {
+        INotificationManager service = getService();
+        try {
+            return getService().getShowNotificationForPackageOnKeyguard(pkg, uid);
+        } catch (RemoteException e) {
+            return Notification.SHOW_ALL_NOTI_ON_KEYGUARD;
+        }
+    }
+
     private Context mContext;
 
     private static void checkRequired(String name, Object value) {
@@ -754,4 +765,32 @@ public class NotificationManager
             default: return defValue;
         }
     }
+
+    /** @hide */
+    public static final int LIGHTS_RGB_NOTIFICATION = 0;
+    /** @hide */
+    public static final int LIGHTS_RGB_BATTERY = 1 ;
+    /** @hide */
+    public static final int LIGHTS_MULTIPLE_LED = 2;
+    /** @hide */
+    public static final int LIGHTS_LED_PULSE = 3;
+    /** @hide */
+    public static final int LIGHTS_SEGMENTED_BATTERY_LIGHTS = 4;
+    /** @hide */
+    public static final int LIGHTS_ADJUSTABLE_NOTIFICATION_BRIGHTNESS = 5;
+
+    /** @hide */
+    public boolean deviceLightsCan(int lightCapability) {
+        INotificationManager service = getService();
+        try {
+            return service.deviceLightsCan(lightCapability);
+        } catch (RemoteException e) {
+            return true;
+        } catch (NullPointerException e) {
+            return true;
+        }
+        // If the service isn't up yet, assume everything is possible
+    }
+
+
 }
diff --git a/core/java/android/app/ResourcesManager.java b/core/java/android/app/ResourcesManager.java
index e2d0537..c8aec2e 100644
--- a/core/java/android/app/ResourcesManager.java
+++ b/core/java/android/app/ResourcesManager.java
@@ -335,18 +335,6 @@ public class ResourcesManager {
         ResourcesKey key = new ResourcesKey(resDir, displayId, null, compatInfo.applicationScale,
                 isThemeable, themeConfig);
 
-        synchronized (this) {
-            WeakReference<Resources> wr = mActiveResources.get(key);
-            r = wr != null ? wr.get() : null;
-            if (r != null && r.getAssets().isUpToDate()) {
-                if (false) {
-                    Slog.w(TAG, "Returning cached resources " + r + " " + resDir
-                            + ": appScale=" + r.getCompatibilityInfo().applicationScale);
-                }
-                return r;
-            }
-        }
-
         AssetManager assets = new AssetManager();
         assets.setAppName(packageName);
         assets.setThemeSupport(isThemeable);
@@ -387,20 +375,7 @@ public class ResourcesManager {
                     + r.getCompatibilityInfo().applicationScale);
         }
 
-        synchronized (this) {
-            WeakReference<Resources> wr = mActiveResources.get(key);
-            Resources existing = wr != null ? wr.get() : null;
-            if (existing != null && existing.getAssets().isUpToDate()) {
-                // Someone else already created the resources while we were
-                // unlocked; go ahead and use theirs.
-                r.getAssets().close();
-                return existing;
-            }
-
-            // XXX need to remove entries when weak references go away
-            mActiveResources.put(key, new WeakReference<Resources>(r));
-            return r;
-        }
+        return r;
     }
 
     /**
@@ -576,6 +551,7 @@ public class ResourcesManager {
         PackageInfo piTheme = null;
         PackageInfo piTarget = null;
         PackageInfo piAndroid = null;
+        PackageInfo piCm = null;
 
         // Some apps run in process of another app (eg keyguard/systemUI) so we must get the
         // package name from the res tables. The 0th base package name will be the android group.
@@ -609,16 +585,20 @@ public class ResourcesManager {
             }
             piAndroid = getPackageManager().getPackageInfo("android", 0,
                     UserHandle.getCallingUserId());
+            piCm = getPackageManager().getPackageInfo("cyanogenmod.platform", 0,
+                    UserHandle.getCallingUserId());
         } catch (RemoteException e) {
         }
 
         if (piTheme == null || piTheme.applicationInfo == null ||
                     piTarget == null || piTarget.applicationInfo == null ||
                     piAndroid == null || piAndroid.applicationInfo == null ||
+                    piCm == null || piCm.applicationInfo == null ||
                     piTheme.mOverlayTargets == null) {
             return false;
         }
 
+        // Attach themed resources for target
         String themePackageName = piTheme.packageName;
         String themePath = piTheme.applicationInfo.publicSourceDir;
         if (!piTarget.isThemeApk && piTheme.mOverlayTargets.contains(basePackageName)) {
@@ -638,6 +618,24 @@ public class ResourcesManager {
             }
         }
 
+        // Attach themed resources for cmsdk
+        if (!piTarget.isThemeApk && !piCm.packageName.equals(basePackageName) &&
+                piTheme.mOverlayTargets.contains(piCm.packageName)) {
+            String resCachePath= ThemeUtils.getTargetCacheDir(piCm.packageName,
+                    piTheme.packageName);
+            String prefixPath = ThemeUtils.getOverlayPathToTarget(piCm.packageName);
+            String targetPackagePath = piCm.applicationInfo.publicSourceDir;
+            String resApkPath = resCachePath + "/resources.apk";
+            String idmapPath = ThemeUtils.getIdmapPath(piCm.packageName, piTheme.packageName);
+            int cookie = assets.addOverlayPath(idmapPath, themePath,
+                    resApkPath, targetPackagePath, prefixPath);
+            if (cookie != 0) {
+                assets.setThemePackageName(themePackageName);
+                assets.addThemeCookie(cookie);
+            }
+        }
+
+        // Attach themed resources for android framework
         if (!piTarget.isThemeApk && !"android".equals(basePackageName) &&
                 piTheme.mOverlayTargets.contains("android")) {
             String resCachePath= ThemeUtils.getTargetCacheDir(piAndroid.packageName,
diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java
index f924bc1..71183d9 100644
--- a/core/java/android/bluetooth/BluetoothAdapter.java
+++ b/core/java/android/bluetooth/BluetoothAdapter.java
@@ -2067,13 +2067,14 @@ public final class BluetoothAdapter {
             }
 
             public void onBluetoothServiceDown() {
-                if (VDBG) Log.d(TAG, "onBluetoothServiceDown: " + mService);
+                Log.d(TAG, "onBluetoothServiceDown: " + mService);
                 synchronized (mManagerCallback) {
                     mService = null;
                     if (mLeScanClients != null) mLeScanClients.clear();
                     if (sBluetoothLeAdvertiser != null) sBluetoothLeAdvertiser.cleanup();
                     if (sBluetoothLeScanner != null) sBluetoothLeScanner.cleanup();
                     synchronized (mProxyServiceStateCallbacks) {
+                        Log.d(TAG, "onBluetoothServiceDown: Sending callbacks to " + mProxyServiceStateCallbacks.size() + " clients");
                         for (IBluetoothManagerCallback cb : mProxyServiceStateCallbacks ){
                             try {
                                 if (cb != null) {
@@ -2085,6 +2086,7 @@ public final class BluetoothAdapter {
                         }
                     }
                 }
+                Log.d(TAG, "onBluetoothServiceDown: Finished sending callbacks to registered clients");
             }
 
             public void onBrEdrDown() {
diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java
index b4006de..d7d248f 100644
--- a/core/java/android/bluetooth/BluetoothDevice.java
+++ b/core/java/android/bluetooth/BluetoothDevice.java
@@ -1166,12 +1166,12 @@ public final class BluetoothDevice implements Parcelable {
 
     /**
      * Confirm passkey for {@link #PAIRING_VARIANT_PASSKEY_CONFIRMATION} pairing.
-     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_ADMIN}.
+     * <p>Requires {@link android.Manifest.permission#BLUETOOTH_PRIVILEGED}.
      *
      * @return true confirmation has been sent out
      *         false for error
      */
-    @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
+    @RequiresPermission(Manifest.permission.BLUETOOTH_PRIVILEGED)
     public boolean setPairingConfirmation(boolean confirm) {
         if (sService == null) {
             Log.e(TAG, "BT not enabled. Cannot set pairing confirmation");
diff --git a/core/java/android/content/IntentFilter.java b/core/java/android/content/IntentFilter.java
index 3a17e23..ed5dfa5 100644
--- a/core/java/android/content/IntentFilter.java
+++ b/core/java/android/content/IntentFilter.java
@@ -883,6 +883,15 @@ public class IntentFilter implements Parcelable {
             return true;
         }
 
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof AuthorityEntry) {
+                final AuthorityEntry other = (AuthorityEntry)obj;
+                return match(other);
+            }
+            return false;
+        }
+
         /**
          * Determine whether this AuthorityEntry matches the given data Uri.
          * <em>Note that this comparison is case-sensitive, unlike formal
@@ -917,7 +926,7 @@ public class IntentFilter implements Parcelable {
             }
             return MATCH_CATEGORY_HOST;
         }
-    };
+    }
 
     /**
      * Add a new Intent data "scheme specific part" to match against.  The filter must
diff --git a/core/java/android/content/SyncInfo.java b/core/java/android/content/SyncInfo.java
index a586d6f..ab3c30b 100644
--- a/core/java/android/content/SyncInfo.java
+++ b/core/java/android/content/SyncInfo.java
@@ -24,6 +24,13 @@ import android.os.Parcelable;
  * Information about the sync operation that is currently underway.
  */
 public class SyncInfo implements Parcelable {
+    /**
+     * Used when the caller receiving this object doesn't have permission to access the accounts
+     * on device.
+     * @See Manifest.permission.GET_ACCOUNTS
+     */
+    private static final Account REDACTED_ACCOUNT = new Account("*****", "*****");
+
     /** @hide */
     public final int authorityId;
 
@@ -44,6 +51,17 @@ public class SyncInfo implements Parcelable {
      */
     public final long startTime;
 
+    /**
+     * Creates a SyncInfo object with an unusable Account. Used when the caller receiving this
+     * object doesn't have access to the accounts on the device.
+     * @See Manifest.permission.GET_ACCOUNTS
+     * @hide
+     */
+    public static SyncInfo createAccountRedacted(
+        int authorityId, String authority, long startTime) {
+            return new SyncInfo(authorityId, REDACTED_ACCOUNT, authority, startTime);
+    }
+
     /** @hide */
     public SyncInfo(int authorityId, Account account, String authority, long startTime) {
         this.authorityId = authorityId;
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index 6d8b5cb..51f13af 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -521,6 +521,9 @@ interface IPackageManager {
     int processThemeResources(String themePkgName);
 
     /** Protected Apps */
-    boolean isComponentProtected(in String callingPackage, in ComponentName componentName,
-            int userId);
+    boolean isComponentProtected(in String callingPackage, in int callingUid,
+    in ComponentName componentName, int userId);
+
+    /** protected broadcast ext */
+    boolean isProtectedBroadcastAllowed(in String actionName, in int callingUid);
 }
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 529d641..8f0500e 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -4564,7 +4564,7 @@ public abstract class PackageManager {
      * Return whether or not a specific component is protected
      * @hide
      */
-    public abstract boolean isComponentProtected(String callingPackage,
+    public abstract boolean isComponentProtected(String callingPackage, int callingUid,
             ComponentName componentName);
 
     /**
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index 6a07b31..bb46ef0 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1877,14 +1877,18 @@ public class PackageParser {
                 String name = sa.getNonResourceString(
                         com.android.internal.R.styleable.AndroidManifestProtectedBroadcast_name);
 
+                String permission = sa.getNonResourceString(
+                        com.android.internal.R.styleable.AndroidManifestProtectedBroadcast_permission);
+
                 sa.recycle();
 
                 if (name != null && (flags&PARSE_IS_SYSTEM) != 0) {
                     if (pkg.protectedBroadcasts == null) {
-                        pkg.protectedBroadcasts = new ArrayList<String>();
+                        pkg.protectedBroadcasts = new ArrayMap<>();
                     }
-                    if (!pkg.protectedBroadcasts.contains(name)) {
-                        pkg.protectedBroadcasts.add(name.intern());
+                    if (!pkg.protectedBroadcasts.containsKey(name)) {
+                        pkg.protectedBroadcasts.put(name.intern(),
+                                permission != null ? permission.intern() : null);
                     }
                 }
 
@@ -4519,7 +4523,10 @@ public class PackageParser {
 
         public final ArrayList<String> requestedPermissions = new ArrayList<String>();
 
-        public ArrayList<String> protectedBroadcasts;
+        /**
+         * Maps from package -> permission, null for system (default behavior)
+         */
+        public ArrayMap<String,String> protectedBroadcasts;
 
         public ArrayList<String> libraryNames = null;
         public ArrayList<String> usesLibraries = null;
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index 6a404e2..7fa04f9 100644
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -120,6 +120,8 @@ public class Resources {
     public static final int THEME_APP_PKG_ID = 0x61;
     /** @hide */
     public static final int THEME_ICON_PKG_ID = 0x62;
+    /** @hide */
+    public static final int THEME_CM_PKG_ID = 0x63;
     /**
      * The common resource pkg id needs to be less than the THEME_FRAMEWORK_PKG_ID
      * otherwise aapt will complain and fail
diff --git a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
index a0a03b1..c26d07d 100644
--- a/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
+++ b/core/java/android/hardware/camera2/legacy/RequestThreadManager.java
@@ -81,6 +81,7 @@ public class RequestThreadManager {
 
     private static final int PREVIEW_FRAME_TIMEOUT = 1000; // ms
     private static final int JPEG_FRAME_TIMEOUT = 4000; // ms (same as CTS for API2)
+    private static final int HDR_TIMEOUT = 20000; //ms
     private static final int REQUEST_COMPLETE_TIMEOUT = JPEG_FRAME_TIMEOUT;
 
     private static final float ASPECT_RATIO_TOLERANCE = 0.01f;
@@ -825,7 +826,9 @@ public class RequestThreadManager {
 
                             if (holder.hasJpegTargets()) {
                                 doJpegCapture(holder);
-                                if (!mReceivedJpeg.block(JPEG_FRAME_TIMEOUT)) {
+                                if (!mReceivedJpeg.block(
+                                        mParams.getSceneMode().equals(mParams.SCENE_MODE_HDR)
+                                        ? HDR_TIMEOUT : JPEG_FRAME_TIMEOUT)) {
                                     Log.e(TAG, "Hit timeout for jpeg callback!");
                                     mCaptureCollector.failNextJpeg();
                                 }
diff --git a/core/java/android/hardware/fingerprint/FingerprintManager.java b/core/java/android/hardware/fingerprint/FingerprintManager.java
index 122df23..62396a3 100644
--- a/core/java/android/hardware/fingerprint/FingerprintManager.java
+++ b/core/java/android/hardware/fingerprint/FingerprintManager.java
@@ -258,6 +258,7 @@ public class FingerprintManager {
     public static class AuthenticationResult {
         private Fingerprint mFingerprint;
         private CryptoObject mCryptoObject;
+        private int mUserId;
 
         /**
          * Authentication result
@@ -266,9 +267,10 @@ public class FingerprintManager {
          * @param fingerprint the recognized fingerprint data, if allowed.
          * @hide
          */
-        public AuthenticationResult(CryptoObject crypto, Fingerprint fingerprint) {
+        public AuthenticationResult(CryptoObject crypto, Fingerprint fingerprint, int userId) {
             mCryptoObject = crypto;
             mFingerprint = fingerprint;
+            mUserId = userId;
         }
 
         /**
@@ -285,6 +287,12 @@ public class FingerprintManager {
          * @hide
          */
         public Fingerprint getFingerprint() { return mFingerprint; }
+
+        /**
+         * Obtain the userId for which this fingerprint was authenticated.
+         * @hide
+         */
+        public int getUserId() { return mUserId; }
     };
 
     /**
@@ -754,7 +762,7 @@ public class FingerprintManager {
                     sendAcquiredResult((Long) msg.obj /* deviceId */, msg.arg1 /* acquire info */);
                     break;
                 case MSG_AUTHENTICATION_SUCCEEDED:
-                    sendAuthenticatedSucceeded((Fingerprint) msg.obj);
+                    sendAuthenticatedSucceeded((Fingerprint) msg.obj, msg.arg1 /* userId */);
                     break;
                 case MSG_AUTHENTICATION_FAILED:
                     sendAuthenticatedFailed();
@@ -799,9 +807,10 @@ public class FingerprintManager {
             }
         }
 
-        private void sendAuthenticatedSucceeded(Fingerprint fp) {
+        private void sendAuthenticatedSucceeded(Fingerprint fp, int userId) {
             if (mAuthenticationCallback != null) {
-                final AuthenticationResult result = new AuthenticationResult(mCryptoObject, fp);
+                final AuthenticationResult result =
+                        new AuthenticationResult(mCryptoObject, fp, userId);
                 mAuthenticationCallback.onAuthenticationSucceeded(result);
             }
         }
@@ -941,8 +950,8 @@ public class FingerprintManager {
         }
 
         @Override // binder call
-        public void onAuthenticationSucceeded(long deviceId, Fingerprint fp) {
-            mHandler.obtainMessage(MSG_AUTHENTICATION_SUCCEEDED, fp).sendToTarget();
+        public void onAuthenticationSucceeded(long deviceId, Fingerprint fp, int userId) {
+            mHandler.obtainMessage(MSG_AUTHENTICATION_SUCCEEDED, userId, 0, fp).sendToTarget();
         }
 
         @Override // binder call
diff --git a/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl b/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl
index 57a429f..b024b29 100644
--- a/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl
+++ b/core/java/android/hardware/fingerprint/IFingerprintServiceReceiver.aidl
@@ -26,7 +26,7 @@ import android.os.UserHandle;
 oneway interface IFingerprintServiceReceiver {
     void onEnrollResult(long deviceId, int fingerId, int groupId, int remaining);
     void onAcquired(long deviceId, int acquiredInfo);
-    void onAuthenticationSucceeded(long deviceId, in Fingerprint fp);
+    void onAuthenticationSucceeded(long deviceId, in Fingerprint fp, int userId);
     void onAuthenticationFailed(long deviceId);
     void onError(long deviceId, int error);
     void onRemoved(long deviceId, int fingerId, int groupId);
diff --git a/core/java/android/net/INetworkStatsService.aidl b/core/java/android/net/INetworkStatsService.aidl
index 6436e42..17033c4 100644
--- a/core/java/android/net/INetworkStatsService.aidl
+++ b/core/java/android/net/INetworkStatsService.aidl
@@ -57,4 +57,5 @@ interface INetworkStatsService {
     /** Advise persistance threshold; may be overridden internally. */
     void advisePersistThreshold(long thresholdBytes);
 
+    void resetDataUsageHistoryForAllUid(in NetworkTemplate template);
 }
diff --git a/core/java/android/net/NetworkPolicyManager.java b/core/java/android/net/NetworkPolicyManager.java
index eab22b8..7f4d6e3 100644
--- a/core/java/android/net/NetworkPolicyManager.java
+++ b/core/java/android/net/NetworkPolicyManager.java
@@ -49,6 +49,12 @@ public class NetworkPolicyManager {
     public static final int POLICY_REJECT_METERED_BACKGROUND = 0x1;
     /** Allow network use (metered or not) in the background in battery save mode. */
     public static final int POLICY_ALLOW_BACKGROUND_BATTERY_SAVE = 0x2;
+    /** Reject application network traffic on wifi network **/
+    public static final int POLICY_REJECT_ON_WLAN = 0x8000;
+    /** Reject application network traffic on cellular network **/
+    public static final int POLICY_REJECT_ON_DATA = 0x10000;
+    /** Reject application background network traffic on WiFi network **/
+    public static final int POLICY_REJECT_ON_WLAN_BACKGROUND = 0x20000;
 
     /* RULE_* are not masks and they must be exclusive */
     public static final int RULE_UNKNOWN = -1;
diff --git a/core/java/android/net/PacProxySelector.java b/core/java/android/net/PacProxySelector.java
index 9bdf4f6..85bf79a 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/net/ZeroBalanceHelper.java b/core/java/android/net/ZeroBalanceHelper.java
new file mode 100644
index 0000000..e0ffca5
--- /dev/null
+++ b/core/java/android/net/ZeroBalanceHelper.java
@@ -0,0 +1,99 @@
+/*
+ ** Copyright (c) 2015, The Linux Foundation. All rights reserved.
+
+ ** Redistribution and use in source and binary forms, with or without
+ ** modification, are permitted provided that the following conditions are
+ ** met:
+ **     * Redistributions of source code must retain the above copyright
+ **       notice, this list of conditions and the following disclaimer.
+ **     * Redistributions in binary form must reproduce the above
+ **       copyright notice, this list of conditions and the following
+ **       disclaimer in the documentation and/or other materials provided
+ **       with the distribution.
+ **     * Neither the name of The Linux Foundation nor the names of its
+ **       contributors may be used to endorse or promote products derived
+ **       from this software without specific prior written permission.
+
+ ** THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+ ** WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+ ** ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ ** BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ ** CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ ** SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ ** BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ ** WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ ** OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ ** IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package android.net;
+
+import android.app.ActivityThread;
+import android.content.Context;
+import android.content.Intent;
+import android.os.SystemProperties;
+import android.os.UserHandle;
+import android.util.Log;
+
+import com.android.internal.R;
+
+/** @hide */
+public final class ZeroBalanceHelper {
+
+    public static final String BACKGROUND_DATA_PROPERTY = "sys.background.data.disable";
+    public static final String BACKGROUND_DATA_BROADCAST = "org.codeaurora.background.data";
+    public static final String TAG = "ZeroBalance";
+
+    private static int sRedirectCount = 0;
+    private static int sRedirectMaxCount = 3;
+
+    private Context mContext = null;
+
+    public ZeroBalanceHelper() {
+        mContext = ActivityThread.currentApplication();
+    }
+
+    public void setBgDataProperty(String enabled) {
+        Intent intent = new Intent();
+        intent.setAction(BACKGROUND_DATA_BROADCAST);
+        intent.putExtra("enabled", enabled);
+        mContext.sendBroadcast(intent);
+    }
+
+    public String getBgDataProperty() {
+        String isBgDataPropertySet = SystemProperties.get(BACKGROUND_DATA_PROPERTY, "false");
+        if (Boolean.parseBoolean(isBgDataPropertySet)) {
+            sRedirectCount = 0;
+        }
+        return isBgDataPropertySet;
+    }
+
+    private String getConfiguredRedirectURL() {
+        String redirectURL = mContext.getResources().getString(
+                com.android.internal.R.string.operator_config_url);
+        Log.d(TAG, "Returning the configured redirect URL   :   "
+                + redirectURL);
+        return redirectURL;
+    }
+
+    public synchronized void setHttpRedirectCount(String url) {
+        String redirectUrl = getConfiguredRedirectURL();
+        if (redirectUrl != null && url.contains(redirectUrl)) {
+            sRedirectCount++;
+            Log.d(TAG, "http:sRedirectCount="+sRedirectCount);
+            if (sRedirectCount >= sRedirectMaxCount) {
+                Log.d(TAG,"http:Background Data will be disabled" );
+                setBgDataProperty("true");
+                sRedirectCount = 0;
+            }
+        } else {
+            Log.d(TAG,"http: resetting the counter ");
+            sRedirectCount = 0;
+        }
+    }
+
+    public boolean getFeatureConfigValue() {
+        return mContext.getResources().getBoolean(R.bool.config_zero_balance_operator);
+    }
+}
diff --git a/core/java/android/nfc/INfcAdapter.aidl b/core/java/android/nfc/INfcAdapter.aidl
index 961a3f4..0107d93 100644
--- a/core/java/android/nfc/INfcAdapter.aidl
+++ b/core/java/android/nfc/INfcAdapter.aidl
@@ -1,4 +1,7 @@
 /*
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
  * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +31,7 @@ import android.nfc.INfcTag;
 import android.nfc.INfcCardEmulation;
 import android.nfc.INfcUnlockHandler;
 import android.os.Bundle;
+import android.os.IBinder;
 
 /**
  * @hide
@@ -37,6 +41,7 @@ interface INfcAdapter
     INfcTag getNfcTagInterface();
     INfcCardEmulation getNfcCardEmulationInterface();
     INfcAdapterExtras getNfcAdapterExtrasInterface(in String pkg);
+    IBinder getNfcAdapterVendorInterface(in String vendor);
 
     int getState();
     boolean disable(boolean saveState);
diff --git a/core/java/android/nfc/cardemulation/AidGroup.java b/core/java/android/nfc/cardemulation/AidGroup.java
index 78a9401..9abf325 100644
--- a/core/java/android/nfc/cardemulation/AidGroup.java
+++ b/core/java/android/nfc/cardemulation/AidGroup.java
@@ -1,6 +1,9 @@
 /*
  * Copyright (C) 2015 The Android Open Source Project
  *
+ * Copyright (c) 2015, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
  * 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
@@ -37,7 +40,7 @@ import android.util.Log;
  *
  * @hide
  */
-public final class AidGroup implements Parcelable {
+public class AidGroup implements Parcelable {
     /**
      * The maximum number of AIDs that can be present in any one group.
      */
@@ -45,9 +48,9 @@ public final class AidGroup implements Parcelable {
 
     static final String TAG = "AidGroup";
 
-    final List<String> aids;
-    final String category;
-    final String description;
+    protected List<String> aids;
+    protected String category;
+    protected String description;
 
     /**
      * Creates a new AidGroup object.
diff --git a/core/java/android/nfc/tech/MifareClassic.java b/core/java/android/nfc/tech/MifareClassic.java
index 8c92288..302c02d 100644
--- a/core/java/android/nfc/tech/MifareClassic.java
+++ b/core/java/android/nfc/tech/MifareClassic.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2015 NXP Semiconductors
+ * The original Work has been changed by NXP Semiconductors.
  * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -173,6 +175,10 @@ public final class MifareClassic extends BasicTagTechnology {
             mType = TYPE_CLASSIC;
             mSize = SIZE_4K;
             break;
+        case 0x19:
+            mType = TYPE_CLASSIC;
+            mSize = SIZE_2K;
+            break;
         case 0x28:
             mType = TYPE_CLASSIC;
             mSize = SIZE_1K;
diff --git a/core/java/android/nfc/tech/NfcA.java b/core/java/android/nfc/tech/NfcA.java
index 88730f9..b7fa455 100644
--- a/core/java/android/nfc/tech/NfcA.java
+++ b/core/java/android/nfc/tech/NfcA.java
@@ -1,4 +1,6 @@
 /*
+ * Copyright (C) 2015 NXP Semiconductors
+ * The original Work has been changed by NXP Semiconductors.
  * Copyright (C) 2010 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -66,8 +68,15 @@ public final class NfcA extends BasicTagTechnology {
     /** @hide */
     public NfcA(Tag tag) throws RemoteException {
         super(tag, TagTechnology.NFC_A);
-        Bundle extras = tag.getTechExtras(TagTechnology.NFC_A);
-        mSak = extras.getShort(EXTRA_SAK);
+        Bundle extras;
+        mSak = 0;
+        if(tag.hasTech(TagTechnology.MIFARE_CLASSIC))
+        {
+            extras = tag.getTechExtras(TagTechnology.MIFARE_CLASSIC);
+            mSak = extras.getShort(EXTRA_SAK);
+        }
+        extras = tag.getTechExtras(TagTechnology.NFC_A);
+        mSak |= extras.getShort(EXTRA_SAK);
         mAtqa = extras.getByteArray(EXTRA_ATQA);
     }
 
diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java
index 862f4c4..2df9be2 100644
--- a/core/java/android/os/Build.java
+++ b/core/java/android/os/Build.java
@@ -23,7 +23,11 @@ import com.android.internal.telephony.TelephonyProperties;
 
 import dalvik.system.VMRuntime;
 
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.Objects;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Information about the current build, extracted from system properties.
@@ -664,6 +668,7 @@ public class Build {
 
     /** The type of build, like "user" or "eng". */
     public static final String TYPE = getString("ro.build.type");
+    private static String TYPE_FOR_APPS = parseBuildTypeFromFingerprint();
 
     /** Comma-separated tags describing the build, like "unsigned,debug". */
     public static final String TAGS = getString("ro.build.tags");
@@ -690,6 +695,42 @@ public class Build {
         return finger;
     }
 
+    // Some apps like to compare the build type embedded in fingerprint
+    // to the actual build type. As the fingerprint in our case is almost
+    // always hardcoded to the stock ROM fingerprint, provide that instead
+    // of the actual one if possible.
+    private static String parseBuildTypeFromFingerprint() {
+        final String fingerprint = SystemProperties.get("ro.build.fingerprint");
+        if (TextUtils.isEmpty(fingerprint)) {
+            return null;
+        }
+        Pattern fingerprintPattern =
+                Pattern.compile("(.*)\\/(.*)\\/(.*):(.*)\\/(.*)\\/(.*):(.*)\\/(.*)");
+        Matcher matcher = fingerprintPattern.matcher(fingerprint);
+        return matcher.matches() ? matcher.group(7) : null;
+    }
+
+    /** @hide */
+    public static void adjustBuildTypeIfNeeded() {
+        if (UserHandle.isApp(Process.myUid()) && !TextUtils.isEmpty(TYPE_FOR_APPS)) {
+            try {
+                // This is sick. TYPE is final (which can't be changed because it's an API
+                // guarantee), but we have to reassign it. Resort to reflection to unset the
+                // final modifier, change the value and restore the final modifier afterwards.
+                Field typeField = Build.class.getField("TYPE");
+                Field accessFlagsField = Field.class.getDeclaredField("accessFlags");
+                accessFlagsField.setAccessible(true);
+                int currentFlags = accessFlagsField.getInt(typeField);
+                accessFlagsField.setInt(typeField, currentFlags & ~Modifier.FINAL);
+                typeField.set(null, TYPE_FOR_APPS);
+                accessFlagsField.setInt(typeField, currentFlags);
+                accessFlagsField.setAccessible(false);
+            } catch (Exception e) {
+                // shouldn't happen, but we don't want to crash the app even if it does happen
+            }
+        }
+    }
+
     /**
      * Ensure that raw fingerprint system property is defined. If it was derived
      * dynamically by {@link #deriveFingerprint()} this is where we push the
diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl
index cd84c8f..aa3921a 100644
--- a/core/java/android/os/INetworkManagementService.aidl
+++ b/core/java/android/os/INetworkManagementService.aidl
@@ -440,4 +440,7 @@ interface INetworkManagementService
 
     void addInterfaceToLocalNetwork(String iface, in List<RouteInfo> routes);
     void removeInterfaceFromLocalNetwork(String iface);
+
+    void restrictAppOnData(int uid, boolean restrict);
+    void restrictAppOnWlan(int uid, boolean restrict);
 }
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java
index 65b09eb..02466cc 100644
--- a/core/java/android/os/Process.java
+++ b/core/java/android/os/Process.java
@@ -539,6 +539,15 @@ public class Process {
             ZygoteState zygoteState, ArrayList<String> args)
             throws ZygoteStartFailedEx {
         try {
+            // Throw early if any of the arguments are malformed. This means we can
+            // avoid writing a partial response to the zygote.
+            int sz = args.size();
+            for (int i = 0; i < sz; i++) {
+                if (args.get(i).indexOf('\n') >= 0) {
+                    throw new ZygoteStartFailedEx("embedded newlines not allowed");
+                }
+            }
+
             /**
              * See com.android.internal.os.ZygoteInit.readArgumentList()
              * Presently the wire format to the zygote process is:
@@ -555,13 +564,8 @@ public class Process {
             writer.write(Integer.toString(args.size()));
             writer.newLine();
 
-            int sz = args.size();
             for (int i = 0; i < sz; i++) {
                 String arg = args.get(i);
-                if (arg.indexOf('\n') >= 0) {
-                    throw new ZygoteStartFailedEx(
-                            "embedded newlines not allowed");
-                }
                 writer.write(arg);
                 writer.newLine();
             }
@@ -570,11 +574,16 @@ public class Process {
 
             // Should there be a timeout on this?
             ProcessStartResult result = new ProcessStartResult();
+
+            // Always read the entire result from the input stream to avoid leaving
+            // bytes in the stream for future process starts to accidentally stumble
+            // upon.
             result.pid = inputStream.readInt();
+            result.usingWrapper = inputStream.readBoolean();
+
             if (result.pid < 0) {
                 throw new ZygoteStartFailedEx("fork() failed");
             }
-            result.usingWrapper = inputStream.readBoolean();
             return result;
         } catch (IOException ex) {
             zygoteState.close();
diff --git a/core/java/android/os/RecoverySystem.java b/core/java/android/os/RecoverySystem.java
index 4b6e6c1..d277e65 100644
--- a/core/java/android/os/RecoverySystem.java
+++ b/core/java/android/os/RecoverySystem.java
@@ -335,22 +335,27 @@ public class RecoverySystem {
         throws IOException {
         String filename = packageFile.getCanonicalPath();
 
-        FileWriter uncryptFile = new FileWriter(UNCRYPT_FILE);
-        try {
-            uncryptFile.write(filename + "\n");
-        } finally {
-            uncryptFile.close();
-        }
-        // UNCRYPT_FILE needs to be readable by system server on bootup.
-        if (!UNCRYPT_FILE.setReadable(true, false)) {
-            Log.e(TAG, "Error setting readable for " + UNCRYPT_FILE.getCanonicalPath());
-        }
-        Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!");
+        final String cryptoStatus = SystemProperties.get("ro.crypto.state", "unsupported");
+        final boolean isEncrypted = "encrypted".equalsIgnoreCase(cryptoStatus);
 
-        // If the package is on the /data partition, write the block map file
-        // into COMMAND_FILE instead.
-        if (filename.startsWith("/data/")) {
-            filename = "@/cache/recovery/block.map";
+        if (isEncrypted) {
+            FileWriter uncryptFile = new FileWriter(UNCRYPT_FILE);
+            try {
+                uncryptFile.write(filename + "\n");
+            } finally {
+                uncryptFile.close();
+            }
+            // UNCRYPT_FILE needs to be readable by system server on bootup.
+            if (!UNCRYPT_FILE.setReadable(true, false)) {
+                Log.e(TAG, "Error setting readable for " + UNCRYPT_FILE.getCanonicalPath());
+            }
+            Log.w(TAG, "!!! REBOOTING TO INSTALL " + filename + " !!!");
+
+            // If the package is on the /data partition, write the block map file
+            // into COMMAND_FILE instead.
+            if (filename.startsWith("/data/")) {
+                filename = "@/cache/recovery/block.map";
+            }
         }
 
         final String filenameArg = "--update_package=" + filename;
@@ -372,18 +377,18 @@ public class RecoverySystem {
      * @throws SecurityException if the current user is not allowed to wipe data.
      */
     public static void rebootWipeUserData(Context context) throws IOException {
-        rebootWipeUserData(context, false, context.getPackageName(), false);
+        rebootWipeUserData(context, false, context.getPackageName(), true);
     }
 
     /** {@hide} */
     public static void rebootWipeUserData(Context context, String reason) throws IOException {
-        rebootWipeUserData(context, false, reason, false);
+        rebootWipeUserData(context, false, reason, true);
     }
 
     /** {@hide} */
     public static void rebootWipeUserData(Context context, boolean shutdown)
             throws IOException {
-        rebootWipeUserData(context, shutdown, context.getPackageName(), false);
+        rebootWipeUserData(context, shutdown, context.getPackageName(), true);
     }
 
    /**
diff --git a/core/java/android/preference/SeekBarVolumizer.java b/core/java/android/preference/SeekBarVolumizer.java
index 72f5de5..e5f71a0 100644
--- a/core/java/android/preference/SeekBarVolumizer.java
+++ b/core/java/android/preference/SeekBarVolumizer.java
@@ -412,10 +412,11 @@ public class SeekBarVolumizer implements OnSeekBarChangeListener, Handler.Callba
                 int streamValue = intent.getIntExtra(AudioManager.EXTRA_VOLUME_STREAM_VALUE, -1);
                 updateVolumeSlider(streamType, streamValue);
             } else if (AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION.equals(action)) {
+                final int oldRingerMode = mRingerMode;
                 if (mNotificationOrRing) {
                     mRingerMode = mAudioManager.getRingerModeInternal();
                 }
-                if (mAffectedByRingerMode) {
+                if (mAffectedByRingerMode && oldRingerMode != mRingerMode) {
                     updateSlider();
                 }
             } else if (AudioManager.STREAM_DEVICES_CHANGED_ACTION.equals(action)) {
diff --git a/core/java/android/provider/CallLog.java b/core/java/android/provider/CallLog.java
index 3a3eca4..f6c68dd 100644
--- a/core/java/android/provider/CallLog.java
+++ b/core/java/android/provider/CallLog.java
@@ -27,6 +27,7 @@ import android.database.Cursor;
 import android.location.Country;
 import android.location.CountryDetector;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.ContactsContract.CommonDataKinds.Callable;
@@ -401,6 +402,12 @@ public class CallLog {
         private static final int MIN_DURATION_FOR_NORMALIZED_NUMBER_UPDATE_MS = 1000 * 10;
 
         /**
+         * If a call has an origin inside of the OS, this column will be filled out.
+         * <P>Type: String </P>
+         */
+        private static final String ORIGIN = "origin";
+
+        /**
          * Adds a call to the call log.
          *
          * @param ci the CallerInfo object to get the target contact from.  Can be null
@@ -417,15 +424,16 @@ public class CallLog {
          * @param duration call duration in seconds
          * @param dataUsage data usage for the call in bytes, null if data usage was not tracked for
          *                  the call.
+         * @param callExtras Bundle of extra data from the call.
          * @result The URI of the call log entry belonging to the user that made or received this
          *        call.
          * {@hide}
          */
         public static Uri addCall(CallerInfo ci, Context context, String number,
                 int presentation, int callType, int features, PhoneAccountHandle accountHandle,
-                long start, int duration, Long dataUsage) {
+                long start, int duration, Long dataUsage, Bundle callExtras) {
             return addCall(ci, context, number, presentation, callType, features, accountHandle,
-                    start, duration, dataUsage, false, false);
+                    start, duration, dataUsage, false, false, callExtras);
         }
 
 
@@ -448,16 +456,17 @@ public class CallLog {
          *                  the call.
          * @param addForAllUsers If true, the call is added to the call log of all currently
          *        running users. The caller must have the MANAGE_USERS permission if this is true.
-         *
+         * @param callExtras Bundle of extra data from the call.
          * @result The URI of the call log entry belonging to the user that made or received this
          *        call.
          * {@hide}
          */
         public static Uri addCall(CallerInfo ci, Context context, String number,
                                   int presentation, int callType, int features, PhoneAccountHandle accountHandle,
-                                  long start, int duration, Long dataUsage, boolean addForAllUsers) {
+                                  long start, int duration, Long dataUsage, boolean addForAllUsers,
+                                  Bundle callExtras) {
             return addCall(ci, context, number, presentation, callType, features, accountHandle,
-                    start, duration, dataUsage, addForAllUsers, false);
+                    start, duration, dataUsage, addForAllUsers, false, callExtras);
         }
 
         /**
@@ -481,6 +490,7 @@ public class CallLog {
          *        running users. The caller must have the MANAGE_USERS permission if this is true.
          * @param is_read Flag to show if the missed call log has been read by the user or not.
          *                Used for call log restore of missed calls.
+         * @param callExtras Bundle of extra data from the call.
          *
          * @result The URI of the call log entry belonging to the user that made or received this
          *        call.
@@ -488,7 +498,8 @@ public class CallLog {
          */
         public static Uri addCall(CallerInfo ci, Context context, String number,
                 int presentation, int callType, int features, PhoneAccountHandle accountHandle,
-                long start, int duration, Long dataUsage, boolean addForAllUsers, boolean is_read) {
+                long start, int duration, Long dataUsage, boolean addForAllUsers, boolean is_read,
+                Bundle callExtras) {
             final ContentResolver resolver = context.getContentResolver();
             int numberPresentation = PRESENTATION_ALLOWED;
 
@@ -547,6 +558,9 @@ public class CallLog {
             if (dataUsage != null) {
                 values.put(DATA_USAGE, dataUsage);
             }
+            if (callExtras != null && callExtras.containsKey(PhoneConstants.EXTRA_CALL_ORIGIN)) {
+                values.put(ORIGIN, callExtras.getString(PhoneConstants.EXTRA_CALL_ORIGIN));
+            }
             values.put(PHONE_ACCOUNT_COMPONENT_NAME, accountComponentString);
             values.put(PHONE_ACCOUNT_ID, accountId);
             values.put(PHONE_ACCOUNT_ADDRESS, accountAddress);
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index f6642d8..3ab16fe 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -1509,7 +1509,6 @@ public final class Settings {
             // At one time in System, then Global, but now back in Secure
             MOVED_TO_SECURE.add(Secure.INSTALL_NON_MARKET_APPS);
 
-            MOVED_TO_SECURE.add(System.DEV_FORCE_SHOW_NAVBAR);
             MOVED_TO_SECURE.add(System.KEYBOARD_BRIGHTNESS);
             MOVED_TO_SECURE.add(System.BUTTON_BRIGHTNESS);
             MOVED_TO_SECURE.add(System.BUTTON_BACKLIGHT_TIMEOUT);
@@ -6445,6 +6444,18 @@ public final class Settings {
         public static final String BLUETOOTH_DISABLED_PROFILES = "bluetooth_disabled_profiles";
 
         /**
+         * A semi-colon separated list of Bluetooth interoperability workarounds.
+         * Each entry is a partial Bluetooth device address string and an integer representing
+         * the feature to be disabled, separated by a comma. The integer must correspond
+         * to a interoperability feature as defined in "interop.h" in /system/bt.
+         * <p>
+         * Example: <br/>
+         *   "00:11:22,0;01:02:03:04,2"
+         * @hide
+         */
+       public static final String BLUETOOTH_INTEROPERABILITY_LIST = "bluetooth_interoperability_list";
+
+        /**
          * The policy for deciding when Wi-Fi should go to sleep (which will in
          * turn switch to using the mobile data as an Internet connection).
          * <p>
diff --git a/core/java/android/service/voice/VoiceInteractionServiceInfo.java b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
index 463eb5b..8393f7e 100644
--- a/core/java/android/service/voice/VoiceInteractionServiceInfo.java
+++ b/core/java/android/service/voice/VoiceInteractionServiceInfo.java
@@ -58,6 +58,10 @@ public class VoiceInteractionServiceInfo {
     }
 
     public VoiceInteractionServiceInfo(PackageManager pm, ServiceInfo si) {
+        if (si == null) {
+            mParseError = "Service not available";
+            return;
+        }
         if (!Manifest.permission.BIND_VOICE_INTERACTION.equals(si.permission)) {
             mParseError = "Service does not require permission "
                     + Manifest.permission.BIND_VOICE_INTERACTION;
diff --git a/core/java/android/util/Patterns.java b/core/java/android/util/Patterns.java
index 6fc8ae5..f1b3feb 100644
--- a/core/java/android/util/Patterns.java
+++ b/core/java/android/util/Patterns.java
@@ -136,7 +136,7 @@ public class Patterns {
      * RFC 1035 Section 2.3.4 limits the labels to a maximum 63 octets.
      */
     private static final String IRI =
-        "[" + GOOD_IRI_HOST_CHAR + "]([" + GOOD_IRI_HOST_CHAR + "\\-]{0,61}["
+        "[" + GOOD_IRI_HOST_CHAR + "]([" + GOOD_IRI_HOST_CHAR + "\\-_~]{0,61}["
         + GOOD_IRI_HOST_CHAR + "]){0,1}";
 
     private static final String GOOD_GTLD_CHAR =
diff --git a/core/java/android/view/IWindowManager.aidl b/core/java/android/view/IWindowManager.aidl
index 55735c7..b3f4046 100644
--- a/core/java/android/view/IWindowManager.aidl
+++ b/core/java/android/view/IWindowManager.aidl
@@ -287,4 +287,6 @@ interface IWindowManager
      * @return The frame statistics or null if the window does not exist.
      */
     WindowContentFrameStats getWindowContentFrameStats(IBinder token);
+
+    void setLiveLockscreenEdgeDetector(boolean enable);
 }
diff --git a/core/java/android/view/MotionEvent.java b/core/java/android/view/MotionEvent.java
index 527d7e5..e0c9d59 100644
--- a/core/java/android/view/MotionEvent.java
+++ b/core/java/android/view/MotionEvent.java
@@ -417,6 +417,21 @@ public final class MotionEvent extends InputEvent implements Parcelable {
     public static final int FLAG_WINDOW_IS_OBSCURED = 0x1;
 
     /**
+     * This flag indicates that the window that received this motion event is partly
+     * or wholly obscured by another visible window above it.  This flag is set to true
+     * even if the event did not directly pass through the obscured area.
+     * A security sensitive application can check this flag to identify situations in which
+     * a malicious application may have covered up part of its content for the purpose
+     * of misleading the user or hijacking touches.  An appropriate response might be
+     * to drop the suspect touches or to take additional precautions to confirm the user's
+     * actual intent.
+     *
+     * Unlike FLAG_WINDOW_IS_OBSCURED, this is actually true.
+     * @hide
+     */
+    public static final int FLAG_WINDOW_IS_PARTIALLY_OBSCURED = 0x2;
+
+    /**
      * Private flag that indicates when the system has detected that this motion event
      * may be inconsistent with respect to the sequence of previously delivered motion events,
      * such as when a pointer move event is sent but the pointer is not down.
diff --git a/core/java/android/view/Window.java b/core/java/android/view/Window.java
index 3616622..50a926f 100644
--- a/core/java/android/view/Window.java
+++ b/core/java/android/view/Window.java
@@ -869,10 +869,6 @@ public abstract class Window {
     }
 
     private void setPrivateFlags(int flags, int mask) {
-        if ((flags & mask & WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY) != 0){
-            mContext.enforceCallingOrSelfPermission("android.permission.PREVENT_POWER_KEY",
-                    "No permission to prevent power key");
-        }
         final WindowManager.LayoutParams attrs = getAttributes();
         attrs.privateFlags = (attrs.privateFlags & ~mask) | (flags & mask);
         dispatchWindowAttributesChanged(attrs);
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 1125b44..36f593e 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -1154,7 +1154,13 @@ public interface WindowManager extends ViewManager {
         public static final int PRIVATE_FLAG_WAS_NOT_FULLSCREEN = 0x02000000;
 
         /**
-         * Window flag: Overrides default power key behavior
+         * Window flag: Overrides default system key behavior.
+         * {@hide}
+         */
+        public static final int PRIVATE_FLAG_PREVENT_SYSTEM_KEYS = 0x10000000;
+
+        /**
+         * Window flag: Overrides default system key behavior.
          * {@hide}
          */
         public static final int PRIVATE_FLAG_PREVENT_POWER_KEY = 0x20000000;
diff --git a/core/java/android/view/WindowManagerPolicy.java b/core/java/android/view/WindowManagerPolicy.java
index a962f2a..9d7c741 100644
--- a/core/java/android/view/WindowManagerPolicy.java
+++ b/core/java/android/view/WindowManagerPolicy.java
@@ -20,6 +20,7 @@ import android.annotation.IntDef;
 import android.annotation.SystemApi;
 import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.res.CompatibilityInfo;
 import android.content.res.Configuration;
 import android.graphics.Rect;
@@ -665,6 +666,11 @@ public interface WindowManagerPolicy {
     public WindowState getWinShowWhenLockedLw();
 
     /**
+     * Returns the current keyguard panel, if such a thing exists.
+     */
+    public WindowState getWinKeyguardPanelLw();
+
+    /**
      * Called when the system would like to show a UI to indicate that an
      * application is starting.  You can use this to add a
      * APPLICATION_STARTING_TYPE window with the given appToken to the window
@@ -1166,9 +1172,10 @@ public interface WindowManagerPolicy {
     public void systemBooted();
 
     /**
-     * Show boot time message to the user.
+     * Update UI for boot-up progress.
      */
-    public void showBootMessage(final CharSequence msg, final boolean always);
+    public void updateBootProgress(final int stage, final ApplicationInfo optimizedApp,
+            final int currentAppPos, final int totalAppCount);
 
     /**
      * Hide the UI for showing boot messages, never to be displayed again.
@@ -1320,4 +1327,6 @@ public interface WindowManagerPolicy {
      * @param fadeoutDuration the duration of the exit animation, in milliseconds
      */
     public void startKeyguardExitAnimation(long startTime, long fadeoutDuration);
+
+    public void setLiveLockscreenEdgeDetector(boolean enable);
 }
diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java
index 7699673..e137f94 100644
--- a/core/java/com/android/internal/app/ChooserActivity.java
+++ b/core/java/com/android/internal/app/ChooserActivity.java
@@ -656,7 +656,19 @@ public class ChooserActivity extends ResolverActivity {
             }
             intent.setComponent(mChooserTarget.getComponentName());
             intent.putExtras(mChooserTarget.getIntentExtras());
-            activity.startActivityAsCaller(intent, options, true, userId);
+
+            // Important: we will ignore the target security checks in ActivityManager
+            // if and only if the ChooserTarget's target package is the same package
+            // where we got the ChooserTargetService that provided it. This lets a
+            // ChooserTargetService provide a non-exported or permission-guarded target
+            // to the chooser for the user to pick.
+            //
+            // If mSourceInfo is null, we got this ChooserTarget from the caller or elsewhere
+            // so we'll obey the caller's normal security checks.
+            final boolean ignoreTargetSecurity = mSourceInfo != null
+                    && mSourceInfo.getResolvedComponentName().getPackageName()
+                    .equals(mChooserTarget.getComponentName().getPackageName());
+            activity.startActivityAsCaller(intent, options, ignoreTargetSecurity, userId);
             return true;
         }
 
diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java
index 00e250b..4c3cc4d 100644
--- a/core/java/com/android/internal/app/ResolverActivity.java
+++ b/core/java/com/android/internal/app/ResolverActivity.java
@@ -91,7 +91,7 @@ public class ResolverActivity extends Activity {
     private ResolveListAdapter mAdapter;
     private PackageManager mPm;
     private boolean mSafeForwardingMode;
-    private boolean mAlwaysUseOption;
+    /*package*/ boolean mAlwaysUseOption;
     private AbsListView mAdapterView;
     private ViewGroup mFilteredItemContainer;
     private Button mAlwaysButton;
@@ -1571,7 +1571,7 @@ public class ResolverActivity extends Activity {
             return mDisplayList.get(index);
         }
 
-        public final View getView(int position, View convertView, ViewGroup parent) {
+        public View getView(int position, View convertView, ViewGroup parent) {
             View view = convertView;
             if (view == null) {
                 view = createView(parent);
diff --git a/core/java/com/android/internal/app/ResolverProxy.java b/core/java/com/android/internal/app/ResolverProxy.java
new file mode 100644
index 0000000..f59fd11
--- /dev/null
+++ b/core/java/com/android/internal/app/ResolverProxy.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod 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.internal.app;
+
+import java.util.List;
+import android.content.pm.ResolveInfo;
+import android.content.Context;
+import android.content.Intent;
+import android.widget.AbsListView;
+import android.app.VoiceInteractor.PickOptionRequest.Option;
+import com.android.internal.app.ResolverActivity.TargetInfo;
+
+/** Relax access modifiers on key ResolverActivity extension methods to allow
+    them to be overridden from a different package/classloader.
+    Used by CMResolver */
+public class ResolverProxy extends ResolverActivity {
+    private static final String TAG = "ResolverProxy";
+
+    /** If the superclass may set up adapter entries after onCreate completes,
+        This method should be overridden to do nothing, and
+        sendVoiceChoicesIfNeeded should be called once the adapter setup is
+        complete. */
+    @Override
+    protected void onSetupVoiceInteraction() {
+        super.onSetupVoiceInteraction();
+    }
+
+    /** see onSetupVoiceInteraction */
+    @Override
+    protected void sendVoiceChoicesIfNeeded() {
+        super.sendVoiceChoicesIfNeeded();
+    }
+
+    @Override
+    protected int getLayoutResource() {
+        return super.getLayoutResource();
+    }
+
+    @Override
+    protected void bindProfileView() {
+        super.bindProfileView();
+    }
+
+    @Override
+    protected Option optionForChooserTarget(TargetInfo target, int index) {
+        return super.optionForChooserTarget(target, index);
+    }
+
+    @Override
+    protected boolean shouldGetActivityMetadata() {
+        return super.shouldGetActivityMetadata();
+    }
+
+    @Override
+    protected boolean shouldAutoLaunchSingleChoice(TargetInfo target) {
+        return super.shouldAutoLaunchSingleChoice(target);
+    }
+
+    @Override
+    protected void showAppDetails(ResolveInfo ri) {
+        super.showAppDetails(ri);
+    }
+
+    @Override
+    void startSelected(int which, boolean always, boolean filtered) {
+        super.startSelected(which, always, filtered);
+    }
+
+    @Override
+    protected void onActivityStarted(TargetInfo cti) {
+        super.onActivityStarted(cti);
+    }
+
+    @Override
+    protected boolean configureContentView(
+            List<Intent> payloadIntents, Intent[] initialIntents,
+            List<ResolveInfo> rList, boolean alwaysUseOption) {
+        return super.configureContentView(
+                payloadIntents, initialIntents, rList, alwaysUseOption);
+    }
+
+    @Override
+    protected void onPrepareAdapterView(
+            AbsListView adapterView, ResolveListAdapter adapter, boolean alwaysUseOption) {
+        super.onPrepareAdapterView(adapterView, adapter, alwaysUseOption);
+    }
+
+    /** subclasses cannot override this because ResolveListAdapter is an inaccessible
+        type. Override createProxyAdapter(...) instead */
+    @Override
+    ResolveListAdapter createAdapter(Context context, List<Intent> payloadIntents,
+            Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid,
+            boolean filterLastUsed) {
+        ProxyListAdapter adapter = createProxyAdapter(
+            context, payloadIntents, initialIntents, rList, launchedFromUid, filterLastUsed);
+        return (adapter != null)
+            ? adapter
+            : super.createAdapter(context, payloadIntents, initialIntents,
+                                  rList, launchedFromUid, filterLastUsed);
+    }
+
+    /** Subclasses should override this instead of createAdapter to avoid issues
+        with ResolveListAdapter being an inaccessible type */
+    protected ProxyListAdapter createProxyAdapter(Context context, List<Intent> payloadIntents,
+            Intent[] initialIntents, List<ResolveInfo> rList, int launchedFromUid,
+            boolean filterLastUsed) {
+        return null;
+    }
+
+    protected void setAlwaysUseOption(boolean alwaysUse) {
+        mAlwaysUseOption = alwaysUse;
+    }
+
+    /** Provides a visible type for exending ResolveListAdapter - fortunately the key
+        methods one would need to override in ResolveListAdapter are all public or protected */
+    public class ProxyListAdapter extends ResolveListAdapter {
+        public ProxyListAdapter(
+                Context context, List<Intent> payloadIntents, Intent[] initialIntents,
+                List<ResolveInfo> rList, int launchedFromUid, boolean filterLastUsed) {
+            super(context, payloadIntents, initialIntents, rList, launchedFromUid, filterLastUsed);
+        }
+
+        /** complements getDisplayInfoCount and getDisplayInfoAt */
+        public TargetInfo removeDisplayInfoAt(int index) {
+            if (index >= 0 && index < mDisplayList.size()) {
+                return mDisplayList.remove(index);
+            } else {
+                return null;
+            }
+        }
+    }
+}
diff --git a/core/java/com/android/internal/content/NativeLibraryHelper.java b/core/java/com/android/internal/content/NativeLibraryHelper.java
index f479f4f..f5b948f 100644
--- a/core/java/com/android/internal/content/NativeLibraryHelper.java
+++ b/core/java/com/android/internal/content/NativeLibraryHelper.java
@@ -62,6 +62,8 @@ public class NativeLibraryHelper {
     // that the cpuAbiOverride must be clear.
     public static final String CLEAR_ABI_OVERRIDE = "-";
 
+    private static final Object mRestoreconSync = new Object();
+
     /**
      * A handle to an opened package, consisting of one or more APKs. Used as
      * input to the various NativeLibraryHelper methods. Allows us to scan and
@@ -275,8 +277,12 @@ public class NativeLibraryHelper {
                 throw new IOException("Cannot chmod native library directory "
                         + path.getPath(), e);
             }
-        } else if (!SELinux.restorecon(path)) {
-            throw new IOException("Cannot set SELinux context for " + path.getPath());
+        } else {
+            synchronized (mRestoreconSync) {
+                if (!SELinux.restorecon(path)) {
+                    throw new IOException("Cannot set SELinux context for " + path.getPath());
+                }
+            }
         }
     }
 
diff --git a/core/java/com/android/internal/content/PackageHelper.java b/core/java/com/android/internal/content/PackageHelper.java
index b04ddf4..0611401 100644
--- a/core/java/com/android/internal/content/PackageHelper.java
+++ b/core/java/com/android/internal/content/PackageHelper.java
@@ -378,15 +378,6 @@ public class PackageHelper {
             installLocation = PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY;
         }
 
-        // If app expresses strong desire for internal space, honor it
-        if (installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
-            if (fitsOnInternal) {
-                return null;
-            } else {
-                throw new IOException("Requested internal only, but not enough space");
-            }
-        }
-
         // If app already exists somewhere, prefer to stay on that volume
         if (existingInfo != null) {
             if (existingInfo.volumeUuid == null && fitsOnInternal) {
@@ -397,6 +388,15 @@ public class PackageHelper {
             }
         }
 
+        // If app expresses strong desire for internal space, honor it
+        if (installLocation == PackageInfo.INSTALL_LOCATION_INTERNAL_ONLY) {
+            if (fitsOnInternal) {
+                return null;
+            } else {
+                throw new IOException("Requested internal only, but not enough space");
+            }
+        }
+
         // We're left with either preferring external or auto, so just pick
         // volume with most space
         if (bestCandidate != null) {
diff --git a/core/java/com/android/internal/os/RuntimeInit.java b/core/java/com/android/internal/os/RuntimeInit.java
index 3377189..45dac2f 100644
--- a/core/java/com/android/internal/os/RuntimeInit.java
+++ b/core/java/com/android/internal/os/RuntimeInit.java
@@ -114,6 +114,8 @@ public class RuntimeInit {
         /* set default handler; this applies to all threads in the VM */
         Thread.setDefaultUncaughtExceptionHandler(new UncaughtHandler());
 
+        Build.adjustBuildTypeIfNeeded();
+
         /*
          * Install a TimezoneGetter subclass for ZoneInfo.db
          */
diff --git a/core/java/com/android/internal/policy/IKeyguardService.aidl b/core/java/com/android/internal/policy/IKeyguardService.aidl
index e330de2..6f47f70 100644
--- a/core/java/com/android/internal/policy/IKeyguardService.aidl
+++ b/core/java/com/android/internal/policy/IKeyguardService.aidl
@@ -94,4 +94,5 @@ oneway interface IKeyguardService {
      * to start the keyguard dismiss sequence.
      */
     void onActivityDrawn();
+    void showKeyguard();
 }
diff --git a/core/java/com/android/internal/policy/IKeyguardStateCallback.aidl b/core/java/com/android/internal/policy/IKeyguardStateCallback.aidl
index db3b40b..3468764 100644
--- a/core/java/com/android/internal/policy/IKeyguardStateCallback.aidl
+++ b/core/java/com/android/internal/policy/IKeyguardStateCallback.aidl
@@ -19,4 +19,5 @@ interface IKeyguardStateCallback {
     void onShowingStateChanged(boolean showing);
     void onSimSecureStateChanged(boolean simSecure);
     void onInputRestrictedStateChanged(boolean inputRestricted);
+    void onKeyguardPanelFocusChanged(boolean focused);
 }
\ No newline at end of file
diff --git a/core/java/com/android/internal/util/cm/SpamFilter.java b/core/java/com/android/internal/util/cm/SpamFilter.java
index 9de4489..c261009 100644
--- a/core/java/com/android/internal/util/cm/SpamFilter.java
+++ b/core/java/com/android/internal/util/cm/SpamFilter.java
@@ -46,10 +46,21 @@ public class SpamFilter {
     }
 
     public static String getNotificationContent(Notification notification) {
+        CharSequence notificationTitle = getNotificationTitle(notification);
+        CharSequence notificationMessage = getNotificationMessage(notification);
+        return notificationTitle + "\n" + notificationMessage;
+    }
+
+    private static CharSequence getNotificationTitle(Notification notification) {
         Bundle extras = notification.extras;
         String titleExtra = extras.containsKey(Notification.EXTRA_TITLE_BIG)
                 ? Notification.EXTRA_TITLE_BIG : Notification.EXTRA_TITLE;
         CharSequence notificationTitle = extras.getCharSequence(titleExtra);
+        return notificationTitle;
+    }
+
+    private static CharSequence getNotificationMessage(Notification notification) {
+        Bundle extras = notification.extras;
         CharSequence notificationMessage = extras.getCharSequence(Notification.EXTRA_TEXT);
 
         if (TextUtils.isEmpty(notificationMessage)) {
@@ -60,6 +71,12 @@ public class SpamFilter {
                 notificationMessage = TextUtils.join("\n", inboxLines);
             }
         }
-        return notificationTitle + "\n" + notificationMessage;
+        return notificationMessage;
+    }
+
+    public static boolean hasFilterableContent(Notification notification) {
+        CharSequence notificationTitle = getNotificationTitle(notification);
+        CharSequence notificationMessage = getNotificationMessage(notification);
+        return !(TextUtils.isEmpty(notificationTitle) && TextUtils.isEmpty(notificationMessage));
     }
 }
diff --git a/core/java/com/android/internal/widget/LockPatternUtils.java b/core/java/com/android/internal/widget/LockPatternUtils.java
index d9c2a92..5dc91d2 100644
--- a/core/java/com/android/internal/widget/LockPatternUtils.java
+++ b/core/java/com/android/internal/widget/LockPatternUtils.java
@@ -263,7 +263,7 @@ public class LockPatternUtils {
             throws RequestThrottledException {
         try {
             VerifyCredentialResponse response =
-                getLockSettings().verifyPattern(patternToString(pattern), challenge, userId);
+                getLockSettings().verifyPattern(patternToString(pattern, userId), challenge, userId);
             if (response == null) {
                 // Shouldn't happen
                 return null;
@@ -291,7 +291,7 @@ public class LockPatternUtils {
             throws RequestThrottledException {
         try {
             VerifyCredentialResponse response =
-                    getLockSettings().checkPattern(patternToString(pattern), userId);
+                    getLockSettings().checkPattern(patternToString(pattern, userId), userId);
 
             if (response.getResponseCode() == VerifyCredentialResponse.RESPONSE_OK) {
                 return true;
@@ -301,7 +301,7 @@ public class LockPatternUtils {
                 return false;
             }
         } catch (RemoteException re) {
-            return true;
+            return false;
         }
     }
 
@@ -350,7 +350,7 @@ public class LockPatternUtils {
                 return false;
             }
         } catch (RemoteException re) {
-            return true;
+            return false;
         }
     }
 
@@ -518,7 +518,7 @@ public class LockPatternUtils {
                         + MIN_LOCK_PATTERN_SIZE + " dots long.");
             }
 
-            getLockSettings().setLockPattern(patternToString(pattern), savedPattern, userId);
+            getLockSettings().setLockPattern(patternToString(pattern, userId), savedPattern, userId);
             DevicePolicyManager dpm = getDevicePolicyManager();
 
             // Update the device encryption password.
@@ -527,7 +527,7 @@ public class LockPatternUtils {
                 if (!shouldEncryptWithCredentials(true)) {
                     clearEncryptionPassword();
                 } else {
-                    String stringPattern = patternToString(pattern);
+                    String stringPattern = patternToString(pattern, userId);
                     updateEncryptionPassword(StorageManager.CRYPT_TYPE_PATTERN, stringPattern);
                 }
             }
@@ -878,8 +878,8 @@ public class LockPatternUtils {
      * @param pattern The pattern.
      * @return The pattern in string form.
      */
-    public String patternToString(List<LockPatternView.Cell> pattern) {
-        return patternToString(pattern, getLockPatternSize());
+    public String patternToString(List<LockPatternView.Cell> pattern, int userId) {
+        return patternToString(pattern, getLockPatternSize(userId));
     }
 
     /**
@@ -1100,8 +1100,8 @@ public class LockPatternUtils {
     /**
      * @return the pattern lockscreen size
      */
-    public byte getLockPatternSize() {
-        long size = getLong(Settings.Secure.LOCK_PATTERN_SIZE, -1, UserHandle.USER_CURRENT);
+    public byte getLockPatternSize(int userId) {
+        long size = getLong(Settings.Secure.LOCK_PATTERN_SIZE, -1, userId);
         if (size > 0 && size < 128) {
             return (byte) size;
         }
@@ -1111,8 +1111,8 @@ public class LockPatternUtils {
     /**
      * Set the pattern lockscreen size
      */
-    public void setLockPatternSize(long size) {
-        setLong(Settings.Secure.LOCK_PATTERN_SIZE, size, UserHandle.USER_CURRENT);
+    public void setLockPatternSize(long size, int userId) {
+        setLong(Settings.Secure.LOCK_PATTERN_SIZE, size, userId);
     }
 
     public void setVisibleDotsEnabled(boolean enabled, int userId) {
diff --git a/core/java/com/android/server/BootReceiver.java b/core/java/com/android/server/BootReceiver.java
index 92d5aea..6103ebc 100644
--- a/core/java/com/android/server/BootReceiver.java
+++ b/core/java/com/android/server/BootReceiver.java
@@ -97,6 +97,7 @@ public class BootReceiver extends BroadcastReceiver {
         final DropBoxManager db = (DropBoxManager) ctx.getSystemService(Context.DROPBOX_SERVICE);
         final SharedPreferences prefs = ctx.getSharedPreferences("log_files", Context.MODE_PRIVATE);
         final String headers = new StringBuilder(512)
+            .append("CM Version: ").append(SystemProperties.get("ro.cm.version")).append("\n")
             .append("Build: ").append(Build.FINGERPRINT).append("\n")
             .append("Hardware: ").append(Build.BOARD).append("\n")
             .append("Revision: ")
diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp
index f5fe086..0e5c88c 100755
--- a/core/jni/android/graphics/Bitmap.cpp
+++ b/core/jni/android/graphics/Bitmap.cpp
@@ -150,12 +150,12 @@ Bitmap::Bitmap(void* address, void* context, FreeFunc freeFunc,
     mPixelRef->unref();
 }
 
-Bitmap::Bitmap(void* address, int fd,
+Bitmap::Bitmap(void* address, int fd, size_t mappedSize,
             const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable)
         : mPixelStorageType(PixelStorageType::Ashmem) {
     mPixelStorage.ashmem.address = address;
     mPixelStorage.ashmem.fd = fd;
-    mPixelStorage.ashmem.size = ashmem_get_size_region(fd);
+    mPixelStorage.ashmem.size = mappedSize;
     mPixelRef.reset(new WrappedPixelRef(this, address, info, rowBytes, ctable));
     // Note: this will trigger a call to onStrongRefDestroyed(), but
     // we want the pixel ref to have a ref count of 0 at this point
@@ -1015,7 +1015,7 @@ static jobject Bitmap_createFromParcel(JNIEnv* env, jobject, jobject parcel) {
 
         // Map the pixels in place and take ownership of the ashmem region.
         nativeBitmap = GraphicsJNI::mapAshmemPixelRef(env, bitmap.get(),
-                ctable, dupFd, const_cast<void*>(blob.data()), !isMutable);
+                ctable, dupFd, const_cast<void*>(blob.data()), size, !isMutable);
         SkSafeUnref(ctable);
         if (!nativeBitmap) {
             close(dupFd);
diff --git a/core/jni/android/graphics/Bitmap.h b/core/jni/android/graphics/Bitmap.h
index eadba5c..aaea178 100644
--- a/core/jni/android/graphics/Bitmap.h
+++ b/core/jni/android/graphics/Bitmap.h
@@ -51,8 +51,8 @@ public:
             const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable);
     Bitmap(void* address, void* context, FreeFunc freeFunc,
             const SkImageInfo& info, size_t rowBytes, SkColorTable* ctable);
-    Bitmap(void* address, int fd, const SkImageInfo& info, size_t rowBytes,
-            SkColorTable* ctable);
+    Bitmap(void* address, int fd, size_t mappedSize, const SkImageInfo& info,
+            size_t rowBytes, SkColorTable* ctable);
 
     const SkImageInfo& info() const;
 
diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp
index 93259e7..b669871 100644
--- a/core/jni/android/graphics/Graphics.cpp
+++ b/core/jni/android/graphics/Graphics.cpp
@@ -613,7 +613,7 @@ android::Bitmap* GraphicsJNI::allocateAshmemPixelRef(JNIEnv* env, SkBitmap* bitm
         return nullptr;
     }
 
-    android::Bitmap* wrapper = new android::Bitmap(addr, fd, info, rowBytes, ctable);
+    android::Bitmap* wrapper = new android::Bitmap(addr, fd, size, info, rowBytes, ctable);
     wrapper->getSkBitmap(bitmap);
     // since we're already allocated, we lockPixels right away
     // HeapAllocator behaves this way too
@@ -623,7 +623,7 @@ android::Bitmap* GraphicsJNI::allocateAshmemPixelRef(JNIEnv* env, SkBitmap* bitm
 }
 
 android::Bitmap* GraphicsJNI::mapAshmemPixelRef(JNIEnv* env, SkBitmap* bitmap,
-        SkColorTable* ctable, int fd, void* addr, bool readOnly) {
+        SkColorTable* ctable, int fd, void* addr, size_t size, bool readOnly) {
     const SkImageInfo& info = bitmap->info();
     if (info.fColorType == kUnknown_SkColorType) {
         doThrowIAE(env, "unknown bitmap configuration");
@@ -633,7 +633,8 @@ android::Bitmap* GraphicsJNI::mapAshmemPixelRef(JNIEnv* env, SkBitmap* bitmap,
     if (!addr) {
         // Map existing ashmem region if not already mapped.
         int flags = readOnly ? (PROT_READ) : (PROT_READ | PROT_WRITE);
-        addr = mmap(NULL, ashmem_get_size_region(fd), flags, MAP_SHARED, fd, 0);
+        size = ashmem_get_size_region(fd);
+        addr = mmap(NULL, size, flags, MAP_SHARED, fd, 0);
         if (addr == MAP_FAILED) {
             return nullptr;
         }
@@ -643,7 +644,7 @@ android::Bitmap* GraphicsJNI::mapAshmemPixelRef(JNIEnv* env, SkBitmap* bitmap,
     // attempting to compute our own.
     const size_t rowBytes = bitmap->rowBytes();
 
-    android::Bitmap* wrapper = new android::Bitmap(addr, fd, info, rowBytes, ctable);
+    android::Bitmap* wrapper = new android::Bitmap(addr, fd, size, info, rowBytes, ctable);
     wrapper->getSkBitmap(bitmap);
     if (readOnly) {
         bitmap->pixelRef()->setImmutable();
diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h
index bcd834b..b1d66b7 100644
--- a/core/jni/android/graphics/GraphicsJNI.h
+++ b/core/jni/android/graphics/GraphicsJNI.h
@@ -99,7 +99,7 @@ public:
             SkColorTable* ctable);
 
     static android::Bitmap* mapAshmemPixelRef(JNIEnv* env, SkBitmap* bitmap,
-            SkColorTable* ctable, int fd, void* addr, bool readOnly);
+            SkColorTable* ctable, int fd, void* addr, size_t size, bool readOnly);
 
     /**
      * Given a bitmap we natively allocate a memory block to store the contents
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 1acf867..91b3278 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -154,11 +154,6 @@ static struct {
     jmethodID postDynPolicyEventFromNative;
 } gDynPolicyEventHandlerMethods;
 
-static struct {
-    jmethodID postEffectSessionEventFromNative;
-} gEffectSessionEventHandlerMethods;
-
-
 static Mutex gLock;
 
 enum AudioError {
@@ -391,24 +386,6 @@ android_media_AudioSystem_dyn_policy_callback(int event, String8 regId, int val)
 
 }
 
-static void
-android_media_AudioSystem_effect_session_callback(int event, audio_stream_type_t stream,
-        audio_unique_id_t sessionId, bool added)
-{
-    JNIEnv *env = AndroidRuntime::getJNIEnv();
-    if (env == NULL) {
-        return;
-    }
-
-    jclass clazz = env->FindClass(kClassPathName);
-
-    env->CallStaticVoidMethod(clazz, gEffectSessionEventHandlerMethods.postEffectSessionEventFromNative,
-            event, stream, sessionId, added);
-
-    env->DeleteLocalRef(clazz);
-
-}
-
 static jint
 android_media_AudioSystem_setDeviceConnectionState(JNIEnv *env, jobject thiz, jint device, jint state, jstring device_address, jstring device_name)
 {
@@ -1510,12 +1487,6 @@ android_media_AudioSystem_registerDynPolicyCallback(JNIEnv *env, jobject thiz)
     AudioSystem::setDynPolicyCallback(android_media_AudioSystem_dyn_policy_callback);
 }
 
-static void
-android_media_AudioSystem_registerEffectSessionCallback(JNIEnv *env, jobject thiz)
-{
-    AudioSystem::setEffectSessionCallback(android_media_AudioSystem_effect_session_callback);
-}
-
 
 static jint convertAudioMixToNative(JNIEnv *env,
                                     AudioMix *nAudioMix,
@@ -1688,8 +1659,6 @@ static JNINativeMethod gMethods[] = {
                                             (void *)android_media_AudioSystem_registerPolicyMixes},
     {"native_register_dynamic_policy_callback", "()V",
                                     (void *)android_media_AudioSystem_registerDynPolicyCallback},
-    {"native_register_effect_session_callback", "()V",
-                                    (void *)android_media_AudioSystem_registerEffectSessionCallback},
     {"systemReady", "()I", (void *)android_media_AudioSystem_systemReady},
 };
 
@@ -1797,10 +1766,6 @@ int register_android_media_AudioSystem(JNIEnv *env)
             GetStaticMethodIDOrDie(env, env->FindClass(kClassPathName),
                     "dynamicPolicyCallbackFromNative", "(ILjava/lang/String;I)V");
 
-    gEffectSessionEventHandlerMethods.postEffectSessionEventFromNative =
-            GetStaticMethodIDOrDie(env, env->FindClass(kClassPathName),
-                    "effectSessionCallbackFromNative", "(IIIZ)V");
-
     jclass audioMixClass = FindClassOrDie(env, "android/media/audiopolicy/AudioMix");
     gAudioMixClass = MakeGlobalRefOrDie(env, audioMixClass);
     gAudioMixFields.mRule = GetFieldIDOrDie(env, audioMixClass, "mRule",
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index ac64edf..4f90bd9 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -16,6 +16,8 @@
 
 #define LOG_TAG "Zygote"
 
+#include <sstream>
+
 // sys/mount.h has to come before linux/fs.h due to redefinition of MS_RDONLY, MS_BIND, etc
 #include <sys/mount.h>
 #include <linux/fs.h>
@@ -53,6 +55,7 @@
 #include "ScopedLocalRef.h"
 #include "ScopedPrimitiveArray.h"
 #include "ScopedUtfChars.h"
+#include "fd_utils-inl.h"
 
 #include "nativebridge/native_bridge.h"
 
@@ -78,6 +81,12 @@ static void RuntimeAbort(JNIEnv* env) {
   env->FatalError("RuntimeAbort");
 }
 
+static void RuntimeAbort(JNIEnv* env, int line, const char* msg) {
+  std::ostringstream oss;
+  oss << __FILE__ << ":" << line << ": " << msg;
+  env->FatalError(oss.str().c_str());
+}
+
 // This signal handler is for zygote mode, since the zygote must reap its children
 static void SigChldHandler(int /*signal_number*/) {
   pid_t pid;
@@ -439,6 +448,9 @@ static void SetForkLoad(bool boost) {
 }
 #endif
 
+// The list of open zygote file descriptors.
+static FileDescriptorTable* gOpenFdTable = NULL;
+
 // Utility routine to fork zygote and specialize the child process.
 static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArray javaGids,
                                      jint debug_flags, jobjectArray javaRlimits,
@@ -453,6 +465,22 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
   SetForkLoad(true);
 #endif
 
+  // Close any logging related FDs before we start evaluating the list of
+  // file descriptors.
+  __android_log_close();
+
+  // If this is the first fork for this zygote, create the open FD table.
+  // If it isn't, we just need to check whether the list of open files has
+  // changed (and it shouldn't in the normal case).
+  if (gOpenFdTable == NULL) {
+    gOpenFdTable = FileDescriptorTable::Create();
+    if (gOpenFdTable == NULL) {
+      RuntimeAbort(env, __LINE__, "Unable to construct file descriptor table.");
+    }
+  } else if (!gOpenFdTable->Restat()) {
+    RuntimeAbort(env, __LINE__, "Unable to restat file descriptor table.");
+  }
+
   pid_t pid = fork();
 
   if (pid == 0) {
@@ -462,6 +490,12 @@ static pid_t ForkAndSpecializeCommon(JNIEnv* env, uid_t uid, gid_t gid, jintArra
     // Clean up any descriptors which must be closed immediately
     DetachDescriptors(env, fdsToClose);
 
+    // Re-open all remaining open file descriptors so that they aren't shared
+    // with the zygote across a fork.
+    if (!gOpenFdTable->ReopenOrDetach()) {
+      RuntimeAbort(env, __LINE__, "Unable to reopen whitelisted descriptors.");
+    }
+
     // Keep capabilities across UID change, unless we're staying root.
     if (uid != 0) {
       EnableKeepCapabilities(env);
diff --git a/core/jni/fd_utils-inl-extra.h b/core/jni/fd_utils-inl-extra.h
new file mode 100644
index 0000000..993c320
--- /dev/null
+++ b/core/jni/fd_utils-inl-extra.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2016 The CyanogenMod 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.
+ */
+
+/*
+#define PATH_WHITELIST_EXTRA_H \
+    "/proc/apid", \
+    "/proc/aprf",
+*/
+
+// Overload this file in your device specific config if you need
+// to add extra whitelisted paths.
+// WARNING: Only use this if necessary. Custom inits should be
+// checked for leaked file descriptors before even considering
+// this.
+// In order to add your files, copy the whole file (don't forget the copyright notice!),
+// uncomment the #define above and change the paths inside to match your requirements
\ No newline at end of file
diff --git a/core/jni/fd_utils-inl.h b/core/jni/fd_utils-inl.h
new file mode 100644
index 0000000..f245a7f
--- /dev/null
+++ b/core/jni/fd_utils-inl.h
@@ -0,0 +1,559 @@
+/*
+ * 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.
+ */
+
+#include <string>
+#include <unordered_map>
+#include <set>
+#include <vector>
+#include <algorithm>
+
+#include <dirent.h>
+#include <fcntl.h>
+#include <grp.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/un.h>
+#include <unistd.h>
+
+#include <cutils/log.h>
+#include "JNIHelp.h"
+#include "ScopedPrimitiveArray.h"
+
+#include <fd_utils-inl-extra.h>
+
+// Whitelist of open paths that the zygote is allowed to keep open.
+//
+// In addition to the paths listed here, all files ending with
+// ".jar" under /system/framework" are whitelisted. See
+// FileDescriptorInfo::IsWhitelisted for the canonical definition.
+//
+// If the whitelisted path is associated with a regular file or a
+// character device, the file is reopened after a fork with the same
+// offset and mode. If the whilelisted  path is associated with a
+// AF_UNIX socket, the socket will refer to /dev/null after each
+// fork, and all operations on it will fail.
+static const char* kPathWhitelist[] = {
+  "/dev/__properties__",  /* Only on Android Lollipop and below. */
+  "/dev/null",
+  "/dev/socket/zygote",
+  "/dev/socket/zygote_secondary",
+  "/system/etc/event-log-tags",
+  "/sys/kernel/debug/tracing/trace_marker",
+  "/system/framework/framework-res.apk",
+  "/dev/urandom",
+  "/dev/ion",
+  "@netlink@",
+  "/system/framework/org.cyanogenmod.platform-res.apk",
+  "/proc/ged",
+#ifdef PATH_WHITELIST_EXTRA_H
+PATH_WHITELIST_EXTRA_H
+#endif
+};
+
+static const char* kFdPath = "/proc/self/fd";
+
+// Keeps track of all relevant information (flags, offset etc.) of an
+// open zygote file descriptor.
+class FileDescriptorInfo {
+ public:
+  // Create a FileDescriptorInfo for a given file descriptor. Returns
+  // |NULL| if an error occurred.
+  static FileDescriptorInfo* createFromFd(int fd) {
+    struct stat f_stat;
+    // This should never happen; the zygote should always have the right set
+    // of permissions required to stat all its open files.
+    if (TEMP_FAILURE_RETRY(fstat(fd, &f_stat)) == -1) {
+      ALOGE("Unable to stat fd %d : %s", fd, strerror(errno));
+      return NULL;
+    }
+
+    if (S_ISSOCK(f_stat.st_mode)) {
+      std::string socket_name;
+      if (!GetSocketName(fd, &socket_name)) {
+        return NULL;
+      }
+
+      if (!IsWhitelisted(socket_name)) {
+        ALOGE("Socket name not whitelisted : %s (fd=%d)", socket_name.c_str(), fd);
+        return NULL;
+      }
+
+      return new FileDescriptorInfo(fd);
+    }
+
+    // We only handle whitelisted regular files and character devices. Whitelisted
+    // character devices must provide a guarantee of sensible behaviour when
+    // reopened.
+    //
+    // S_ISDIR : Not supported. (We could if we wanted to, but it's unused).
+    // S_ISLINK : Not supported.
+    // S_ISBLK : Not supported.
+    // S_ISFIFO : Not supported. Note that the zygote uses pipes to communicate
+    // with the child process across forks but those should have been closed
+    // before we got to this point.
+    if (!S_ISCHR(f_stat.st_mode) && !S_ISREG(f_stat.st_mode)) {
+      ALOGE("Unsupported st_mode %d", f_stat.st_mode);
+      return NULL;
+    }
+
+    std::string file_path;
+    if (!Readlink(fd, &file_path)) {
+      return NULL;
+    }
+
+    if (!IsWhitelisted(file_path)) {
+      ALOGE("Not whitelisted : %s", file_path.c_str());
+      return NULL;
+    }
+
+    // File descriptor flags : currently on FD_CLOEXEC. We can set these
+    // using F_SETFD - we're single threaded at this point of execution so
+    // there won't be any races.
+    const int fd_flags = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFD));
+    if (fd_flags == -1) {
+      ALOGE("Failed fcntl(%d, F_GETFD) : %s", fd, strerror(errno));
+      return NULL;
+    }
+
+    // File status flags :
+    // - File access mode : (O_RDONLY, O_WRONLY...) we'll pass these through
+    //   to the open() call.
+    //
+    // - File creation flags : (O_CREAT, O_EXCL...) - there's not much we can
+    //   do about these, since the file has already been created. We shall ignore
+    //   them here.
+    //
+    // - Other flags : We'll have to set these via F_SETFL. On linux, F_SETFL
+    //   can only set O_APPEND, O_ASYNC, O_DIRECT, O_NOATIME, and O_NONBLOCK.
+    //   In particular, it can't set O_SYNC and O_DSYNC. We'll have to test for
+    //   their presence and pass them in to open().
+    int fs_flags = TEMP_FAILURE_RETRY(fcntl(fd, F_GETFL));
+    if (fs_flags == -1) {
+      ALOGE("Failed fcntl(%d, F_GETFL) : %s", fd, strerror(errno));
+      return NULL;
+    }
+
+    // File offset : Ignore the offset for non seekable files.
+    const off_t offset = TEMP_FAILURE_RETRY(lseek64(fd, 0, SEEK_CUR));
+
+    // We pass the flags that open accepts to open, and use F_SETFL for
+    // the rest of them.
+    static const int kOpenFlags = (O_RDONLY | O_WRONLY | O_RDWR | O_DSYNC | O_SYNC);
+    int open_flags = fs_flags & (kOpenFlags);
+    fs_flags = fs_flags & (~(kOpenFlags));
+
+    return new FileDescriptorInfo(f_stat, file_path, fd, open_flags, fd_flags, fs_flags, offset);
+  }
+
+  // Checks whether the file descriptor associated with this object
+  // refers to the same description.
+  bool Restat() const {
+    struct stat f_stat;
+    if (TEMP_FAILURE_RETRY(fstat(fd, &f_stat)) == -1) {
+      return false;
+    }
+
+    return f_stat.st_ino == stat.st_ino && f_stat.st_dev == stat.st_dev;
+  }
+
+  bool ReopenOrDetach() const {
+    if (is_sock) {
+      return DetachSocket();
+    }
+
+    // NOTE: This might happen if the file was unlinked after being opened.
+    // It's a common pattern in the case of temporary files and the like but
+    // we should not allow such usage from the zygote.
+    const int new_fd = TEMP_FAILURE_RETRY(open(file_path.c_str(), open_flags));
+
+    if (new_fd == -1) {
+      ALOGE("Failed open(%s, %d) : %s", file_path.c_str(), open_flags, strerror(errno));
+      return false;
+    }
+
+    if (TEMP_FAILURE_RETRY(fcntl(new_fd, F_SETFD, fd_flags)) == -1) {
+      close(new_fd);
+      ALOGE("Failed fcntl(%d, F_SETFD, %x) : %s", new_fd, fd_flags, strerror(errno));
+      return false;
+    }
+
+    if (TEMP_FAILURE_RETRY(fcntl(new_fd, F_SETFL, fs_flags)) == -1) {
+      close(new_fd);
+      ALOGE("Failed fcntl(%d, F_SETFL, %x) : %s", new_fd, fs_flags, strerror(errno));
+      return false;
+    }
+
+    if (offset != -1 && TEMP_FAILURE_RETRY(lseek64(new_fd, offset, SEEK_SET)) == -1) {
+      close(new_fd);
+      ALOGE("Failed lseek64(%d, SEEK_SET) : %s", new_fd, strerror(errno));
+      return false;
+    }
+
+    if (TEMP_FAILURE_RETRY(dup2(new_fd, fd)) == -1) {
+      close(new_fd);
+      ALOGE("Failed dup2(%d, %d) : %s", fd, new_fd, strerror(errno));
+      return false;
+    }
+
+    close(new_fd);
+
+    return true;
+  }
+
+  const int fd;
+  const struct stat stat;
+  const std::string file_path;
+  const int open_flags;
+  const int fd_flags;
+  const int fs_flags;
+  const off_t offset;
+  const bool is_sock;
+
+ private:
+  FileDescriptorInfo(int fd) :
+    fd(fd),
+    stat(),
+    open_flags(0),
+    fd_flags(0),
+    fs_flags(0),
+    offset(0),
+    is_sock(true) {
+  }
+
+  FileDescriptorInfo(struct stat stat, const std::string& file_path, int fd, int open_flags,
+                     int fd_flags, int fs_flags, off_t offset) :
+    fd(fd),
+    stat(stat),
+    file_path(file_path),
+    open_flags(open_flags),
+    fd_flags(fd_flags),
+    fs_flags(fs_flags),
+    offset(offset),
+    is_sock(false) {
+  }
+
+  // Returns true iff. a given path is whitelisted. A path is whitelisted
+  // if it belongs to the whitelist (see kPathWhitelist) or if it's a path
+  // under /system/framework that ends with ".jar".
+  static bool IsWhitelisted(const std::string& path) {
+    for (size_t i = 0; i < (sizeof(kPathWhitelist) / sizeof(kPathWhitelist[0])); ++i) {
+      if (kPathWhitelist[i] == path) {
+        return true;
+      }
+    }
+
+    static const std::string kFrameworksPrefix = "/system/framework/";
+    static const std::string kJarSuffix = ".jar";
+    if (path.compare(0, kFrameworksPrefix.size(), kFrameworksPrefix) == 0 &&
+        path.compare(path.size() - kJarSuffix.size(), kJarSuffix.size(), kJarSuffix) == 0) {
+      return true;
+    }
+    return false;
+  }
+
+  // TODO: Call android::base::Readlink instead of copying the code here.
+  static bool Readlink(const int fd, std::string* result) {
+    char path[64];
+    snprintf(path, sizeof(path), "/proc/self/fd/%d", fd);
+
+    // Code copied from android::base::Readlink starts here :
+
+    // Annoyingly, the readlink system call returns EINVAL for a zero-sized buffer,
+    // and truncates to whatever size you do supply, so it can't be used to query.
+    // We could call lstat first, but that would introduce a race condition that
+    // we couldn't detect.
+    // ext2 and ext4 both have PAGE_SIZE limitations, so we assume that here.
+    char buf[4096];
+    ssize_t len = readlink(path, buf, sizeof(buf));
+    if (len == -1) return false;
+
+    result->assign(buf, len);
+    return true;
+  }
+
+  // Returns the locally-bound name of the socket |fd|. Returns true
+  // iff. all of the following hold :
+  //
+  // - the socket's sa_family is AF_UNIX.
+  // - the length of the path is greater than zero (i.e, not an unnamed socket).
+  // - the first byte of the path isn't zero (i.e, not a socket with an abstract
+  //   address).
+  static bool GetSocketName(const int fd, std::string* result) {
+    sockaddr_storage ss;
+    sockaddr* addr = reinterpret_cast<sockaddr*>(&ss);
+    socklen_t addr_len = sizeof(ss);
+
+    if (TEMP_FAILURE_RETRY(getsockname(fd, addr, &addr_len)) == -1) {
+      ALOGE("Failed getsockname(%d) : %s", fd, strerror(errno));
+      return false;
+    }
+
+
+    if (addr->sa_family == AF_NETLINK) {
+      (*result) = "@netlink@";
+      return true;
+    }
+
+    if (addr->sa_family != AF_UNIX) {
+      ALOGE("Unsupported socket (fd=%d) with family %d", fd, addr->sa_family);
+      return false;
+    }
+
+    const sockaddr_un* unix_addr = reinterpret_cast<const sockaddr_un*>(&ss);
+
+    size_t path_len = addr_len - offsetof(struct sockaddr_un, sun_path);
+    // This is an unnamed local socket, we do not accept it.
+    if (path_len == 0) {
+      ALOGE("Unsupported AF_UNIX socket (fd=%d) with empty path.", fd);
+      return false;
+    }
+
+    // This is a local socket with an abstract address, we do not accept it.
+    if (unix_addr->sun_path[0] == '\0') {
+      ALOGE("Unsupported AF_UNIX socket (fd=%d) with abstract address.", fd);
+      return false;
+    }
+
+    // If we're here, sun_path must refer to a null terminated filesystem
+    // pathname (man 7 unix). Remove the terminator before assigning it to an
+    // std::string.
+    if (unix_addr->sun_path[path_len - 1] ==  '\0') {
+      --path_len;
+    }
+
+    result->assign(unix_addr->sun_path, path_len);
+    return true;
+  }
+
+  bool DetachSocket() const {
+    const int dev_null_fd = open("/dev/null", O_RDWR);
+    if (dev_null_fd < 0) {
+      ALOGE("Failed to open /dev/null : %s", strerror(errno));
+      return false;
+    }
+
+    if (dup2(dev_null_fd, fd) == -1) {
+      ALOGE("Failed dup2 on socket descriptor %d : %s", fd, strerror(errno));
+      return false;
+    }
+
+    if (close(dev_null_fd) == -1) {
+      ALOGE("Failed close(%d) : %s", dev_null_fd, strerror(errno));
+      return false;
+    }
+
+    return true;
+  }
+
+
+  // DISALLOW_COPY_AND_ASSIGN(FileDescriptorInfo);
+  FileDescriptorInfo(const FileDescriptorInfo&);
+  void operator=(const FileDescriptorInfo&);
+};
+
+// A FileDescriptorTable is a collection of FileDescriptorInfo objects
+// keyed by their FDs.
+class FileDescriptorTable {
+ public:
+  // Creates a new FileDescriptorTable. This function scans
+  // /proc/self/fd for the list of open file descriptors and collects
+  // information about them. Returns NULL if an error occurs.
+  static FileDescriptorTable* Create() {
+    DIR* d = opendir(kFdPath);
+    if (d == NULL) {
+      ALOGE("Unable to open directory %s: %s", kFdPath, strerror(errno));
+      return NULL;
+    }
+    int dir_fd = dirfd(d);
+    dirent* e;
+
+    std::unordered_map<int, FileDescriptorInfo*> open_fd_map;
+    while ((e = readdir(d)) != NULL) {
+      const int fd = ParseFd(e, dir_fd);
+      if (fd == -1) {
+        continue;
+      }
+
+      FileDescriptorInfo* info = FileDescriptorInfo::createFromFd(fd);
+      if (info == NULL) {
+        if (closedir(d) == -1) {
+          ALOGE("Unable to close directory : %s", strerror(errno));
+        }
+        return NULL;
+      }
+      open_fd_map[fd] = info;
+    }
+
+    if (closedir(d) == -1) {
+      ALOGE("Unable to close directory : %s", strerror(errno));
+      return NULL;
+    }
+    return new FileDescriptorTable(open_fd_map);
+  }
+
+  bool Restat() {
+    std::set<int> open_fds;
+
+    // First get the list of open descriptors.
+    DIR* d = opendir(kFdPath);
+    if (d == NULL) {
+      ALOGE("Unable to open directory %s: %s", kFdPath, strerror(errno));
+      return false;
+    }
+
+    int dir_fd = dirfd(d);
+    dirent* e;
+    while ((e = readdir(d)) != NULL) {
+      const int fd = ParseFd(e, dir_fd);
+      if (fd == -1) {
+        continue;
+      }
+
+      open_fds.insert(fd);
+    }
+
+    if (closedir(d) == -1) {
+      ALOGE("Unable to close directory : %s", strerror(errno));
+      return false;
+    }
+
+    return RestatInternal(open_fds);
+  }
+
+  // Reopens all file descriptors that are contained in the table. Returns true
+  // if all descriptors were successfully re-opened or detached, and false if an
+  // error occurred.
+  bool ReopenOrDetach() {
+    std::unordered_map<int, FileDescriptorInfo*>::const_iterator it;
+    for (it = open_fd_map_.begin(); it != open_fd_map_.end(); ++it) {
+      const FileDescriptorInfo* info = it->second;
+      if (info == NULL || !info->ReopenOrDetach()) {
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+ private:
+  FileDescriptorTable(const std::unordered_map<int, FileDescriptorInfo*>& map)
+      : open_fd_map_(map) {
+  }
+
+  bool RestatInternal(std::set<int>& open_fds) {
+    bool error = false;
+
+    // Iterate through the list of file descriptors we've already recorded
+    // and check whether :
+    //
+    // (a) they continue to be open.
+    // (b) they refer to the same file.
+    std::unordered_map<int, FileDescriptorInfo*>::iterator it = open_fd_map_.begin();
+    while (it != open_fd_map_.end()) {
+      std::set<int>::const_iterator element = open_fds.find(it->first);
+      if (element == open_fds.end()) {
+        // The entry from the file descriptor table is no longer in the list
+        // of open files. We warn about this condition and remove it from
+        // the list of FDs under consideration.
+        //
+        // TODO(narayan): This will be an error in a future android release.
+        // error = true;
+        // ALOGW("Zygote closed file descriptor %d.", it->first);
+        it = open_fd_map_.erase(it);
+      } else {
+        // The entry from the file descriptor table is still open. Restat
+        // it and check whether it refers to the same file.
+        const bool same_file = it->second->Restat();
+        if (!same_file) {
+          // The file descriptor refers to a different description. We must
+          // update our entry in the table.
+          delete it->second;
+          it->second = FileDescriptorInfo::createFromFd(*element);
+          if (it->second == NULL) {
+            // The descriptor no longer no longer refers to a whitelisted file.
+            // We flag an error and remove it from the list of files we're
+            // tracking.
+            error = true;
+            it = open_fd_map_.erase(it);
+          } else {
+            // Successfully restatted the file, move on to the next open FD.
+            ++it;
+          }
+        } else {
+          // It's the same file. Nothing to do here. Move on to the next open
+          // FD.
+          ++it;
+        }
+
+        // Finally, remove the FD from the set of open_fds. We do this last because
+        // |element| will not remain valid after a call to erase.
+        open_fds.erase(*element);
+      }
+    }
+
+    if (open_fds.size() > 0) {
+      // The zygote has opened new file descriptors since our last inspection.
+      // We warn about this condition and add them to our table.
+      //
+      // TODO(narayan): This will be an error in a future android release.
+      // error = true;
+      // ALOGW("Zygote opened %zd new file descriptor(s).", open_fds.size());
+
+      // TODO(narayan): This code will be removed in a future android release.
+      std::set<int>::const_iterator it;
+      for (it = open_fds.begin(); it != open_fds.end(); ++it) {
+        const int fd = (*it);
+        FileDescriptorInfo* info = FileDescriptorInfo::createFromFd(fd);
+        if (info == NULL) {
+          // A newly opened file is not on the whitelist. Flag an error and
+          // continue.
+          error = true;
+        } else {
+          // Track the newly opened file.
+          open_fd_map_[fd] = info;
+        }
+      }
+    }
+
+    return !error;
+  }
+
+  static int ParseFd(dirent* e, int dir_fd) {
+    char* end;
+    const int fd = strtol(e->d_name, &end, 10);
+    if ((*end) != '\0') {
+      return -1;
+    }
+
+    // Don't bother with the standard input/output/error, they're handled
+    // specially post-fork anyway.
+    if (fd <= STDERR_FILENO || fd == dir_fd) {
+      return -1;
+    }
+
+    return fd;
+  }
+
+  // Invariant: All values in this unordered_map are non-NULL.
+  std::unordered_map<int, FileDescriptorInfo*> open_fd_map_;
+
+  // DISALLOW_COPY_AND_ASSIGN(FileDescriptorTable);
+  FileDescriptorTable(const FileDescriptorTable&);
+  void operator=(const FileDescriptorTable&);
+};
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index 50a4b38..84c3a9c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -324,8 +324,11 @@
     <protected-broadcast android:name="android.internal.policy.action.BURN_IN_PROTECTION" />
     <protected-broadcast android:name="android.app.action.SYSTEM_UPDATE_POLICY_CHANGED" />
     <protected-broadcast android:name="android.app.action.DEVICE_OWNER_CHANGED" />
-    <protected-broadcast android:name="org.cyanogenmod.intent.action.THEME_CHANGED" />
-    <protected-broadcast android:name="android.intent.action.THEME_RESOURCES_CACHED" />
+
+    <protected-broadcast android:name="org.cyanogenmod.intent.action.THEME_CHANGED"
+                         android:permission="cyanogenmod.permission.SEND_PROTECTED_THEME_BROADCAST" />
+    <protected-broadcast android:name="android.intent.action.THEME_RESOURCES_CACHED"
+                         android:permission="cyanogenmod.permission.SEND_PROTECTED_THEME_BROADCAST" />
 
     <protected-broadcast android:name="android.net.action.SHOW_NETWORK_POLICY_NOTIFICATION" />
 
@@ -1239,10 +1242,10 @@
     <permission android:name="android.permission.NOTIFY_PENDING_SYSTEM_UPDATE"
         android:protectionLevel="signature|privileged" />
 
-    <!-- Allows an application to override the power key action
+    <!-- Allows an application to override the system key actions
          @hide <p>Not for use by third-party applications.
     -->
-    <permission android:name="android.permission.PREVENT_POWER_KEY"
+    <permission android:name="android.permission.PREVENT_SYSTEM_KEYS"
         android:protectionLevel="signature|privileged" />
 
     <!-- =========================================== -->
@@ -1415,6 +1418,14 @@
     <permission android:name="android.permission.MANAGE_USERS"
         android:protectionLevel="signature|privileged" />
 
+    <!-- @hide Allows an application to create, remove users and get the list of
+         users on the device. Applications holding this permission can only create restricted,
+         guest, and managed users. For creating other kind of users,
+         {@link android.Manifest.permission#MANAGE_USERS} is needed.
+         This permission is not available to third party applications. -->
+    <permission android:name="android.permission.CREATE_USERS"
+        android:protectionLevel="signature" />
+
     <!-- @hide Allows an application to set the profile owners and the device owner.
          This permission is not available to third party applications.-->
     <permission android:name="android.permission.MANAGE_PROFILE_AND_DEVICE_OWNERS"
@@ -2815,7 +2826,7 @@
                 android:label="@string/managed_profile_label">
         </activity-alias>
         <activity android:name="com.android.internal.app.HeavyWeightSwitcherActivity"
-                android:theme="@style/Theme.Material.Light.Dialog"
+                android:theme="@style/Theme.Material.Light.Dialog.HeavyWeightSwitcherActivity"
                 android:label="@string/heavy_weight_switcher_title"
                 android:finishOnCloseSystemDialogs="true"
                 android:excludeFromRecents="true"
@@ -2848,7 +2859,7 @@
         <activity android:name="android.accounts.ChooseAccountActivity"
                 android:excludeFromRecents="true"
                 android:exported="true"
-                android:theme="@style/Theme.Material.Light.Dialog"
+                android:theme="@style/Theme.Material.Light.Dialog.ChooseAccountActivity"
                 android:label="@string/choose_account_label"
                 android:process=":ui">
         </activity>
@@ -2856,14 +2867,14 @@
         <activity android:name="android.accounts.ChooseTypeAndAccountActivity"
                 android:excludeFromRecents="true"
                 android:exported="true"
-                android:theme="@style/Theme.Material.Light.Dialog"
+                android:theme="@style/Theme.Material.Light.Dialog.ChooseTypeAndAccountActivity"
                 android:label="@string/choose_account_label"
                 android:process=":ui">
         </activity>
 
         <activity android:name="android.accounts.ChooseAccountTypeActivity"
                 android:excludeFromRecents="true"
-                android:theme="@style/Theme.Material.Light.Dialog"
+                android:theme="@style/Theme.Material.Light.Dialog.ChooseAccountTypeActivity"
                 android:label="@string/choose_account_label"
                 android:process=":ui">
         </activity>
@@ -2871,19 +2882,19 @@
         <activity android:name="android.accounts.CantAddAccountActivity"
                 android:excludeFromRecents="true"
                 android:exported="true"
-                android:theme="@style/Theme.Material.Light.Dialog.NoActionBar"
+                android:theme="@style/Theme.Material.Light.Dialog.NoActionBar.CantAddAccountActivity"
                 android:process=":ui">
         </activity>
 
         <activity android:name="android.accounts.GrantCredentialsPermissionActivity"
                 android:excludeFromRecents="true"
                 android:exported="true"
-                android:theme="@style/Theme.Material.Light.DialogWhenLarge"
+                android:theme="@style/Theme.Material.Light.DialogWhenLarge.GrantCredentialsPermissionActivity"
                 android:process=":ui">
         </activity>
 
         <activity android:name="android.content.SyncActivityTooManyDeletes"
-               android:theme="@style/Theme.Material.Light.Dialog"
+               android:theme="@style/Theme.Material.Light.Dialog.SyncActivityTooManyDeletes"
                android:label="@string/sync_too_many_deletes"
                android:process=":ui">
         </activity>
@@ -2903,7 +2914,7 @@
         </activity>
 
         <activity android:name="com.android.internal.app.NetInitiatedActivity"
-                android:theme="@style/Theme.Material.Light.Dialog.Alert"
+                android:theme="@style/Theme.Material.Light.Dialog.Alert.NetInitiatedActivity"
                 android:excludeFromRecents="true"
                 android:process=":ui">
         </activity>
diff --git a/core/res/res/drawable/ic_power_dnd_priority.xml b/core/res/res/drawable/ic_power_dnd_priority.xml
new file mode 100644
index 0000000..87a1216
--- /dev/null
+++ b/core/res/res/drawable/ic_power_dnd_priority.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_lock_dnd_priority" />
+</selector>
diff --git a/core/res/res/drawable/ic_power_dnd_total_silence.xml b/core/res/res/drawable/ic_power_dnd_total_silence.xml
new file mode 100644
index 0000000..bd4e2ed
--- /dev/null
+++ b/core/res/res/drawable/ic_power_dnd_total_silence.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_lock_dnd_total_silence" />
+</selector>
diff --git a/core/res/res/drawable/ic_power_ring.xml b/core/res/res/drawable/ic_power_ring.xml
new file mode 100644
index 0000000..3f3b856
--- /dev/null
+++ b/core/res/res/drawable/ic_power_ring.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_lock_ring" />
+</selector>
diff --git a/core/res/res/drawable/ic_power_vibrate.xml b/core/res/res/drawable/ic_power_vibrate.xml
new file mode 100644
index 0000000..068286b
--- /dev/null
+++ b/core/res/res/drawable/ic_power_vibrate.xml
@@ -0,0 +1,19 @@
+<?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.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_lock_vibrate" />
+</selector>
diff --git a/core/res/res/layout/global_actions_silent_mode.xml b/core/res/res/layout/global_actions_silent_mode.xml
index 56fa28b..0827a4d 100644
--- a/core/res/res/layout/global_actions_silent_mode.xml
+++ b/core/res/res/layout/global_actions_silent_mode.xml
@@ -37,7 +37,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginTop="6dp"
             android:layout_marginBottom="6dp"
-            android:src="@drawable/ic_lock_dnd_total_silence"
+            android:src="@drawable/ic_power_dnd_total_silence"
             android:scaleType="center"
             android:duplicateParentState="true"
             android:background="@drawable/silent_mode_indicator"
@@ -66,7 +66,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginTop="6dp"
             android:layout_marginBottom="6dp"
-            android:src="@drawable/ic_lock_dnd_priority"
+            android:src="@drawable/ic_power_dnd_priority"
             android:scaleType="center"
             android:duplicateParentState="true"
             android:background="@drawable/silent_mode_indicator"
@@ -95,7 +95,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginTop="6dp"
             android:layout_marginBottom="6dp"
-            android:src="@drawable/ic_lock_vibrate"
+            android:src="@drawable/ic_power_vibrate"
             android:scaleType="center"
             android:duplicateParentState="true"
             android:background="@drawable/silent_mode_indicator"
@@ -124,7 +124,7 @@
             android:layout_marginEnd="8dp"
             android:layout_marginTop="6dp"
             android:layout_marginBottom="6dp"
-            android:src="@drawable/ic_lock_ring"
+            android:src="@drawable/ic_power_ring"
             android:scaleType="center"
             android:duplicateParentState="true"
             android:background="@drawable/silent_mode_indicator"
diff --git a/core/res/res/values-af/cm_strings.xml b/core/res/res/values-af/cm_strings.xml
index bd245b3..993e775 100644
--- a/core/res/res/values-af/cm_strings.xml
+++ b/core/res/res/values-af/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Skermfoto</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">ontvang beskermde SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Laat die program toe om \'n beskermde inkomende SMS te ontvang.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">verander beskermde SMS lys</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Laat die program toe om die beskermde SMS adres lys te verander.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sekuriteit</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Regte met betrekking tot toestel sekuriteitsinligting.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">lees foon swartlys</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Laat \'n program toe om inligting oor telefoonnommers wat geblokkeer is van inkomende oproepe of boodskappe te lees.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">Verander selfoon swartlys</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Laat \'n program toe om van die telefoonnommers wat geblokkeer is vir inkomende oproepe of boodskappe te verander.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Stel slotskerm agtergrond in</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Laat \'n program toe om die slotskerm agtergrond te verander.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Herlaai</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Huidige</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Herlaai</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Vinnige herlaai</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Herlaai</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Jou tablet gaan herlaai.</string>
   <string name="reboot_confirm" product="default">Jou foon gaan herlaai.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Herlaai\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Program beëindig</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB oor netwerk is aktief</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB oor USB &amp; netwerk is aktief</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Raak om ontfouting af te skakel.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; netwerk</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Netwerk</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">onderskep program begin</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s is nie geïnstalleer nie</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioriteit</string>
   <string name="silent_mode_none">Geen</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Deaktiveer Wi-Fi warmkol weens SIM inskrywing verandering</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Skakel Wi-Fi af</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">aktiveer of deaktiveer Privaatheidswag</string>
   <string name="permdesc_changePrivacyGuardState">Laat \'n program toe om te bepaal of \'n ander program met of sonder Privaatheidswag kan loop. Wanneer Privaatheidswag geaktiveer is kan die program nie toegang kry tot persoonlike data soos kontakte, boodskappe en oproep geskiedenis nie.</string>
   <string name="privacy_guard_notification">Privaatheidswag aktief</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> het nie toegang tot persoonlike data nie</string>
   <string name="privacy_guard_dialog_title">Privaatheidswag</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> wil <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Onthou my keuse</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">toegang tot die kamera</string>
   <string name="app_ops_access_location">toegang tot jou ligging</string>
   <string name="app_ops_access_notifications">lees jou kennisgewing boodskappe</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">kry toestel rekeninge</string>
   <string name="app_ops_wifi_change">verander Wi-Fi status</string>
   <string name="app_ops_su">kry root toegang</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Om die skerm te ontspeld, raak en hou die Terug knoppie.</string>
-  <string name="live_display_auto">Outomaties</string>
-  <string name="live_display_auto_summary">Kleurtemperatuur van die skerm sal outomaties aanpas na sononder en sonop</string>
-  <string name="live_display_off">Af</string>
-  <string name="live_display_off_summary">Skakel al die aanpassings af</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Alleenlik gebruik dag instellings</string>
-  <string name="live_display_night">Nag</string>
-  <string name="live_display_night_summary">Alleenlik gebruik nag instellings</string>
-  <string name="live_display_outdoor">Buitekant (helder son)</string>
-  <string name="live_display_outdoor_summary">Alleenlik gebruik buite instellings</string>
-  <string name="live_display_hint">LewendigeVertoning kan jou oogspanning verminder en help jou slaap in die nag. Klik hier om dit uit te probeer!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Geen gekoppelde toestel</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> gekoppelde toestel</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> gekoppelde toestelle</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Aktiwiteit begin geblokkeer</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> is beskerm om uitgevoer te word. Raak om toestemming te gee en die toepassing te begin.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Battery vol gelaai</string>
   <string name="notify_battery_fully_charged_text">Diskonnekteer jou toestel van die laaier om die battery lewe te verleng.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">herstel battery statistieke</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Laat \'n program om die huidige lae-vlak battery gebruik data te herstel.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM kaarte het verander</string>
+  <string name="uicc_hot_swapped_event_text">Raak om SIM kaart standaard opsies te stel</string>
 </resources>
diff --git a/core/res/res/values-am/cm_strings.xml b/core/res/res/values-am/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-am/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-ar/cm_strings.xml b/core/res/res/values-ar/cm_strings.xml
index 8d7187d..4d305cf4 100644
--- a/core/res/res/values-ar/cm_strings.xml
+++ b/core/res/res/values-ar/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">لقطة شاشة</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">استلام رسالة نصية قصيرة محمية</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">يسمح للتطبيق باستلام رسالة نصية قصيرة محمية واردة.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">تعديل قائمة الرسائل النصية القصيرة المحمية</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">السماح للتطبيق بتعديل قائمة عناوين الرسائل النصية القصيرة المحمية.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">الأمان</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">أذونات متعلقة بمعلومات حماية الجهاز.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">قراءة القائمة السوداء للهاتف</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">السماح للتطبيق بقراءة المعلومات الخاصة بأرقام الهاتف المحظورة بالنبسة للمكالمات أو الرسائل الواردة.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">تغيير القائمة السوداء للهاتف</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">السماح للتطبيق بتغيير أرقام الهاتف التي يتم حظر للمكالمات الواردة أو الرسائل.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">تعيين خلفية شاشة الحارس الرئيسي</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">السماج للتطبيق بتغيير خلفية شاشة التأمين.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">إعادة تمهيد</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">الحالي</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">إعادة التمهيد</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">استرداد</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">محمل التمهيد</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">التنزيل</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">إعادة تمهيد سريعة</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">إعادة التمهيد</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">ستتم إعادة تمهيد جهازك اللوحي.</string>
   <string name="reboot_confirm" product="default">ستتم إعادة تمهيد هاتفك.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">إعادة التمهيد\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">تم إنهاء التطبيق</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">تمكين ADB عبر الشبكة</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB عبر USB &amp; تمكين الشبكة</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">انقر لتعطيل تصحيح الأخطاء.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; الشبكة</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">الشبكة</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">مقاطعة تشغيل التطبيق</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s لم يتم تثبيته</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">الأولوية</string>
   <string name="silent_mode_none">بلا</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">ايقاف بث تقنية واي فاي بسبب تغيير اشتراك SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">إيقاف Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">تمكين أو تعطيل حارس الخصوصية</string>
   <string name="permdesc_changePrivacyGuardState">يسمح للتطبيق بتغيير ما إذا كان تطبيق آخر يعمل مع \"حارس الخصوصية\". عندما يتم تشغيل تطبيق مع \"حارس الخصوصية\"، فلن يُسمح بالوصول إلى البيانات الشخصية كجهات الاتصال أو سجلات المكالمات أو الرسائل.</string>
   <string name="privacy_guard_notification">حارس الخصوصية نشط</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> لن تكون قادراً على الوصول إلى البيانات الشخصية</string>
   <string name="privacy_guard_dialog_title">حارس الخصوصية</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> يرغب في <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">تذكر خياري</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">الوصول إلى الكاميرا</string>
   <string name="app_ops_access_location">الوصول إلى موقعك</string>
   <string name="app_ops_access_notifications">قراءة إشعاراتك</string>
@@ -97,7 +135,9 @@
   <string name="app_ops_start_at_bootup">البدء في التشغيل</string>
   <string name="app_ops_toast_window">عرض الإعلامات المنبثقة</string>
   <string name="app_ops_toggle_bluetooth">تبديل بلوتوث</string>
+  <string name="app_ops_toggle_mobile_data">تنشيط/إيقاف بيانات الهاتف</string>
   <string name="app_ops_toggle_nfc">تبديل NFC</string>
+  <string name="app_ops_toggle_wifi">تنشيط/ايقاف الWi-Fi</string>
   <string name="app_ops_use_alarm_volume">التحكم في مستوى صوت الإنذار</string>
   <string name="app_ops_use_audio_focus">التحكم في تركيز الصوت</string>
   <string name="app_ops_use_bluetooth_volume">التحكم في مستوى صوت بلوتوث</string>
@@ -110,20 +150,44 @@
   <string name="app_ops_use_voice_volume">التحكم في مستوى صوت المكالمة الصوتية</string>
   <string name="app_ops_write_mms">كتابة رسالة MMS</string>
   <string name="app_ops_write_sms">كتابة رسالة نصية قصيرة</string>
+  <string name="app_ops_use_fingerprint">استخدام بصمة اليد</string>
+  <string name="app_ops_add_voicemail">اضافة البريد الصوتى</string>
+  <string name="app_ops_read_phone_state">الوصول الى حالة الهاتف</string>
+  <string name="app_ops_scan_wifi">فحص شبكات Wi-Fi</string>
+  <string name="app_ops_change_wallpaper">تغيير الخلفية</string>
+  <string name="app_ops_assist_structure">استخدام مساعد الهيكل</string>
+  <string name="app_ops_assist_screenshot">التقاط الشاشة</string>
+  <string name="app_ops_use_body_sensors">استخدام مستشعرات الجسم</string>
+  <string name="app_ops_read_cell_broadcasts">قراءة البث الخلوي</string>
+  <string name="app_ops_mock_location">تجاهل موقعك الحالى</string>
+  <string name="app_ops_read_external_storage">قراءة الذاكرة الخارجية</string>
+  <string name="app_ops_write_external_storage">كتابة الذاكرة الخارجية</string>
+  <string name="app_ops_turn_on_screen">فتح الشاشة</string>
+  <string name="app_ops_get_accounts">احصل على حسابات الجهاز</string>
+  <string name="app_ops_wifi_change">تغيير حالة الـ Wi-Fi</string>
   <string name="app_ops_su">الحصول على صلاحيات الجذر</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">لإلغاء تثبيت هذه الشاشة، المس واستمر في ضغط زر الرجوع.</string>
-  <string name="live_display_auto">تلقائي</string>
-  <string name="live_display_auto_summary">ضبط درجة حرارة لون للشاشة تلقائياً بعد غروب الشمس وشروق الشمس</string>
-  <string name="live_display_off">إيقاف</string>
-  <string name="live_display_off_summary">تعطيل جميع التعديلات</string>
-  <string name="live_display_day">النهار</string>
-  <string name="live_display_day_summary">استخدام إعدادات النهار فقط</string>
-  <string name="live_display_night">الليل</string>
-  <string name="live_display_night_summary">استخدام إعدادات الليل فقط</string>
-  <string name="live_display_outdoor">خارج المنزل ( شمس ساطعة)</string>
-  <string name="live_display_outdoor_summary">استخدم إعدادات خارج المنزل  فقط</string>
-  <string name="live_display_hint">ميزة LiveDisplay يمكن أن تساعد في تقليل إجهاد العين والمساعدة على النوم في الليل. انقر هنا لتجربته!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">لا يوجد جهاز متصل</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> جهاز متصل</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> أجهزة متصلة</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">منع نشاط التشغيل</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> ممنوع من التشغيل. المس للمصادقة وتشغيل التطبيق.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">البطارية مشحونة بالكامل</string>
+  <string name="notify_battery_fully_charged_text">قم بفصل جهازك من الشاحن لتحسين طول عمر البطارية.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">إعادة تعيين إحصائيات البطارية</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">يسمح للتطبيق بإعادة تعيين بيانات استخدام بطارية ذات المستوى المنخفض الحالي.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">تم تغيير بطاقات SIM</string>
+  <string name="uicc_hot_swapped_event_text">اضغط لتعيين التفضيلات الافتراضية لبطاقة SIM</string>
 </resources>
diff --git a/core/res/res/values-as-rIN/cm_strings.xml b/core/res/res/values-as-rIN/cm_strings.xml
new file mode 100644
index 0000000..c410620
--- /dev/null
+++ b/core/res/res/values-as-rIN/cm_strings.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">স্ক্ৰীণস্বট</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_receiveProtectedSms">প্ৰতিৰোধী SMS প্ৰাপ্ত কৰক</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">এপ্প্‌টোক ইনকামিং প্ৰতিৰোধী SMS প্ৰাপ্ত কৰিবলৈ অনুমতি দিয়ক।</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">প্ৰতিৰোধী SMS ৰ সূচী সংশোধন</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">প্ৰতিৰোধী SMS ঠিকনা সূচী সংশোধন কৰিবলৈ এপ্পক অনুমতি দিয়ে।</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_security">ছিকিউৰিটি</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">ডিভাইচৰ নিৰাপত্তা তথ্য সম্পৰ্কিত অনুমতি।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">ফোনৰ ব্লেকলিষ্ট পঢ়া</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">এপ্প্‌টোক ইনকামিং কল বা বাৰ্তাৰ বাবে অৱৰুদ্ধ কৰা ফোন নম্বৰবোৰৰ তথ্য পঢ়িবলৈ অনুমতি দিয়ে।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">ফোনৰ ব্লেকলিষ্ট পৰিবৰ্তন কৰা</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">এপ্প্‌টোক ইনকামিং কল বা বাৰ্তাৰ বাবে অৱৰুদ্ধ কৰা ফোন নম্বৰবোৰ পৰিবৰ্তন কৰিবলৈ অনুমতি দিয়ে।</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">কীগাৰ্ড ৱালপেপাৰ ছেট কৰা</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">এপ্প্‌ এটাক লক স্ক্ৰীণৰ ৱালপেপাৰ পৰিবৰ্তন কৰিবলৈ অনুমতি দিয়ে।</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">ৰিবুট</string>
+  <!-- label for current user in phone options dialog -->
+  <string name="global_action_current_user">বৰ্তমান</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">ৰিবুট</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">পুনৰুদ্ধাৰ</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">বুটলোডাৰ</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">ডাউনলোড</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">কোমল পুনঃবুট</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">ৰিবুট</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">আপোনাৰ টেবলেট কম্পিউটাৰ ৰিবুট হ\'ব।</string>
+  <string name="reboot_confirm" product="default">আপোনাৰ ফোন পুনৰাৰম্ভ হ\'ব।</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">ৰিবুটিং\u2026</string>
+  <!-- Long-press back kill application -->
+  <string name="app_killed_message">এপ্প্‌ বন্ধ হৈছে</string>
+  <!-- ADB over network notification -->
+  <string name="adb_net_active_notification_title">ADB অভাৰ নেটৱৰ্ক সক্ষম কৰা হৈছে</string>
+  <!-- ADB over USB and network notification -->
+  <string name="adb_both_active_notification_title">ADB অভাৰ USB আৰু নেটৱৰ্ক সক্ষম কৰা হৈছে</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">ডিবাগিং অক্ষম কৰিবলৈ স্পৰ্শ কৰক।</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB আৰু নেটৱৰ্ক</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">নেটৱৰ্ক</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">এপ্প্‌ লান্চ্চ কৰাটো অৱৰুদ্ধ কৰা</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s ইনষ্টল কৰা নাই</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">অগ্ৰাধিকাৰ</string>
+  <string name="silent_mode_none">হাল্লা</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">SIM গ্ৰাহকভুক্তি পৰিৱৰ্তন হোৱা বাবে Wi-Fi হটস্পট অক্ষম কৰা হৈছে</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Wi-Fi অফ কৰা</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">গোপনীয়তা ৰক্ষক সক্ষম বা অক্ষম কৰা</string>
+  <string name="permdesc_changePrivacyGuardState">আন এটা এপ্পে গোপনীয়তা ৰক্ষকৰ সৈতে চলিব নে সেইটো পৰিবৰ্তন কৰিবলৈ অনুমতি দিয়ে। যেতিয়া এটা এপ্প্‌ গোপনীয়তা ৰক্ষকৰ সৈতে চলি থাকে, তেতিয়া ই যোগাযোগ, কল লগ বা বাৰ্তাৰ দৰে ব্যক্তিগত ডাটাবোৰত প্ৰৱেশ কৰিব নোৱাৰে।</string>
+  <string name="privacy_guard_notification">গোপনীয়তা ৰক্ষক সক্ৰিয় কৰা</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> এ ব্যক্তিগত ডাটাত প্ৰৱেশ কৰিব নোৱাৰে</string>
+  <string name="privacy_guard_dialog_title">গোপনীয়তা ৰক্ষক</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="op">%2$s</xliff:g> এ <xliff:g id="app">%1$s</xliff:g> কৰিবলৈ বিচাৰে।</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">মোৰ পচন্দ মনত ৰাখক</string>
+  <!-- App ops requests -->
+  <string name="app_ops_access_camera">কেমেৰাত প্ৰৱেশ কৰক</string>
+  <string name="app_ops_access_location">আপোনাৰ অৱস্থানত প্ৰৱেশ কৰক</string>
+  <string name="app_ops_access_notifications">আপোনাৰ অধিসূচনাসমূহ পঢ়া</string>
+  <string name="app_ops_activate_vpn">এটা VPN সক্ৰিয় কৰা</string>
+  <string name="app_ops_auto_start">পাৱাৰ আপৰ সময়ত আৰম্ভ কৰা</string>
+  <string name="app_ops_delete_call_log">আপোনাৰ কল লগবোৰ বিলোপ কৰা</string>
+  <string name="app_ops_delete_contacts">আপোনাৰ যোগাযোগবোৰ বিলোপ কৰা</string>
+  <string name="app_ops_delete_mms">আপোনাৰ MMS বাৰ্তাবোৰ বিলোপ কৰা</string>
+  <string name="app_ops_delete_sms">আপোনাৰ SMS বাৰ্তাবোৰ বিলোপ কৰা</string>
+  <string name="app_ops_draw_on_top">উইণ্ডো শীৰ্ষলৈ টানি অনা</string>
+  <string name="app_ops_get_usage_stats">এপ্প্‌ ব্যৱহাৰৰ পৰিসংখ্যা পোৱা</string>
+  <string name="app_ops_keep_device_awake">আপোনাৰ ডিভাইচ সাৰে ৰখা</string>
+  <string name="app_ops_make_phone_call">এটা ফোন কল কৰা</string>
+  <string name="app_ops_modify_calendar">আপোনাৰ কেলেণ্ডাৰ উন্নীত কৰা</string>
+  <string name="app_ops_modify_call_log">কল লগ উন্নীত কৰা</string>
+  <string name="app_ops_modify_clipboard">ক্লিপবোৰ্ড সংশোধন কৰা</string>
+  <string name="app_ops_modify_contacts">আপোনাৰ কণ্টেক্টবোৰ উন্নীত কৰা</string>
+  <string name="app_ops_modify_settings">ছিষ্টেম ছেটিং উন্নীত কৰা</string>
+  <string name="app_ops_mute_unmute_microphone">মাইক্ৰ\'ফোন মিউট/আনমিউট কৰা</string>
+  <string name="app_ops_play_audio">অডিঅ’ প্লে কৰক</string>
+  <string name="app_ops_post_notification">অধিসূচনা পোষ্ট কৰা</string>
+  <string name="app_ops_project_media">প্ৰজেক্ট মিডিয়া</string>
+  <string name="app_ops_read_calendar">আপোনাৰ কেলেণ্ডাৰ পঢ়া</string>
+  <string name="app_ops_read_call_log">কল লগ পঢ়া</string>
+  <string name="app_ops_read_clipboard">ক্লিপবোৰ্ড পঢ়া</string>
+  <string name="app_ops_read_contacts">আপোনাৰ কনটেক্টসমূহ পঢ়ক</string>
+  <string name="app_ops_read_mms">আপোনাৰ MMS বাৰ্তাবোৰ পঢ়া</string>
+  <string name="app_ops_read_sms">আপোনাৰ SMS বাৰ্তাবোৰ পঢ়া</string>
+  <string name="app_ops_receive_sms">এটা SMS বাৰ্তা প্ৰাপ্ত কৰা</string>
+  <string name="app_ops_record_audio">অডিঅ’ ৰেকৰ্ড</string>
+  <string name="app_ops_send_mms">MMS বাৰ্তা প্ৰেৰণ কৰা</string>
+  <string name="app_ops_send_sms">SMS বাৰ্তা প্ৰেৰণ কৰা</string>
+  <string name="app_ops_start_at_bootup">পাৱাৰ আপৰ সময়ত আৰম্ভ কৰা</string>
+  <string name="app_ops_toast_window">টোষ্ট বাৰ্তা প্ৰদৰ্শন কৰা</string>
+  <string name="app_ops_toggle_bluetooth">Bluetooth টগল কৰা</string>
+  <string name="app_ops_toggle_mobile_data">ম\'বাইল ডাটা টগল কৰক</string>
+  <string name="app_ops_toggle_nfc">NFC টগল কৰা</string>
+  <string name="app_ops_toggle_wifi">Wi-Fi টগল কৰক</string>
+  <string name="app_ops_use_alarm_volume">এলাৰ্ম ভলিউম নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_use_audio_focus">অডিঅ\' ফোকাচ নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_use_bluetooth_volume">Bluetooth ভলিউম নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_use_master_volume">মাষ্টাৰ ভলিউম নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_use_media_buttons">মিডিয়া বুটামবোৰ নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_use_media_volume">মিডিয়া ভলিউম নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_use_notification_volume">অধিসূচনা ভলিউম নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_use_ring_volume">ৰিংটোন ভলিউম নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_use_vibrate">হেপ্টিক ফীডবেক ব্যৱহাৰ কৰা</string>
+  <string name="app_ops_use_voice_volume">ভইচ কল ভলিউম নিয়ন্ত্ৰণ কৰা</string>
+  <string name="app_ops_write_mms">এটা MMS বাৰ্তা লিখক</string>
+  <string name="app_ops_write_sms">এটা SMS বাৰ্তা লিখক</string>
+  <string name="app_ops_use_fingerprint">আঙুলিৰছাপ ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_add_voicemail">এটা ভইচমেইল যোগ দিয়ক</string>
+  <string name="app_ops_read_phone_state">ফোন অৱস্থাত প্ৰৱেশ কৰক</string>
+  <string name="app_ops_scan_wifi">Wi-Fi নেটৱৰ্ক স্কেন কৰক</string>
+  <string name="app_ops_change_wallpaper">ৱালপেপাৰ পৰিৱৰ্তন কৰক</string>
+  <string name="app_ops_assist_structure">সহায়তা গাঁথনি ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_assist_screenshot">এটা স্ক্ৰীণশ্বট লওক</string>
+  <string name="app_ops_use_body_sensors">দেহ চেনচৰ ব্যৱহাৰ কৰক</string>
+  <string name="app_ops_read_cell_broadcasts">চেল ব্ৰডকাষ্ট পঢ়ক</string>
+  <string name="app_ops_mock_location">আপোনাৰ অৱস্থান ম\'ক কৰক</string>
+  <string name="app_ops_read_external_storage">বাহ্যিক ষ্ট\'ৰেজ পঢ়ক</string>
+  <string name="app_ops_write_external_storage">বাহ্যিক ষ্ট\'ৰেজলৈ লিখক</string>
+  <string name="app_ops_turn_on_screen">স্ক্ৰীণ অন কৰক</string>
+  <string name="app_ops_get_accounts">ডিভাইচ একাউণ্ট প্ৰাপ্ত কৰক</string>
+  <string name="app_ops_wifi_change">Wi-Fi অৱস্থা পৰিৱৰ্তন কৰক</string>
+  <string name="app_ops_su">ৰুট প্ৰৱেশাধিকাৰ প্ৰাপ্ত কৰা</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">এই স্ক্ৰীণ আনপিন কৰিবলৈ, বেক বুটামটো স্পৰ্শ কৰক আৰু হেঁচি ৰাখক।</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">কোনো সংযোগিত ডিভাইচ নাই</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> সংযোগিত ডিভাইচ</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> সংযোগিত ডিভাইচসমূহ</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">কাৰ্যকলাপ লান্চ্চ কৰাটো অৱৰুদ্ধ কৰা হৈছে</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> টো লান্চ্চ কৰাৰ পৰা প্ৰতিৰোধী। এপ্লিকেচনটো প্ৰমাণীকৰণ আৰু লান্চ্চ কৰিবলৈ টেপ কৰক।</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">বেটেৰী সম্পূৰ্ণৰূপে চাৰ্জ হৈ গ\'ল</string>
+  <string name="notify_battery_fully_charged_text">বেটেৰীৰ জীৱ্ন কাল বঢ়াবলৈ আপোনাৰ ডিভাইচটো চাৰ্জাৰৰ পৰা আতৰাই ৰাখক।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">বেটাৰী পৰিসংখ্যা ৰিছেট কৰক</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">এটা এপ্লিকেচনক চলিত নিম্ন-লেভেলৰ বেটাৰি ব্যৱহাৰ ডাটা ৰিছেট কৰিবলৈ অনুমতি দিয়ে।</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-as-rIN/strings.xml b/core/res/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-as-rIN/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-ast-rES/cm_strings.xml b/core/res/res/values-ast-rES/cm_strings.xml
index d254bbf..bed144f 100644
--- a/core/res/res/values-ast-rES/cm_strings.xml
+++ b/core/res/res/values-ast-rES/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Capturar pantalla</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">recibir SMS protexíos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Permite que l\'aplicación reciba mensaxes SMS entrantes protexíos.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modificar llista de SMS protexíos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Permite que l\'aplicación modifique la llista de direiciones de mensaxes SMS protexíos.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Seguridá</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Permisos rellacionaos a la seguridá de la información del preséu.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">Lleer llista prieta del teléfonu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Permite a una aplicación lleer información sobre los númberos telefónicos bloquiaos pa llamaes o mensaxes entrantes.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">camudar la llista prieta del teléfonu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Permite qu\'una aplicación camude los númberos telefónicos bloquiaos pa llamaes o mensaxes entrantes.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Afita\'l fondu de pantalla de bloquéu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Permite que l\'aplicación afite\'l fondu de la pantalla de bloquéu.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reaniciar</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Actual</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reaniciar</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Mou Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Mou Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Descargar</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Reaniciu suave</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reaniciar</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">La tablet va reaniciase.</string>
   <string name="reboot_confirm" product="default">El teléfonu va reaniciase.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Reaniciando\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplicación finada</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB sobre rede habilitáu</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB sobre USB y rede habilitáu</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Toca pa deshabilitar la depuración.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB y rede</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Rede</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">interceutar la execución d\'aplicaciones</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s nun ta instalada</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioridá</string>
   <string name="silent_mode_none">Dengún</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Deshabilitóse\'l puntu Wi-Fi pola mor del cambéu de la soscripción de la SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Apagar Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">habilitar o deshabilitar la privacidá</string>
   <string name="permdesc_changePrivacyGuardState">Permite que l\'aplicación cambie l\'estáu de privacidá d\'otra. Cuando una aplicación s\'executa cola privacidá habilitada, nun va poder acceder a los datos personales, talos como contautos, mensaxes o rexistros de llamaes.</string>
   <string name="privacy_guard_notification">Privacidá activada</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> nun va poder acceder a los datos personales</string>
   <string name="privacy_guard_dialog_title">Privacidá</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> quies <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Recordar la mio escoyeta</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">acceder a la cámara</string>
   <string name="app_ops_access_location">acceder a la to llocalización</string>
   <string name="app_ops_access_notifications">lleer les tos notificaciones</string>
@@ -97,7 +135,9 @@
   <string name="app_ops_start_at_bootup">executase al aniciu</string>
   <string name="app_ops_toast_window">notificaciones emerxentes</string>
   <string name="app_ops_toggle_bluetooth">cambiar Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">conmutar datos móviles</string>
   <string name="app_ops_toggle_nfc">cambiar NFC</string>
+  <string name="app_ops_toggle_wifi">alternar Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">remanar volume de l\'alarma</string>
   <string name="app_ops_use_audio_focus">remanar el volume de soníu</string>
   <string name="app_ops_use_bluetooth_volume">remanar el volume del Bluetooth</string>
@@ -110,19 +150,44 @@
   <string name="app_ops_use_voice_volume">remanar el volume de la llamada</string>
   <string name="app_ops_write_mms">escribir un mensaxe MMS</string>
   <string name="app_ops_write_sms">escribir un mensaxe SMS</string>
+  <string name="app_ops_use_fingerprint">usar buelga</string>
+  <string name="app_ops_add_voicemail">amestar corréu de voz</string>
+  <string name="app_ops_read_phone_state">estáu d\'accesu al teléfonu</string>
+  <string name="app_ops_scan_wifi">escaniar rede Wi-Fi</string>
+  <string name="app_ops_change_wallpaper">camudar el fondu</string>
+  <string name="app_ops_assist_structure">usar cadarma d\'asistencia</string>
+  <string name="app_ops_assist_screenshot">facer una captura</string>
+  <string name="app_ops_use_body_sensors">usar sensores corporales</string>
+  <string name="app_ops_read_cell_broadcasts">lleer tresmisiones celulares</string>
+  <string name="app_ops_mock_location">simular la llocalización</string>
+  <string name="app_ops_read_external_storage">lleer almacenamientu esternu</string>
+  <string name="app_ops_write_external_storage">escribir almacenamientu esternu</string>
+  <string name="app_ops_turn_on_screen">prender pantalla</string>
+  <string name="app_ops_get_accounts">consiguir cuentes del preséu</string>
+  <string name="app_ops_wifi_change">camudar estáu del Wi-Fi</string>
   <string name="app_ops_su">obtener accesu root</string>
-  <string name="live_display_auto">Automáticu</string>
-  <string name="live_display_auto_summary">Axustar automáticamente la temperatura del color de pantalla col alborecer y l\'atapecer</string>
-  <string name="live_display_off">Desactiváu</string>
-  <string name="live_display_off_summary">Deshabilitar tolos axustes</string>
-  <string name="live_display_day">Día</string>
-  <string name="live_display_day_summary">Usar namái los axustes de día</string>
-  <string name="live_display_night">Nueche</string>
-  <string name="live_display_night_summary">Usar namái los axustes de nueche</string>
-  <string name="live_display_outdoor">Esterior (lluz del sol)</string>
-  <string name="live_display_outdoor_summary">Usar namái axustes del esterior</string>
-  <string name="live_display_hint">LiveDisplay pue amenorgar reducir la fatiga visual y ayudar a dormir pela nueche. ¡Toca equí pa probalu!</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">Pa desfixar esta pantalla, ten primíu\'l botón Atrás.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nun hai dengún preséu coneutáu</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> preséu coneutáu</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> preseos coneutaos</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Bloquióse\'l llanzamientu de l\'actividá</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> protexóse pa nun llanciase. Calca p\'autenticate y llanciar l\'aplicación.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batería cargada ensembre</string>
+  <string name="notify_battery_fully_charged_text">Desconeuta\'l preséu del cargador p\'ameyorar la vida útil de la batería.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">reafitar estadístiques de batería</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permite qu\'una aplicación reafite los datos actuales d\'usu de batería a nivel baxu.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Les tarxetes SIM camudaron</string>
+  <string name="uicc_hot_swapped_event_text">Toca p\'afitar les preferencies por defeutu de la tarxeta SIM</string>
 </resources>
diff --git a/core/res/res/values-ast-rES/strings.xml b/core/res/res/values-ast-rES/strings.xml
index 929fb6e..65cdade 100644
--- a/core/res/res/values-ast-rES/strings.xml
+++ b/core/res/res/values-ast-rES/strings.xml
@@ -19,60 +19,129 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
   <string name="byteShort">B</string>
+  <!-- Suffix added to a number to signify size in kilobytes. -->
   <string name="kilobyteShort">KB</string>
+  <!-- Suffix added to a number to signify size in megabytes. -->
   <string name="megabyteShort">MB</string>
+  <!-- Suffix added to a number to signify size in gigabytes. -->
   <string name="gigabyteShort">GB</string>
+  <!-- Suffix added to a number to signify size in terabytes. -->
   <string name="terabyteShort">TB</string>
+  <!-- Suffix added to a number to signify size in petabytes. -->
   <string name="petabyteShort">PB</string>
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <string name="fileSizeSuffix"><xliff:g id="number" example="123">%1$s</xliff:g><xliff:g id="unit" example="KB">%2$s</xliff:g></string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
   <string name="durationDays"><xliff:g id="days">%1$d</xliff:g> díes</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
   <string name="durationDayHours"><xliff:g id="days">%1$d</xliff:g> día
             <xliff:g id="hours">%2$d</xliff:g> hrs</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
   <string name="durationDayHour"><xliff:g id="days">%1$d</xliff:g> día
             <xliff:g id="hours">%2$d</xliff:g> hrs</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
   <string name="durationHours"><xliff:g id="hours">%1$d</xliff:g> hrs</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
   <string name="durationHourMinutes"><xliff:g id="hours">%1$d</xliff:g> hr
             <xliff:g id="minutes">%2$d</xliff:g> mins</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
   <string name="durationHourMinute"><xliff:g id="hours">%1$d</xliff:g> hr
             <xliff:g id="minutes">%2$d</xliff:g> mins</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
   <string name="durationMinutes"><xliff:g id="minutes">%1$d</xliff:g> mins</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <string name="durationMinute"><xliff:g id="minutes">%1$d</xliff:g> min</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
   <string name="durationMinuteSeconds"><xliff:g id="minutes">%1$d</xliff:g> min
             <xliff:g id="seconds">%2$d</xliff:g> segs</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
   <string name="durationMinuteSecond"><xliff:g id="minutes">%1$d</xliff:g> min
             <xliff:g id="seconds">%2$d</xliff:g> segs</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
   <string name="durationSeconds"><xliff:g id="seconds">%1$d</xliff:g> segs</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
   <string name="durationSecond"><xliff:g id="seconds">%1$d</xliff:g> seg</string>
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
   <string name="untitled">&lt;Ensin títulu&gt;</string>
+  <!-- How to display the lack of a phone number -->
   <string name="emptyPhoneNumber">(Ensin númberu de teléfonu)</string>
+  <!-- How to display the lack of a name -->
+  <string name="unknownName">Desconocíu</string>
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <string name="defaultVoiceMailAlphaTag">Buzón de voz</string>
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">Hebo un fallu de conexón o\'l códigu MMI nun ye válidu.</string>
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
   <string name="mmiFdnError">La operación namái ye válida pa númberos de marcación fixa.</string>
+  <!-- Displayed when a phone feature such as call barring was activated. -->
   <string name="serviceEnabled">El serviciu habilitóse.</string>
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
   <string name="serviceEnabledFor">Habilitóse\'l serviciu pa:</string>
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
   <string name="serviceDisabled">El serviciu inhabilitóse.</string>
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
   <string name="serviceRegistered">El rexistru féxose correutamente.</string>
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
   <string name="serviceErased">L\'elementu desanicióse correutamente.</string>
+  <!-- Displayed when a SIM password was entered incorrectly. -->
   <string name="passwordIncorrect">Contraseña incorreuta</string>
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
   <string name="mmiComplete">MMI completu</string>
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
   <string name="badPin">El códigu PIN antiguu qu\'introduxisti ye correutu.</string>
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
   <string name="badPuk">El códigu PUK qu\'introduxisti nun ye correutu.</string>
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
   <string name="mismatchPin">Los códigos PIN inxertaos nun concasen.</string>
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
   <string name="invalidPin">Introduz un códigu PIN con una llonxitú ente cuatro y ocho díxitos.</string>
+  <!-- Displayed when a SIM PUK password is too short. -->
   <string name="invalidPuk">Escribi un códigu PUK d\'ocho caráuteres o más.</string>
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
   <string name="needPuk">La tarxeta SIM ta bloquiada col códigu PUK. Introduz el códigu PUK pa desbloquiala.</string>
   <string name="needPuk2">Introduz el códigu PUK2 pa desbloquiar la tarxeta SIM.</string>
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
   <string name="enablePin">Error, habilitar bloquéu de SIM/RUIM.</string>
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <plurals name="pinpuk_attempts">
+    <item quantity="one">Quédate <xliff:g id="NUMBER">%d</xliff:g> intentu pa bloquiar la tarxeta SIM.</item>
+    <item quantity="other">Quédente <xliff:g id="NUMBER">%d</xliff:g> intentos pa bloquiar la tarxeta SIM.</item>
+  </plurals>
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
   <string name="imei">IMEI</string>
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
   <string name="meid">MEID</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
   <string name="ClipMmi">ID d\'emisor de llamada entrante</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
   <string name="ClirMmi">ID d\'emisor de llamada saliente</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
   <string name="ColpMmi">ID de llinia coneutada</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
   <string name="ColrMmi">Restricción de ID de llinia coneutada</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
   <string name="CfMmi">Esvíu de llamada</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
   <string name="CwMmi">Llamada n\'espera</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
   <string name="BaMmi">Bloquéu de llamada</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
   <string name="PwdMmi">Cambéu de contraseña</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
   <string name="PinMmi">Cambéu de PIN</string>
   <string name="CnipMmi">Númberu de llamada entrante presente</string>
   <string name="CnirMmi">Númberu de llamada entrante restrinxíu</string>
@@ -80,29 +149,60 @@
   <string name="RuacMmi">Refugu de llamaes molestes non deseaes</string>
   <string name="CndMmi">Entrega de númberu de llamada entrante</string>
   <string name="DndMmi">Nun molestar</string>
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
   <string name="CLIRDefaultOnNextCallOn">El ID d\'emisor presenta\'l valor predetermináu de restrinxíu. Siguiente llamada: Restrinxíu</string>
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
   <string name="CLIRDefaultOnNextCallOff">El ID d\'emisor presenta\'l valor predetermináu de restrinxíu. Siguiente llamada: Non restrinxíu</string>
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
   <string name="CLIRDefaultOffNextCallOn">El ID d\'emisor presenta\'l valor predetermináu de no restrinxíu. Siguiente llamada: Restrinxíu</string>
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
   <string name="CLIRDefaultOffNextCallOff">El ID d\'emisor presenta\'l valor predetermináu de no restrinxíu. Siguiente llamada: Non restrinxíu</string>
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
   <string name="serviceNotProvisioned">El serviciu nun se suministra.</string>
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
   <string name="CLIRPermanent">Nun pues modificar el ID d\'emisor.</string>
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
   <string name="RestrictedChangedTitle">Modificóse l\'accesu restrinxíu.</string>
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
   <string name="RestrictedOnData">El serviciu de datos ta bloquiáu.</string>
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
   <string name="RestrictedOnEmergency">El serviciu d\'emerxencia ta bloquiáu.</string>
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
   <string name="RestrictedOnNormal">El serviciu de voz ta bloquiáu.</string>
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
   <string name="RestrictedOnAllVoice">Tán bloquiaos tolos servicios de voz.</string>
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
   <string name="RestrictedOnSms">El serviciu de SMS ta bloquiáu.</string>
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
   <string name="RestrictedOnVoiceData">Los servicios de voz y de datos tán bloquiaos.</string>
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
   <string name="RestrictedOnVoiceSms">Tán bloquiaos tolos servicios de voz y de SMS.</string>
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
   <string name="RestrictedOnAll">Tán bloquiaos tolos servicios de voz, de datos y de SMS.</string>
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <string name="peerTtyModeFull">El preséu solicitó\'l mou TTY FULL.</string>
+  <string name="peerTtyModeHco">El preséu solicitó\'l mou TTY HCO.</string>
+  <string name="peerTtyModeVco">El preséu solicitó\'l mou TTY VCO.</string>
+  <string name="peerTtyModeOff">El preséu solicitó\'l mou TTY OFF.</string>
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">Voz</string>
+  <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassData">Datos</string>
+  <!-- Example: Service was enabled for: Voice, FAX -->
   <string name="serviceClassFAX">FAX</string>
+  <!-- Example: Service was enabled for: Voice, SMS -->
   <string name="serviceClassSMS">SMS</string>
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
   <string name="serviceClassDataAsync">Asíncronos</string>
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
   <string name="serviceClassDataSync">Sincronización</string>
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <string name="serviceClassPacket">Paquete</string>
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
   <string name="roamingText0">Indicador d\'itinerancia activáu</string>
   <string name="roamingText1">Indicador d\'itinerancia desactiváu</string>
   <string name="roamingText2">Indicador d\'itinerancia parpaguiante</string>
@@ -117,288 +217,832 @@
   <string name="roamingText11">Banner d\'itinerancia activáu</string>
   <string name="roamingText12">Banner d\'itinerancia desactiváu</string>
   <string name="roamingTextSearching">Guetando serviciu</string>
+  <!-- Displayed when WFC registration fails -->
+  <string name="wfcRegErrorTitle">Llamaes Wifi</string>
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <string name="wfcSpnFormat">%s</string>
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <string name="wfcDataSpnFormat">%s</string>
+  <!-- WFC, summary for Disabled -->
+  <string name="wifi_calling_off_summary">Non</string>
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <string name="wfc_mode_wifi_preferred_summary">Rede Wi-Fi preferida</string>
+  <!-- WFC, summary for Cellular Preferred -->
+  <string name="wfc_mode_cellular_preferred_summary">Rede móvil preferida</string>
+  <!-- WFC, summary for Wi-Fi Only -->
+  <string name="wfc_mode_wifi_only_summary">Namái Wi-Fi</string>
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
+  <!-- Displayed when the call forwarding query was forwarded. -->
   <string name="cfTemplateForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g></string>
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <string name="cfTemplateForwardedTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> trescurríos <xliff:g id="TIME_DELAY">{2}</xliff:g> segundos</string>
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegistered"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Non esviada</string>
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">Códigu de función completu</string>
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">Hebo un fallu de conexón o\'l códigu de la función nun ye válidu.</string>
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">Aceutar</string>
+  <!-- Displayed when a web request failed with a generic network error. -->
   <string name="httpError">Hebo un fallu de rede.</string>
+  <!-- Displayed when a web request failed because the URL could not be found. -->
   <string name="httpErrorLookup">Nun pudo alcontrase la URL.</string>
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
   <string name="httpErrorUnsupportedAuthScheme">Nun s\'almite l\'esquema d\'autenticación del sitiu.</string>
+  <!-- Displayed when a web request failed because the authentication failed. -->
   <string name="httpErrorAuth">Nun pudo autenticase.</string>
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
   <string name="httpErrorProxyAuth">L\'autenticación per aciu del sirvidor proxy nun se fexo correutamente.</string>
+  <!-- Displayed when a web request failed because there was a connection error. -->
   <string name="httpErrorConnect">Nun pudo afitase conexón col sirvidor.</string>
+  <!-- Displayed when a web request failed because there was an input or output error. -->
   <string name="httpErrorIO">Nun pudo afitase comunicación col sirvidor. Inténtalo de nueves.</string>
+  <!-- Displayed when a web request failed because the request timed out -->
   <string name="httpErrorTimeout">Escosó\'l tiempu d\'espera de conexón col sirvidor.</string>
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
   <string name="httpErrorRedirectLoop">La páxina contién munchos redireicionamientos de sirvidor.</string>
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
   <string name="httpErrorUnsupportedScheme">Protocolu non almitíu</string>
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
   <string name="httpErrorFailedSslHandshake">Nun pudo afitase una conexón segura.</string>
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
   <string name="httpErrorBadUrl">Nun pudo abrise la páxina porque la URL nun ye válida.</string>
+  <!-- Displayed when a request failed because we failed to open the file. -->
   <string name="httpErrorFile">Nun pudo accedese al ficheru.</string>
+  <!-- Displayed when a request failed because the file wasn't found. -->
   <string name="httpErrorFileNotFound">Nun pudo atopase\'l ficheru solicitáu.</string>
+  <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">Tán procesándose abondes solicitúes. Vuelvi a intentalo dempués.</string>
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">Error d\'aniciu de sesión de <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">Sincronización</string>
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <string name="contentServiceSyncNotificationTitle">Sincronización</string>
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
   <string name="contentServiceTooManyDeletesNotificationDesc">Abondes eliminaciones de <xliff:g id="CONTENT_TYPE">%s</xliff:g></string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="tablet">Escosó l\'espaciu d\'almacenamientu de la tablet. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="watch">Escosó l\'espaciu d\'almacenamientu de la tablet. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <string name="low_memory" product="tv">L\'almacenamientu de la TV ta completu. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">Escosó l\'espaciu d\'almacenamientu del teléfonu. Desanicia dalgunos ficheros pa lliberar espaciu.</string>
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">Ye dable que la rede tea supervisada</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_by_unknown">Por un terceru desconocíu</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <string name="ssl_ca_cert_noti_by_administrator">Pol alministrador del perfil de trabayu</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">Por <xliff:g id="MANAGING_DOMAIN">%s</xliff:g></string>
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <string name="work_profile_deleted">Perfil de trabayu desaniciáu</string>
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <string name="work_profile_deleted_description">Desanicióse\'l perfil de trabayu por mor de la falta d\'una app d\'alministración.</string>
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <string name="work_profile_deleted_details">L\'app d\'alministración de perfil de trabayu nun s\'atopa o ta frañada.
+         Desaniciáronse\'l perfil de trabayu y datos. Contauta col alministrador p\'asistencia.</string>
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <string name="work_profile_deleted_description_dpm_wipe">El to perfil de trabayu yá nun ta disponible nesti preséu.</string>
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <string name="factory_reset_warning">Van desaniciase los datos del preséu</string>
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <string name="factory_reset_message">L\'app alministración nun s\'atopa o ta dañada, y nun pue usase.
+         Van desaniciase los datos del preséu. Contauta col alministrador pa más ayuda.</string>
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Yo</string>
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">Opciones de la tablet</string>
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <string name="power_dialog" product="tv">Opciones de TV</string>
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="default">Opciones del teléfonu</string>
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
   <string name="silent_mode">Mou silenciu</string>
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
   <string name="turn_on_radio">Activar conexón inalámbrica</string>
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
   <string name="turn_off_radio">Desactivar función inalámbrica</string>
+  <!-- Button to lock the screen, within the Phone Options dialog -->
   <string name="screen_lock">Bloquéu de pantalla</string>
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
   <string name="power_off">Apagar</string>
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_silent">Timbre desactiváu</string>
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_vibrate">Mou vibración</string>
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_ring">Timbre activáu</string>
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <string name="reboot_to_update_title">Anovamientu del sistema Android</string>
+  <string name="reboot_to_update_prepare">Preparando l\'anovamientu\u2026</string>
+  <string name="reboot_to_update_package">Procesando\'l paquete d\'anovamientu\u2026</string>
+  <string name="reboot_to_update_reboot">Reaniciando\u2026</string>
+  <!-- Reboot to Recovery for factory reset. -->
+  <string name="reboot_to_reset_title">Reafitar a axustes de fábrica</string>
+  <string name="reboot_to_reset_message">Reiniciando\u2026</string>
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
   <string name="shutdown_progress">Apagando\u2026</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="tablet">La tablet va apagase.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="shutdown_confirm" product="tv">Va apagase la TV.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="watch">El reló va apagase</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="default">El teléfonu va apagase.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
   <string name="shutdown_confirm_question">¿De xuru que quies apagar el teléfonu?</string>
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
   <string name="reboot_safemode_title">Reaniciar en mou seguru</string>
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
   <string name="reboot_safemode_confirm">¿Quies reaniciar el sistema en mou seguru? Van inhabilitase toles aplicaciones esternas que tengas instalaes. Eses aplicaciones van restaurase la próxima vegada que reanicies del sistema.</string>
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
   <string name="recent_tasks_title">Reciente</string>
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
   <string name="no_recent_tasks">Nun hai aplicaciones recientes.</string>
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="tablet">Opciones de la tablet</string>
+  <!-- Title of the Global Actions Dialog -->
+  <string name="global_actions" product="tv">Opciones de TV</string>
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="default">Opciones del teléfonu</string>
+  <!-- label for item that locks the phone in the phone options dialog -->
   <string name="global_action_lock">Bloquéu de pantalla</string>
+  <!-- label for item that turns off power in phone options dialog -->
   <string name="global_action_power_off">Apagar</string>
+  <!-- label for item that generates a bug report in the phone options dialog -->
   <string name="global_action_bug_report">Informe de fallu</string>
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
   <string name="bugreport_title">Crear informe de fallos</string>
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
   <string name="bugreport_message">Va atropase información tocante al estáu actual del preséu y va unviase per corréu-e. Van pasar unos minutos dende qu\'entame a xenerase l\'informe de fallos hasta que s\'unvie, polo qu\'encamentámoste que seyas paciente.</string>
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
   <string name="global_action_toggle_silent_mode">Mou silenciu</string>
+  <!-- status message in phone options dialog for when silent mode is enabled -->
   <string name="global_action_silent_mode_on_status">El soníu ta desactiváu. Activar</string>
+  <!-- status message in phone options dialog for when silent mode is disabled -->
   <string name="global_action_silent_mode_off_status">El soníu ta activáu. Desactivar</string>
+  <!-- label for item that toggles airplane mode -->
   <string name="global_actions_toggle_airplane_mode">Mou avión</string>
+  <!-- status message in phone options dialog for when airplane mode is on -->
   <string name="global_actions_airplane_mode_on_status">Mou avión activáu</string>
+  <!-- status message in phone options dialog for when airplane mode is off -->
   <string name="global_actions_airplane_mode_off_status">Mou avión desactiváu</string>
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
   <string name="global_action_settings">Axustes</string>
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <string name="global_action_assist">Asistencia</string>
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <string name="global_action_voice_assist">Asistente voz</string>
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
   <string name="global_action_lockdown">Bloquiar agora</string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
   <string name="status_bar_notification_info_overflow">999+</string>
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
   <string name="safeMode">Mou seguru</string>
+  <!-- Label for the Android system components when they are shown to the user. -->
   <string name="android_system_label">Sistema Android</string>
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <string name="user_owner_label">Personal</string>
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
   <string name="managed_profile_label">Trabayu</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_contacts">Contautos</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_contacts">acceder a los contautos</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_location">Llocalización</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_location">accesu a la llocalización d\'esti preséu</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_calendar">Calendariu</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_calendar">acceder al calendariu</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_sms">SMS</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_sms">unviar y ver mensaxes SMS</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_storage">Almacenamientu</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_storage">acceder a les semeyes, conteníu multimedia y los ficheros del preséu</string>
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_microphone">Micrófonu</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_microphone">grabar soníu</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_camera">Cámara</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_camera">facer semeyes y grabar vídeos</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_phone">Teléfonu</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_phone">facer y xestionar llamaes telefóniques</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_sensors">Sensores corporales</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_sensors">acceder a los datos del sensor tocante a los tos signos vitales</string>
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
   <string name="capability_title_canRetrieveWindowContent">Recuperar el conteníu de la ventana</string>
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
   <string name="capability_desc_canRetrieveWindowContent">Inspeiciona\'l conteníu de la ventana cola que teas interactuando.</string>
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
   <string name="capability_title_canRequestTouchExploration">Activar esploración táctil</string>
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
   <string name="capability_desc_canRequestTouchExploration">Los elementos esbillaos van dicise en voz alta y vas poder esplorar la pantalla per duana de xestos.</string>
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
   <string name="capability_title_canRequestEnhancedWebAccessibility">Activar accesibilidá web meyorada</string>
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
   <string name="capability_desc_canRequestEnhancedWebAccessibility">Ye dable que s\'instalen secuencies de comandos pa que\'l conteníu de les aplicaciones seya más accesible.</string>
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
   <string name="capability_title_canRequestFilterKeyEvents">Observar el testu qu\'escribes</string>
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
   <string name="capability_desc_canRequestFilterKeyEvents">Inclúi datos personales como númberos de tarxetes de créitu y contraseñes.</string>
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_statusBar">inhabilitar o modificar la barra d\'estáu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_statusBar">Permite que l\'aplicación inhabilite la barra d\'estáu o amieste y desanicie iconos del sistema.</string>
-  <string name="permlab_statusBarService">barra d\'estáu</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_statusBarService">ser la barra d\'estáu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_statusBarService">Permite que l\'aplicación apaeza na barra d\'estáu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_expandStatusBar">espander/contrayer la barra d\'estáu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_expandStatusBar">Permite que l\'aplicación espanda o contraiga la barra d\'estáu.</string>
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permlab_install_shortcut">instalar accesos direutos</string>
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permdesc_install_shortcut">Permite qu\'una aplicación amieste accesos direutos a la pantalla d\'aniciu ensin intervención del usuariu.</string>
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
   <string name="permlab_uninstall_shortcut">desinstalar accesos direutos</string>
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permdesc_uninstall_shortcut">Permite que l\'aplicación desanicie accesos direutos de la pantalla d\'aniciu ensin la intervención del usuariu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_processOutgoingCalls">redireicionar llamaes salientes</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_processOutgoingCalls">Permite que l\'aplicación vea\'l númberu que se ta marcando mientres una llamada saliente cola opción de redirixila a otro númberu o albortar dafechu la llamada.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveSms">recibir mensaxes de testu (SMS)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveSms">Permite que l\'aplicación reciba y procese mensaxes MMS, lo que significa que podría usar esti permisu pa remanar o desaniciar mensaxes unviaos al preséu ensin amosá-ylos al usuariu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveMms">recibir mensaxes de testu (MMS)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveMms">Permite que l\'aplicación reciba y procese mensaxes MMS, lo que significa que podría usar esti permisu pa remanar o desaniciar mensaxes unviaos al preséu ensin amosá-ylos al usuariu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCellBroadcasts">lleer mensaxes de difusión móvil</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readCellBroadcasts">Permite a l\'app lleer
+        los mensaxes de difusión móvil que recibe\'l preséu. En dalgunas llocalizaciones,
+        les alertes de difusión móvil únviense pa informar situaciones d\'emerxencia.
+        Les aplicaciones malicioses puen afeutar el rindimientu o funcionamientu del
+        preséu cuando se recibe un mensaxe de difusión móvil d\'emerxencia.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_subscribedFeedsRead">lleer feeds a los que ta soscritu l\'usuariu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_subscribedFeedsRead">Permite que l\'aplicación obtenga detalles sobre los feeds sincronizaos anguaño.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_sendSms">unviar y ver mensaxes SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sendSms">Permite que l\'aplicación unvie mensaxes SMS, lo que pue xenerar cargos inesperaos. Les aplicaciones malintencionaes puen causate gastos imprevistos al unviar mensaxes ensin la to confirmación.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSms">lleer los tos mensaxes de testu (SMS o MMS)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="tablet">Permite que l\'aplicación llea mensaxes SMS almacenaos na tablet o na tarxeta SIM. L\'aplicación pue usar esti permisu pa lleer tolos mensaxes SMS, independientemente de cuál seya\'l so conteníu o\'l so nivel de confidencialidá.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readSms" product="tv">Permite que l\'app llea mensaxes SMS
+      na TV o na tarxeta SIM. Esta opción permite que l\'app llea tolos
+      mensaxes SMS, independientemente del conteníu o de la confidencialidá.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="default">Permite que l\'aplicación llea mensaxes SMS almacenaos nel teléfonu o na tarxeta SIM. L\'aplicación pue usar esti permisu pa lleer tolos mensaxes SMS, independientemente de cuál seya\'l so conteníu o\'l so nivel de confidencialidá.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveWapPush">recibir mensaxes de testu (WAP)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveWapPush">Permite que l\'aplicación reciba y procese mensaxes WAP, lo que significa que podría usar esti permisu pa remanar o desaniciar mensaxes unviaos al usuariu ensin amosá-ylos.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getTasks">recuperar aplicaciones n\'execución</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getTasks">Permite que l\'aplicación recupere información sobre xeres que se tán executando nesi momentu o que s\'executaren de recién. L\'aplicación pue usar esti permisu pa descubrir cuáles son les aplicaciones que s\'usen nel preséu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_manageProfileAndDeviceOwners">remanar perfiles y propietariu del preséu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <string name="permdesc_manageProfileAndDeviceOwners">Permite que les apps configuren los perfiles de propietarios y el propietariu del preséu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_reorderTasks">reorganizar aplicaciones n\'execución</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_reorderTasks">Permite que l\'aplicación mueva xeres a segundu o a primer planu. L\'aplicación pue usar esti permisu pa facer estos movimientos ensin que-y lo indique l\'usuariu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_enableCarMode">habilitar mou coche</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_enableCarMode">Permite que l\'aplicación habilite\'l mou coche.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_killBackgroundProcesses">zarrar otres aplicaciones</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_killBackgroundProcesses">Esti permisu autoriza a l\'aplicación a torgar procesos en segundu planu d\'otres aplicaciones y pue facer, poro, qu\'eses aplicaciones dexen d\'executase.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_systemAlertWindow">amosar sobre otres aplicaciones</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_systemAlertWindow">Permite que l\'aplicación escriba sobre otres aplicaciones o en partes d\'interfaz d\'usuariu. Puen interferir col usu de la interfaz en cualquier aplicación o modificar lo que crees que s\'amuesa n\'otres aplicaciones.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_persistentActivity">facer que l\'aplicación s\'execute siempre</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_persistentActivity" product="tablet">Permite que l\'aplicación faiga que dalgunes de les sos partes se caltengan na memoria. Esto pue llendar la cantidá de memoria disponible pa otres aplicaciones y ralentizar la tablet.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_persistentActivity" product="default">Permite que l\'aplicación faiga que dalgunes de les sos partes se caltengan na memoria. Esto pue llendar la cantidá de memoria disponible pa otres aplicaciones y ralentizar el teléfonu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getPackageSize">medir l\'espaciu d\'almacenamientu de l\'aplicación</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getPackageSize">Permite que l\'aplicación recupere\'l so códigu, los datos y los tamaños de caché.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeSettings">modificar los axustes del sistema</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeSettings">Permite que l\'aplicación modifique los datos de configuración del sistema. Les aplicaciones malintencionaes puen dañar la configuración del sistema.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveBootCompleted">executase al entamu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="tablet">Permite que l\'aplicación s\'execute automáticamente una vegada que\'l sistema s\'anicie completamente. Esto pue facer que la tablet tarde más n\'aniciase y permite que l\'aplicación ralentice\'l funcionamientu global del preséu.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="default">Permite que l\'aplicación s\'execute automáticamente una vegada que\'l sistema s\'anicie completamente. Esto pue facer que\'l teléfonu tarde más n\'aniciase y pue permitir que l\'aplicación ralentice\'l funcionamientu global del preséu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_broadcastSticky">unviar emisión persistente</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="tablet">Permite que l\'aplicación unvie emisiones que permanecen nel preséu una vegada que la emisión finó. Un usu escesivu podría ralentizar la tablet o tornala inestable al facer qu\'use muncha memoria.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="default">Permite que l\'aplicación unvie emisiones que permanecen nel preséu una vegada que la emisión finó. Un usu escesivu podría ralentizar el teléfonu o tornalu inestable al facer qu\'use muncha memoria.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readContacts">consultar los tos contautos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="tablet">Permite que l\'aplicación consulte información sobre contautos almacenaos na tablet, incluyida la frecuencia cola que los llamesti, unviasti correos o tuvisti en contautu con ellos d\'otru mou. Esti permisu permite guardar los datos de los contautos, y les aplicaciones malintencionaes puen usalu pa compartir datos de contautos del usuariu ensin el so consentimientu.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="default">Permite que l\'aplicación consulte información sobre contautos almacenaos nel teléfonu, incluyida la frecuencia cola que los llamesti, unviasti correos o tuvisti en contautu con ellos d\'otru mou. Esti permisu permite guardar los datos de los contautos, y les aplicaciones malintencionaes puen usalu pa compartir datos de contautos del usuariu ensin el so consentimientu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeContacts">modificar los tos contautos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="tablet">Permite que l\'aplicación modifique los datos de los contautos almacenaos na tablet, incluyida la frecuencia cola que los llamesti, unviasti correos o tuvisti en contautu con ellos d\'otru mou. Les aplicaciones puen usar esti permisu pa desaniciar datos de contautos.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="default">Permite que l\'aplicación modifique los datos de los contautos almacenaos nel teléfonu, incluyida la frecuencia cola que los llamesti, unviasti correos o tuvisti en contautu con ellos d\'otru mou. Les aplicaciones puen usar esti permisu pa desaniciar datos de contautos.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCallLog">lleer el rexistru de llamaes</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="tablet">Permite que l\'aplicación consulte\'l rexistru de llamaes de la tablet, incluyíos datos sobre llamaes entrantes y salientes. Esti permisu permite guardar los datos del rexistru de llamaes, y les aplicaciones malintencionaes puen usalo pa compartir datos del rexistru de llamaes ensin el consentimientu del usuariu.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="default">Permite que l\'aplicación consulte\'l rexistru de llamaes del teléfonu, incluyíos datos sobre llamaes entrantes y salientes. Esti permisu permite guardar los datos del rexistru de llamaes, y les aplicaciones malintencionaes puen usalo pa compartir datos del rexistru de llamaes ensin el consentimientu del usuariu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeCallLog">escribir nel rexistru de llamaes</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="tablet">Permite que l\'aplicación modifique\'l rexistru de llamaes de la tablet, incluyíos datos sobre llamaes entrantes y salientes. Les aplicaciones malintencionaes puen usar esti permisu pa desaniciar o modificar el rexistru de llamaes.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="default">Permite que l\'aplicación modifique\'l rexistru de llamaes del teléfonu, incluyíos datos sobre llamaes entrantes y salientes. Les aplicaciones malintencionaes puen usar esti permisu pa desaniciar o modificar el rexistru de llamaes.</string>
-  <string name="permlab_bodySensors">sens. corp. (mon. frec. card.)</string>
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <string name="permlab_bodySensors">acceder a sensores corporales (como mon. frec. card)
+    </string>
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCalendar">lleer eventos de calendariu ya información confidencial</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="tablet">Permite que l\'aplicación consulte tolos eventos de calendariu almacenaos na tablet, incluyíos los de collacios y compañeros de trabayu. L\'aplicación pue usar esti permisu pa compartir o guardar datos del calendariu del usuariu ensin tener en cuenta si son privaos o confidenciales.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="default">Permite que l\'aplicación consulte tolos eventos de calendariu almacenaos nel teléfonu, incluyíos los de collacios y compañeros de trabayu. L\'aplicación pue usar esti permisu pa compartir o guardar datos del calendariu del usuariu ensin tener en cuenta si son privaos o confidenciales.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeCalendar">amestar o modificar eventos de calendariu y unviar mensaxes a los invitaos ensin el consentimientu de los propietarios</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessLocationExtraCommands">acceder a comandos de fornidor de llocalización adicional</string>
-  <string name="permlab_accessFineLocation">llocalización precisa (basada en rede y GPS)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_accessLocationExtraCommands">Permite a l\'app acceder
+      a comandos estres del fornidor de llocalización. Esto pue permiti-y interferir
+      nel funcionamientu del GPS o d\'otres fontes de llocalización.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_accessFineLocation">accesu a llocalización precisa
+      (basada en rede y GPS)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessFineLocation">Permite que l\'aplicación obtenga la to llocalización precisa per duana del Sistema de posicionamientu global (GPS) o fontes de llocalización de rede, como torres de telefonía y redes Wi-Fi. Estos servicios de llocalización tienen de tar activaos y disponibles pa que l\'aplicación pueda usalos. Les aplicaciones puen usar esti permisu pa determinar la to llocalización y ye dable que\'l preséu consuma más batería.</string>
-  <string name="permlab_accessCoarseLocation">llocalización aproximada (basada en rede)</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_accessCoarseLocation">accesu a llocalización aproximada
+      (basada en rede)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessCoarseLocation">Permite que l\'aplicación obtenga la to llocalización aproximada. Esta llocalización remanez de los servicios de llocalización qu\'usen fontes de llocalización de rede, como torres de telefonía y redes Wi-Fi. Estos servicios de llocalización tienen de tar activaos y disponibles pa que l\'aplicación pueda usalos. Les aplicaciones puen usar esti permisu pa determinar la to llocalización de mou aproximáu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyAudioSettings">camudar la configuración d\'audiu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyAudioSettings">Permite que l\'aplicación modifique la configuración d\'audiu global (por exemplu, el volume y l\'altavoz de salida).</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_recordAudio">grabar soníu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_recordAudio">Permite que l\'aplicación grabe audiu col micrófonu. L\'aplicación pue usar esti permisu pa grabar audiu en cualquier momentu ensin tener la confirmación del usuariu.</string>
-  <string name="permlab_sim_communication">comunicación cola tarxeta SIM</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_sim_communication">unviar comandos a la SIM</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sim_communication">Permite que l\'aplicación unvie comandos a la tarxeta SIM. Esti permisu YE MUI PELIGROSU.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_camera">facer semeyes y vídeos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_camera">Permite que l\'aplicación faiga semeyes o grabe vídeos cola cámara. Esti permisu autoriza a l\'aplicación a usar la cámara en cualquier momentu ensin la to confirmación.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_vibrate">remanar la vibración</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_vibrate">Permite que l\'aplicación remane la función de vibración.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_flashlight">remanar llinterna</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_flashlight">Permite que l\'aplicación remane la función de llinterna.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_callPhone">llamar direutamente a númberos de teléfonu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_callPhone">Permite que l\'aplicación faiga llamaes ensin intervención del usuariu, lo que pue dar llugar a llamaes o cargos inesperaos. Les aplicaciones nun puen usar este serviciu pa facer llamaes a númberos d\'emerxencia, pero les aplicaciones malintencionaes puen causate gastos imprevistos al facer llamaes ensin la to confirmación.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_accessImsCallService">acceder al serviciu IMS pa facer llamaes</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_accessImsCallService">Permite a l\'app usar el serviciu IMS pa facer llamaes ensin la to intervención.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneState">consultar la identidá y l\'estáu del teléfonu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneState">Permite que l\'aplicación acceda a les funciones de teléfonu del preséu. L\'aplicación pue usar esti permisu pa descubrir identificadores de preseos y númberos de teléfonu, pa saber si una llamada ta activa y pa conocer el númberu remotu col que s\'afitó conexón per aciu d\'una llamada.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="tablet">evitar que la tablet entre en mou de suspensión</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="default">evitar que\'l teléfonu entre en mou de suspensión</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="tablet">Permite que l\'aplicación impida que la tablet entre en mou de suspensión.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="default">Permite que l\'aplicación impida que\'l teléfonu entre en mou de suspensión.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_transmitIr">tresmitir infrabermeyos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="tablet">Permite que l\'aplicación utilice\'l tresmisor d\'infrabermeyos de la tablet.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="default">Permite que l\'aplicación utilice\'l tresmisor d\'infrabermeyos del teléfonu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setWallpaper">afitar fondu de pantalla</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setWallpaper">Permite que l\'aplicación afite\'l fondu de pantalla del sistema.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setWallpaperHints">axustar el tamañu del fondu de pantalla</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setWallpaperHints">Permite que l\'aplicación afite\'l tamañu del fondu de pantalla del sistema.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setTimeZone">afitar estaya horaria</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="tablet">Permite que l\'aplicación camude la estaya horaria de la tablet.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="default">Permite que l\'aplicación camude la estaya horaria del teléfonu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getAccounts">guetar cuentes nel preséu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="tablet">Permite que l\'aplicación obtenga una llista de cuentes reconocíes po la tablet, ente les que puen incluyise les cuentes creaes poles aplicaciones que tengas instalaes.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="default">Permite que l\'aplicación obtenga una llista de cuentes reconocíes pol teléfonu, ente les que puen incluyise les cuentes creaes poles aplicaciones que tengas instalaes.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNetworkState">ver conexones de rede</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNetworkState">Permite que l\'aplicación vea información sobre conexones de rede (por exemplu, qué redes esisten y tán coneutaes).</string>
-  <string name="permlab_createNetworkSockets">accesu completu a rede</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_createNetworkSockets">tener accesu completu a rede</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_createNetworkSockets">Permite que l\'aplicación cree sockets de rede y use protocolos de rede personalizaos. El restolador web y otres aplicaciones proporcionen los medios necesarios pal unviu de datos a Internet, polo que nun fai falta usar esti permisu pa eso.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeNetworkState">cambiar la coneutividá de rede</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeNetworkState">Permite que l\'aplicación modifique l\'estáu de la coneutividá de rede.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeTetherState">cambiar coneutividá d\'anclaxe a rede</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
   <string name="permdesc_changeTetherState">Permite que l\'aplicación cambie l\'estáu de la coneutividá de rede d\'anclaxe.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessWifiState">ver conexones Wi-Fi</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessWifiState">Permite que l\'aplicación vea información sobre conexones a redes Wi-Fi (por exemplu, si ta habilitada la conexón Wi-Fi y el nome de los preseos Wi-Fi coneutaos).</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeWifiState">coneutase a redes Wi-Fi y desconeutase</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiState">Permite que l\'aplicación se coneute a puntos d\'accesu Wi-Fi y se desconeute d\'ellos y que faiga cambeos na configuración de redes Wi-Fi del preséu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeWifiMulticastState">permitir receición multidifusión Wi-Fi</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiMulticastState" product="tablet">Permite que l\'aplicación reciba paquetes unviaos a tolos preseos d\'una rede Wi-Fi qu\'usen direiciones de multidifusión, non sólo a la tablet. Utiliza más batería que\'l mou de non multidifusión.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiMulticastState" product="default">Permite que l\'aplicación reciba paquetes unviaos a tolos preseos d\'una rede Wi-Fi que utilicen direiciones de multidifusión, non sólo al teléfonu. Utiliza más batería que\'l mou de non multidifusión.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bluetoothAdmin">acceder a los axustes de Bluetooth</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="tablet">Permite que l\'aplicación configure la tablet Bluetooth llocal y que deteute preseos remotos y s\'emparexe con ellos.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="default">Permite que l\'aplicación configure\'l teléfonu Bluetooth local y que deteute preseos remotos y s\'emparexe con ellos.</string>
   <string name="permlab_accessWimaxState">coneutase a WiMAX y desconeutase d\'esta red</string>
   <string name="permdesc_accessWimaxState">Permite que l\'aplicación determine si ta habilitada la conexón WiMAX y obtenga información sobre les redes WiMAX que tán coneutaes.</string>
-  <string name="permlab_changeWimaxState">Cambiar estáu de WiMAX</string>
+  <string name="permlab_changeWimaxState">camudar estáu WiMAX</string>
   <string name="permdesc_changeWimaxState" product="tablet">Permite que l\'aplicación coneute la tablet a redes WiMAX y la desconeute d\'elles.</string>
   <string name="permdesc_changeWimaxState" product="default">Permite que l\'aplicación coneute\'l teléfonu a redes WiMAX y lu desconeute d\'elles.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bluetooth">enllazar con preseos Bluetooth</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="tablet">Permite que l\'aplicación acceda a la configuración de Bluetooth de la tablet y qu\'afite y aceute conexones colos preseos sincronizaos.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="default">Permite que l\'aplicación acceda a la configuración de Bluetooth del teléfonu y qu\'afite y aceute conexones colos preseos sincronizaos.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_nfc">remanar Comunicación de campu cercanu (NFC)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_nfc">Permite que l\'aplicación se comunique con llectores, tarxetes y etiquetes de Comunicación de campu cercanu (NFC).</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_disableKeyguard">inhabilitar el bloquéu de pantalla</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_disableKeyguard">Permite que l\'aplicación inhabilite\'l bloquéu del tecláu y cualquier proteición con contraseña asociada. Por exemplu, el teléfonu pue inhabilitar el bloquéu del tecláu cuando se recibe una llamada telefónica y volver a habilitalu cuando fina la llamada.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_manageFingerprint">remanar hardware de buelgues dixitales</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_manageFingerprint">Permite que l\'app emplegue métodos p\'amestar y desaniciar plantíes de buelgues dixitales pal so usu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_useFingerprint">Usar hardware de buelgues dixitales</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_useFingerprint">Permite que l\'app use\'l hardware de buelgues dixitales pa facer l\'autenticación</string>
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <string name="fingerprint_acquired_partial">La buelga dixital deteutóse parcialmente. Vuelvi a intentalo.</string>
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <string name="fingerprint_acquired_insufficient">Nun pudo procesase la buelga dixital. Vuelvi intentalo.</string>
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <string name="fingerprint_acquired_imager_dirty">El sensor de buelgues dixitales ta suciu. Llimpia\'l sensor y vuelvi intentalo.</string>
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <string name="fingerprint_acquired_too_fast">Movisti\'l deu enforma rápido. Vuelvi intentalo.</string>
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <string name="fingerprint_acquired_too_slow">Movisti\'l deu mui lento. Vuelvi intentalo.</string>
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <string name="fingerprint_error_hw_not_available">El hardware pa buelgues dixitales nun ta disponible.</string>
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <string name="fingerprint_error_no_space">Nun pue atroxase la buelga dixital. Desanicia una de les esistentes.</string>
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <string name="fingerprint_error_timeout">Finó\'l tiempu d\'espera pa la buelga dixital. Vuelvi intentalo.</string>
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <string name="fingerprint_error_canceled">Encaboxóse la operación de buelga dixital.</string>
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <string name="fingerprint_error_lockout">Milenta intentos. Volvi tentalo más sero.</string>
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <string name="fingerprint_error_unable_to_process">Vuelvi intentalo.</string>
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <string name="fingerprint_name_template">Deu <xliff:g id="fingerId" example="1">%d</xliff:g></string>
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <string name="fingerprint_icon_content_description">Iconu de buelga</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncSettings">lleer la configuración de sincronización</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSyncSettings">Permite que l\'aplicación consulte la configuración de sincronización d\'una cuenta. L\'aplicación pue usar esti permisu, por exemplu, pa determinar si l\'aplicación Contautos ta sincronizada con una cuenta.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeSyncSettings">activar y desactivar la sincronización</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeSyncSettings">Permite que l\'aplicación modifique la configuración de sincronización d\'una cuenta. Esti permisu pue usase, por exemplu, p\'habilitar la sincronización de l\'aplicación Contautos con una cuenta.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncStats">lleer estadístiques de sincronización</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSyncStats">Permite que l\'aplicación consulte les estadístiques de sincronización d\'una cuenta (por exemplu, l\'historial d\'eventos sincronizaos y la cantidá de datos sincronizaos).</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permlab_sdcardRead" product="nosdcard">consultar el conteníu del almacenamientu USB</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_sdcardRead" product="default">consultar el conteníu de la tarxeta SD</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permdesc_sdcardRead" product="nosdcard">Permite que l\'aplicación llea\'l conteníu del almacenamientu USB.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sdcardRead" product="default">Permite que l\'aplicación llea\'l conteníu de la tarxeta SD.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permlab_sdcardWrite" product="nosdcard">editar o desaniciar conteníu de USB</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_sdcardWrite" product="default">modificar o desaniciar el conteníu de la tarxeta SD</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permdesc_sdcardWrite" product="nosdcard">Permite escribir nel almacenamientu USB.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sdcardWrite" product="default">Permite que l\'aplicación escriba na tarxeta SD.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_use_sip">facer/recibir llamaes SIP</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_use_sip">Permite a la app facer y recibir llamaes SIP.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bind_incall_service">interactuar cola pantalla de llamada</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bind_incall_service">Permite que l\'aplicación remane cómo y cuándo apaez la pantalla de llamada.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bind_connection_service">interactuar colos servicios de telefonía</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bind_connection_service">Permite a la app interactuar colos servicios de telefonía pa facer/recibir llamaes.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_control_incall_experience">ufrir una esperiencia d\'usuariu de llamada</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_control_incall_experience">Permite a la app ufrir una esperiencia d\'usuariu de llamada</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readNetworkUsageHistory">lleer usu de rede históricu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readNetworkUsageHistory">Permite que l\'aplicación consulte l\'usu de rede históricu de redes y d\'aplicaciones específiques.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_manageNetworkPolicy">alministrar política de rede</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_manageNetworkPolicy">Permite que l\'aplicación alministre polítiques de rede y defina regles específiques de l\'aplicación.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyNetworkAccounting">modificar cálculu d\'usu de rede</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyNetworkAccounting">Permite que l\'aplicación modifique cómo se rexistra l\'usu de rede en rellación coles aplicaciones. Les aplicaciones normales nun tendríen d\'usar esti permisu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNotifications">acceder a les notificaciones</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNotifications">Permite que l\'aplicación recupere, desamine y desanicie notificaciones, incluyíes les qu\'espublizaron otres aplicaciones.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindNotificationListenerService">enllazar con un serviciu de deteutor de notificaciones</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindNotificationListenerService">Permite enllazar cola interfaz de nivel superior d\'un serviciu de deteutor de notificaciones. Nun tendría de ser necesario pa les aplicaciones normales.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindConditionProviderService">enllazar con un serviciu de fornidor de condiciones</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindConditionProviderService">Permite enllazar cola interfaz de nivel superior d\'un serviciu de fornidor de condiciones. Nun tendría de ser necesario pa les aplicaciones normales.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindDreamService">enllazar con un serviciu de curiapantalles</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindDreamService">Permite enllazar cola interfaz de nivel superior d\'un serviciu de curiapantalles. Nun tendría de ser necesario pa les aplicaciones normales.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_invokeCarrierSetup">executar l\'aplicación de configuración proporcionada pol operador</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_invokeCarrierSetup">Permite executar l\'aplicación de configuración proporcionada pol operador. Nun tendría de ser necesario p\'aplicaciones normales.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNetworkConditions">deteutar cambeos nel estáu de la rede</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNetworkConditions">Permite qu\'una aplicación deteute cambeos nel estáu de la rede. Nun tendría de ser necesario p\'aplicaciones normales.</string>
   <string name="permlab_setInputCalibration">camudar la calibración del preséu d\'entrada</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setInputCalibration">Permite a la app camudar los parámetros de calibración de la pantalla táctil. Nun tendría de ser necesario pa les aplicaciones normales.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessDrmCertificates">acceder a certificaos DRM</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessDrmCertificates">Permite a la app dar y usar certificaos DRM. Nun tendría de ser necesario pa les aplicaciones normales.</string>
-  <string name="permlab_handoverStatus">Recibir estáu de tresferencies d\'Android Beam</string>
+  <string name="permlab_handoverStatus">recibir estáu de tresferencies d\'Android Beam</string>
   <string name="permdesc_handoverStatus">Permite qu\'esta app reciba información tocante a les tresferencies actuales d\'Android Beam</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_removeDrmCertificates">desaniciar certificaos DRM</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_removeDrmCertificates">Permite a la app desaniciar certificaos DRM. Nun tendría de ser necesario pa les aplicaciones normales.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_bindCarrierServices">enllazar con servicios de fornidores</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_bindCarrierServices">Permite al propietariu enllazar con servicios de fornidores. Les aplicaciones normales nun tendríen de precisar esti permisu.</string>
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <string name="permlab_access_notification_policy">Accesu a la función Nun molestar</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_access_notification_policy">Permite que l\'app llea y modifique la configuración de la función Nun molestar.</string>
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
   <string name="policylab_limitPassword">Establecimientu de regles de contraseña</string>
+  <!-- Description of policy access to limiting the user's password choices -->
+  <string name="policydesc_limitPassword">Permite remanar la llonxitú y los caráuteres permitíos nes contraseñes y los PIN pal bloquéu de pantalla.</string>
+  <!-- Title of policy access to watch user login attempts -->
   <string name="policylab_watchLogin">Control d\'intentos de bloquéu de pantalla</string>
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="tablet">Remana\'l númberu de contraseñes incorreutes introducíes al desbloquiar la pantalla y bloquia la tablet o desanicia tolos datos si s\'inxerten munches contraseñes incorreutes.</string>
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="default">Remana\'l númberu de contraseñes incorreutes introducíes al desbloquiar la pantalla y bloquia\'l teléfonu o desanicia tolos datos si s\'inxerten munches contraseñes incorreutes.</string>
+  <string name="policydesc_watchLogin_secondaryUser" product="tablet">Remana\'l númberu de contraseñes incorreutes
+    introducíes al desbloquiar la pantalla y bloquia la tablet o desanicia tolos datos
+    si s\'inxerten munches contraseñes incorreutes.</string>
+  <string name="policydesc_watchLogin_secondaryUser" product="TV">Remana\'l númberu de contraseñes incorreutes
+    introducíes al desbloquiar la pantalla y bloquia la TV o desanicia tolos datos
+    si s\'inxerten munches contraseñes incorreutes.</string>
+  <string name="policydesc_watchLogin_secondaryUser" product="default">Remana\'l númberu de contraseñes incorreutes
+    introducíes al desbloquiar la pantalla y bloquia\'l tefnu o desanicia tolos datos
+    si s\'inxerten munches contraseñes incorreutes.</string>
+  <!-- Title of policy access to reset user's password -->
+  <string name="policylab_resetPassword">Camudar el bloquéu de pantalla</string>
+  <!-- Description of policy access to reset user's password -->
+  <string name="policydesc_resetPassword">Camudar el bloquéu de pantalla</string>
+  <!-- Title of policy access to force lock the device -->
   <string name="policylab_forceLock">Bloquéu de pantalla</string>
+  <!-- Description of policy access to limiting the user's password choices -->
   <string name="policydesc_forceLock">Remanar cómo y cuándo se bloquia la pantalla</string>
+  <!-- Title of policy access to wipe primary user's data -->
   <string name="policylab_wipeData">Desaniciar tolos datos</string>
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="tablet">Desaniciar los datos de la tablet ensin avisar, reafitando los datos de fábrica</string>
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="default">Desaniciar los datos del teléfonu ensin avisar, reafitando los datos de fábrica</string>
+  <!-- Title of policy access to wipe secondary user's data -->
+  <string name="policylab_wipeData_secondaryUser">Desaniciar los datos del usuariu</string>
+  <!-- Description of policy access to wipe the user's data -->
+  <string name="policydesc_wipeData_secondaryUser" product="tablet">Permite desaniciar los datos del usuariu nesta tablet ensin avisu previu.</string>
+  <!-- Description of policy access to wipe the user's data -->
+  <string name="policydesc_wipeData_secondaryUser" product="tv">Permite desaniciar los datos del usuariu nesta TV ensin avisu previu.</string>
+  <!-- Description of policy access to wipe the user's data -->
+  <string name="policydesc_wipeData_secondaryUser" product="default">Permite desaniciar los datos del usuariu nesti tfnu ensin avisu previu.</string>
+  <!-- Title of policy access to set global proxy -->
   <string name="policylab_setGlobalProxy">Definir el sirvidor proxy global</string>
+  <!-- Description of policy access to set global proxy -->
+  <string name="policydesc_setGlobalProxy">Configura\'l proxy global de preséu que va usase
+    mentanto s\'habilita la política. Namái el propietariu del preséu pue configurar el proxy global.</string>
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <string name="policylab_expirePassword">Config. vencimientu contraseña</string>
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <string name="policydesc_expirePassword">Permite modificar la frecuencia cola que se camuda la contraseña, el PIN o\'l patrón de bloquéu de pantalla.</string>
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
   <string name="policylab_encryptedStorage">Cifráu d\'almacenamientu</string>
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
   <string name="policydesc_encryptedStorage">Desixe que se cifren los datos de l\'aplicación almacenaos.</string>
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
   <string name="policylab_disableCamera">Inhabilitar cámares</string>
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
   <string name="policydesc_disableCamera">Evitar l\'usu de les cámares del preséu</string>
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <string name="policylab_disableKeyguardFeatures">Deshabilitar func. del bloquéu</string>
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <string name="policydesc_disableKeyguardFeatures">Evita l\'usu de dalgunes funciones de bloquéu de pantalla.</string>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>Casa</item>
     <item>Móvil</item>
@@ -409,29 +1053,39 @@
     <item>Otru</item>
     <item>Personalizar</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>Casa</item>
     <item>Trabayu</item>
     <item>Otra</item>
     <item>Personalizar</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>Casa</item>
     <item>Trabayu</item>
     <item>Otra</item>
     <item>Personalizar</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>Casa</item>
     <item>Trabayu</item>
     <item>Otru</item>
     <item>Personalizar</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>Trabayu</item>
     <item>Otra</item>
     <item>Personalizar</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
     <item>Windows Live</item>
@@ -442,403 +1096,957 @@
     <item>ICQ</item>
     <item>Jabber</item>
   </string-array>
+  <!-- Custom phone number type -->
   <string name="phoneTypeCustom">Personalizáu</string>
+  <!-- Home phone number type -->
   <string name="phoneTypeHome">Casa</string>
+  <!-- Mobile phone number type -->
   <string name="phoneTypeMobile">Móvil</string>
+  <!-- Work phone number type -->
   <string name="phoneTypeWork">Trabayu</string>
+  <!-- Work fax phone number type -->
   <string name="phoneTypeFaxWork">Fax del trabayu</string>
+  <!-- Home fax phone number type -->
   <string name="phoneTypeFaxHome">Fax de casa</string>
+  <!-- Pager phone number type -->
   <string name="phoneTypePager">Busca</string>
+  <!-- Other phone number type -->
   <string name="phoneTypeOther">Otru</string>
+  <!-- Callback phone number type -->
   <string name="phoneTypeCallback">Devolución de llamada</string>
+  <!-- Car phone number type -->
   <string name="phoneTypeCar">Coche</string>
+  <!-- Company main phone number type -->
   <string name="phoneTypeCompanyMain">Teléfonu principal de la empresa</string>
+  <!-- ISDN phone number type -->
   <string name="phoneTypeIsdn">RDSI</string>
+  <!-- Main phone number type -->
   <string name="phoneTypeMain">Principal</string>
+  <!-- Other fax phone number type -->
   <string name="phoneTypeOtherFax">Otru fax</string>
+  <!-- Radio phone number type -->
   <string name="phoneTypeRadio">Señal móvil</string>
+  <!-- Telex phone number type -->
   <string name="phoneTypeTelex">Télex</string>
+  <!-- TTY TDD phone number type -->
   <string name="phoneTypeTtyTdd">TTY TDD</string>
+  <!-- Work mobile phone number type -->
   <string name="phoneTypeWorkMobile">Móvil del trabayu</string>
+  <!-- Work pager phone number type -->
   <string name="phoneTypeWorkPager">Busca del trabayu</string>
+  <!-- Assistant phone number type -->
   <string name="phoneTypeAssistant">Asistente</string>
+  <!-- MMS phone number type -->
   <string name="phoneTypeMms">MMS</string>
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
   <string name="eventTypeCustom">Personalizáu</string>
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
   <string name="eventTypeBirthday">Cumpleaños</string>
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
   <string name="eventTypeAnniversary">Aniversariu</string>
+  <!-- Label for other events  [CHAR LIMIT=20] -->
   <string name="eventTypeOther">Otros</string>
+  <!-- Custom email type -->
   <string name="emailTypeCustom">Personalizáu</string>
+  <!-- Home email type -->
   <string name="emailTypeHome">Casa</string>
+  <!-- Work email type -->
   <string name="emailTypeWork">Trabayu</string>
+  <!-- Other email type -->
   <string name="emailTypeOther">Otru</string>
+  <!-- Mobile email type -->
   <string name="emailTypeMobile">Móvil</string>
+  <!-- Custom postal address type -->
   <string name="postalTypeCustom">Personalizada</string>
+  <!-- Home postal address type -->
   <string name="postalTypeHome">Casa</string>
+  <!-- Work postal address type -->
   <string name="postalTypeWork">Trabayu</string>
+  <!-- Other postal address type -->
   <string name="postalTypeOther">Otro</string>
+  <!-- Custom IM address type -->
   <string name="imTypeCustom">Personalizáu</string>
+  <!-- Home IM address type -->
   <string name="imTypeHome">Casa</string>
+  <!-- Work IM address type -->
   <string name="imTypeWork">Trabayu</string>
+  <!-- Other IM address type -->
   <string name="imTypeOther">Otru</string>
+  <!-- Custom IM protocol type -->
   <string name="imProtocolCustom">Personalizada</string>
+  <!-- AIM IM protocol type -->
   <string name="imProtocolAim">AIM</string>
+  <!-- MSN IM protocol type -->
   <string name="imProtocolMsn">Windows Live</string>
+  <!-- Yahoo IM protocol type -->
   <string name="imProtocolYahoo">Yahoo!</string>
+  <!-- Skype IM protocol type -->
   <string name="imProtocolSkype">Skype</string>
+  <!-- QQ IM protocol type -->
   <string name="imProtocolQq">QQ</string>
+  <!-- Google Talk IM protocol type -->
   <string name="imProtocolGoogleTalk">Hangouts</string>
+  <!-- ICQ IM protocol type -->
   <string name="imProtocolIcq">ICQ</string>
+  <!-- Jabber IM protocol type -->
   <string name="imProtocolJabber">Jabber</string>
+  <!-- NetMeeting IM protocol type -->
   <string name="imProtocolNetMeeting">NetMeeting</string>
+  <!-- Work organization type -->
   <string name="orgTypeWork">Trabayu</string>
+  <!-- Other organization type -->
   <string name="orgTypeOther">Otra</string>
+  <!-- Custom organization type -->
   <string name="orgTypeCustom">Personalizada</string>
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
   <string name="relationTypeCustom">Personalizada</string>
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeAssistant">Asistente</string>
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeBrother">Hermanu</string>
+  <!-- Child relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeChild">Fíu/a</string>
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeDomesticPartner">Pareya de fechu</string>
+  <!-- Father relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeFather">Padre</string>
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeFriend">Collaciu/a</string>
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeManager">Xefe</string>
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeMother">Madre</string>
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeParent">Padre/madre</string>
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
   <string name="relationTypePartner">Pareya</string>
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeReferredBy">Recomendáu por</string>
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeRelative">Pariente</string>
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeSister">Hermana</string>
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeSpouse">Cónyugue</string>
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
   <string name="sipAddressTypeCustom">Personalizada</string>
+  <!-- Home SIP address type. Same context as Home phone type. -->
   <string name="sipAddressTypeHome">Casa</string>
+  <!-- Work SIP address type. Same context as Work phone type. -->
   <string name="sipAddressTypeWork">Trabayu</string>
+  <!-- Other SIP address type. Same context as Other phone type. -->
   <string name="sipAddressTypeOther">Otru</string>
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
   <string name="quick_contacts_not_available">Nun s\'atopó nenguna aplicación pa ver esti contautu.</string>
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_code">Introduz el códigu PIN.</string>
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_puk_code">Introduz el códigu PUK y un nuevu códigu PIN.</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">Códigu PUK</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">Nuevu códigu PIN</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">Toca pa introducir contraseña</font></string>
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_password_code">Introduz la contraseña pa desbloquiar.</string>
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_password_code">Inxerta\'l códigu PIN pa desbloquiar.</string>
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
   <string name="keyguard_password_wrong_pin_code">Códigu PIN incorreutu</string>
+  <!-- Instructions telling the user how to unlock the phone. -->
   <string name="keyguard_label_text">Pa desbloquiar el teléfonu, primi la tecla de menú y, a darréu, primi 0.</string>
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
   <string name="emergency_call_dialog_number_for_display">Númberu d\'emerxencia</string>
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">Ensin serviciu</string>
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <string name="lockscreen_screen_locked">Pantalla bloquiada</string>
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
   <string name="lockscreen_instructions_when_pattern_enabled">Primi la tecla de menú pa desbloquiar el teléfonu o facer una llamada d\'emerxencia.</string>
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="lockscreen_instructions_when_pattern_disabled">Primi la tecla de menú pa desbloquiar la pantalla.</string>
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
   <string name="lockscreen_pattern_instructions">Dibuxar patrón de desbloquéu</string>
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <string name="lockscreen_emergency_call">Emerxencia</string>
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
   <string name="lockscreen_return_to_call">Volver a llamada</string>
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
   <string name="lockscreen_pattern_correct">Correutu</string>
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
   <string name="lockscreen_pattern_wrong">Vuelvi a intentalo</string>
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
   <string name="lockscreen_password_wrong">Vuelvi a intentalo</string>
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
   <string name="faceunlock_multiple_failures">Perpasóse\'l númberu máximu d\'intentos de desbloquéu facial.</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message_short">Falta la tarxeta SIM.</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="tablet">Nun s\'inxertó nenguna tarxeta SIM na tablet.</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="default">Nun s\'inxertó nenguna tarxeta SIM nel teléfonu.</string>
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
   <string name="lockscreen_missing_sim_instructions">Inxerta una tarxeta SIM.</string>
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
   <string name="lockscreen_missing_sim_instructions_long">Falta la tarxeta SIM o nun pue lleese. Introduz una tarxeta SIM.</string>
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
   <string name="lockscreen_permanent_disabled_sim_message_short">Tarxeta SIM inutilizable</string>
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
   <string name="lockscreen_permanent_disabled_sim_instructions">La tarxeta SIM inhabilitóse permanentemente.\n Pa obtener otra tarxeta SIM, ponte en contautu col tu fornidor de servicios de telefonía.</string>
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
   <string name="lockscreen_transport_prev_description">Pista anterior</string>
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
   <string name="lockscreen_transport_next_description">Pista siguiente</string>
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
   <string name="lockscreen_transport_pause_description">Posar</string>
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
   <string name="lockscreen_transport_play_description">Reproducir</string>
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
   <string name="lockscreen_transport_stop_description">Detener</string>
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
   <string name="lockscreen_transport_rew_description">Rebobinar</string>
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
   <string name="lockscreen_transport_ffw_description">Avance rápidu</string>
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
   <string name="emergency_calls_only" msgid="2485604591272668370">Namái llamaes d\'emerxencia</string>
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
   <string name="lockscreen_network_locked_message">Bloquiada pa la rede</string>
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
   <string name="lockscreen_sim_puk_locked_message">La tarxeta SIM ta bloquiada col códigu PUK.</string>
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
   <string name="lockscreen_sim_puk_locked_instructions">Ver la Guía d\'usuariu o contautar con atención al veceru.</string>
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
   <string name="lockscreen_sim_locked_message">La tarxeta SIM ta bloquiada.</string>
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
   <string name="lockscreen_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM\u2026</string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
   <string name="lockscreen_too_many_failed_attempts_dialog_message">Fixisti <xliff:g id="number">%d</xliff:g> intentos fallíos de desbloquéu.
 \n\nVuelvi intentalo en <xliff:g id="number">%d</xliff:g> segundos.
     </string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
   <string name="lockscreen_too_many_failed_password_attempts_dialog_message">Introduxisti una contraseña incorreuta <xliff:g id="number">%d</xliff:g> vegaes.\n\nInténtalo otra vuelta en <xliff:g id="number">%d</xliff:g> segundos. 
     </string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
   <string name="lockscreen_too_many_failed_pin_attempts_dialog_message">Introduxisti un códigu PIN incorreutu <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nInténtalo otra vuelta en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="tablet">Fallasti <xliff:g id="number">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres  <xliff:g id="number">%d</xliff:g> vegaes, vas tener d\'usar les tos credenciales d\'accesu de Google pa desbloquiar la tablet.\n\n Inténtalo otra vuelta en <xliff:g id="number">%d</xliff:g> segundos.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="default">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tender d\'usar les tos credenciales d\'accesu de Google pa desbloquiar el teléfonu.\n\n Inténtalo otra vuelta en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet">Intentasti desbloquiar la tablet <xliff:g id="NUMBER_0">%d</xliff:g> vegaes, pero nun pudisti. Si falles <xliff:g id="NUMBER_1">%d</xliff:g> vegaes más, van restablecese los datos de fábrica y van perdese tolos datos del usuariu.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="default">Intentasti desbloquiar el teléfonu <xliff:g id="NUMBER_0">%d</xliff:g> vegaes, pero nun pudisti. Si falles <xliff:g id="NUMBER_1">%d</xliff:g> vegaes más, van restablecese los datos de fábrica y van perdese tolos datos del usuariu.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="tablet">Intentasti desbloquiar la tablet <xliff:g id="NUMBER">%d</xliff:g> vegaes, pero nun pudisti. Van restablecese los datos de fábrica del preséu.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="default">Intentasti desbloquiar el teléfonu <xliff:g id="NUMBER">%d</xliff:g> vegaes, pero nun pudisti. Van restablecese los datos de fábrica del preséu.</string>
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
   <string name="lockscreen_too_many_failed_attempts_countdown">Espera <xliff:g id="NUMBER">%d</xliff:g> segundos y vuelvi a intentalo.</string>
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
   <string name="lockscreen_forgot_pattern_button_text">¿Escaecisti\'l patrón?</string>
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
   <string name="lockscreen_glogin_forgot_pattern">Desbloquéu de cuenta</string>
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
   <string name="lockscreen_glogin_too_many_attempts">Demasiaos intentos incorreutos de creación del patrón</string>
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
   <string name="lockscreen_glogin_instructions">Pa desbloquiar el teléfonu, anicia sesión cola to cuenta de Google.</string>
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_username_hint">Nome d\'usuariu (corréu electrónicu)</string>
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_password_hint">Contraseña</string>
+  <!-- Button to try to unlock the phone using username and password -->
   <string name="lockscreen_glogin_submit_button">Aniciar sesión</string>
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
   <string name="lockscreen_glogin_invalid_input">Nome d\'usuariu o contraseña non válidu</string>
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
   <string name="lockscreen_glogin_account_recovery_hint">Si escaecisti\'l to nome d\'usuariu o contraseña,\nentra na páxina \"<b>google.com/accounts/recovery"</b>.</string>
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
   <string name="lockscreen_glogin_checking_password">Comprobando\u2026</string>
+  <!-- Displayed on lock screen's left tab - unlock -->
   <string name="lockscreen_unlock_label">Desbloquiar</string>
+  <!-- Displayed on lock screen's right tab - turn sound on -->
   <string name="lockscreen_sound_on_label">Activar soníu</string>
+  <!-- Displayed on lock screen's right tab - turn sound off -->
   <string name="lockscreen_sound_off_label">Desactivar soníu</string>
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_start">Patrón aniciáu</string>
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_cleared">Patrón desaniciáu</string>
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
   <string name="lockscreen_access_pattern_cell_added">Amestóse una caxella.</string>
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <string name="lockscreen_access_pattern_cell_added_verbose">
+            Amestóse la caxella <xliff:g id="cell_index" example="3">%1$s</xliff:g></string>
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_detected">Patrón completáu</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="lockscreen_access_pattern_area" msgid="">Área de patrón</string>
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_changed">%1$s. Widget %2$d de %3$d</string>
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_add_widget">Amestar widget</string>
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_empty_slot">Baleru</string>
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_unlock_area_expanded">Área de desbloquéu ampliada</string>
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_unlock_area_collapsed">Área de desbloquéu contrayida</string>
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget">Widget de <xliff:g id="WIDGET_INDEX">%1$s</xliff:g></string>
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_user_selector">Seleutor d\'usuarios</string>
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_status">Estáu</string>
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_camera">Cámara</string>
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
   <string name="keygaurd_accessibility_media_controls">Controles multimedia</string>
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_reorder_start">Empezó a cambiase l\'orde de los widgets.</string>
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_reorder_end">Finó de cambiase l\'orde de los widgets.</string>
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_deleted">Widget <xliff:g id="WIDGET_INDEX">%1$s</xliff:g> desaniciáu</string>
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_expand_lock_area">Ampliar área de desbloquéu</string>
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_unlock">Desbloquéu eslizando\'l deu</string>
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_unlock">Desbloquéu por patrón</string>
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_face_unlock">Desbloquéu facial</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">Desbloquéu por PIN</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">Desbloquéu por contraseña</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area">Área de patrón</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Área pa eslizar</string>
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_alpha_key">ABC</string>
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_alt_key">ALT</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_character">caráuter</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_word">pallabra</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_link">enllaz</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_line">llinia</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
   <string name="hour_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="pm">%P</xliff:g>"</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
   <string name="hour_cap_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="PM">%p</xliff:g>"</string>
+  <!-- Title of the alert when something went wrong in the factory test. -->
   <string name="factorytest_failed">Fallu na prueba de fábrica</string>
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
   <string name="factorytest_not_system">L\'aición FACTORY_TEST namái ye compatible colos paquetes instalaos en /system/app.</string>
+  <!-- Error message displayed when the factory test could not be started. -->
   <string name="factorytest_no_action">Nun s\'atopó nengún paquete que proporcione l\'aición FACTORY_TEST.</string>
+  <!-- Button to restart the device after the factory test. -->
   <string name="factorytest_reboot">Reaniciar</string>
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
   <string name="js_dialog_title">La páxina \"<xliff:g id="TITLE">%s</xliff:g>\" diz:</string>
+  <!-- Default title for a javascript dialog -->
   <string name="js_dialog_title_default">JavaScript</string>
+  <!-- Title for the unload javascript dialog -->
   <string name="js_dialog_before_unload_title">Confirmar navegación</string>
+  <!-- Text for the positive button on the unload javascript dialog -->
   <string name="js_dialog_before_unload_positive_button">Colar d\'esta páxina</string>
+  <!-- Text for the negative button on the unload javascript dialog -->
   <string name="js_dialog_before_unload_negative_button">Permanecer nesta páxina</string>
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
   <string name="js_dialog_before_unload"><xliff:g id="MESSAGE">%s</xliff:g>\n\n¿De xuru que quies colar d\'esta páxina?</string>
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
   <string name="save_password_label">Confirmar</string>
+  <!-- Toast for double-tap -->
   <string name="double_tap_toast">Suxerencia: toca dos vegaes p\'ampliar o amenorgar el conteníu.</string>
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
   <string name="autofill_this_form">Autocompletar</string>
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
   <string name="setup_autofill">Configurar Autocompletar</string>
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
   <string name="autofill_address_name_separator">\u0020</string>
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
   <string name="autofill_address_summary_name_format">$1$2$3</string>
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
   <string name="autofill_address_summary_separator">, </string>
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
   <string name="autofill_address_summary_format">$1$2$3</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_attention_ignored_re">attention|attn</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_region_ignored_re">province|region|other<!-- es -->|provincia<!-- pt-BR, pt-PT -->|bairro|suburb</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_company_re">company|business|organization|organisation|department<!-- de-DE -->|firma|firmenname<!-- es -->|empresa<!-- fr-FR -->|societe|société<!-- it-IT -->|ragione.?sociale<!-- ja-JP -->|会社<!-- ru -->|название.?компании<!-- zh-CN -->|单位|公司</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_1_re">address.?line|address1|addr1|street<!-- de-DE -->|strasse|straße|hausnummer|housenumber<!-- en-GB -->|house.?name<!-- es -->|direccion|dirección<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所1<!-- pt-BR, pt-PT -->|morada|endereço<!-- ru -->|Адрес<!-- zh-CN -->|地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_1_label_re">address<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所<!-- zh-CN -->|地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_2_re">address.?line2|address2|addr2|street|suite|unit<!-- de-DE -->|adresszusatz|ergänzende.?angaben<!-- es -->|direccion2|colonia|adicional<!-- fr-FR -->|addresssuppl|complementnom|appartement<!-- it-IT -->|indirizzo2<!-- ja-JP -->|住所2</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_3_re">address.?line3|address3|addr3|street|line3<!-- es -->|municipio<!-- fr-FR -->|batiment|residence<!-- it-IT -->|indirizzo3</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_country_re">country|location<!-- ja-JP -->|国<!-- zh-CN -->|国家</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_zip_code_re">zip|postal|post code|pcode|^1z$<!-- de-DE -->|postleitzahl<!-- es -->|cp<!-- fr-FR -->|cdp<!-- it-IT -->|cap<!-- ja-JP -->|郵便番号<!-- pt-BR, pt-PT -->|codigo|codpos|cep<!-- ru -->|Почтовый.?Индекс<!--zh-CN -->|邮政编码|邮编<!-- zh-TW -->|郵遞區號</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_zip_4_re">zip|^-$|post2<!-- pt-BR, pt-PT -->|codpos2</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_city_re">city|town<!-- de-DE -->|ort|stadt<!-- en-AU -->|suburb<!-- es -->|ciudad|provincia|localidad|poblacion<!-- fr-FR -->|ville|commune<!-- it-IT -->|localita<!-- ja-JP -->|市区町村<!-- pt-BR, pt-PT -->|cidade<!-- ru -->|Город<!-- zh-CN -->|市<!-- zh-TW -->|分區</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_state_re">state|county|region|province<!-- de-DE -->|land<!-- en-UK -->|county|principality<!-- ja-JP -->|都道府県<!-- pt-BR, pt-PT -->|estado|provincia<!-- ru -->|область<!-- zh-CN -->|省<!-- zh-TW -->|地區</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_type_same_as_re">same as</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_type_use_my_re">use my</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_billing_designator_re">bill</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_shipping_designator_re">ship</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_email_re">e.?mail<!-- ja-JP -->|メールアドレス<!-- ru -->|Электронной.?Почты<!-- zh-CN -->|邮件|邮箱<!-- zh-TW -->|電郵地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_username_re">user.?name|user.?id<!-- de-DE -->|vollständiger.?name<!-- zh-CN -->|用户名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_re">^name|full.?name|your.?name|customer.?name|firstandlastname<!-- es -->|nombre.*y.*apellidos<!-- fr-FR -->|^nom<!-- ja-JP -->|お名前|氏名<!-- pt-BR, pt-PT -->|^nome<!-- zh-CN -->|姓名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_specific_re">^name<!-- fr-FR -->|^nom<!-- pt-BR, pt-PT -->|^nome</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_first_name_re">irst.*name|initials|fname|first$<!-- de-DE -->|vorname<!-- es -->|nombre<!-- fr-FR -->|forename|prénom|prenom<!-- ja-JP -->|名<!-- pt-BR, pt-PT -->|nome<!-- ru -->|Имя</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_middle_initial_re">middle.*initial|m\\.i\\.|mi$</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_middle_name_re">middle.*name|mname|middle$<!-- es -->|apellido.?materno|lastlastname</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_last_name_re">last.*name|lname|surname|last$<!-- de-DE -->|nachname<!-- es -->|apellidos<!-- fr-FR -->|famille|^nom<!-- it-IT -->|cognome<!-- ja-JP -->|姓<!-- pt-BR, pt-PT -->|morada|apelidos|surename|sobrenome<!-- ru -->|Фамилия</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_re">phone<!-- de-DE -->|telefonnummer<!-- es -->|telefono|teléfonu<!-- fr-FR -->|telfixe<!-- ja-JP -->|電話<!-- pt-BR, pt-PT -->|telefone|telemovel<!-- ru -->|телефон<!-- zh-CN -->|电话</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_area_code_re">area.*code|acode|area</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_prefix_re">prefix<!-- fr-FR -->|preselection<!-- pt-BR, pt-PT -->|ddd</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_suffix_re">sufixu</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_extension_re">ext<!-- pt-BR, pt-PT -->|ramal</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_on_card_re">card.?holder|name.?on.?card|ccname|owner<!-- de-DE -->|karteninhaber<!-- es -->|nombre.*tarjeta<!-- fr-FR -->|nom.*carte<!-- it-IT -->|nome.*cart<!-- ja-JP -->|名前<!-- ru -->|Имя.*карты<!-- zh-CN -->|信用卡开户名|开户名|持卡人姓名<!-- zh-TW -->|持卡人姓名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_on_card_contextual_re">nome</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_cvc_re">verification|card identification|cvn|security code|cvv code|cvc</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_number_re">number|card.?#|card.?no|ccnum<!-- de-DE -->|nummer<!-- es -->|credito|numero|número<!-- fr-FR -->|numéro<!-- ja-JP -->|カード番号<!-- ru -->|Номер.*карты<!-- zh-CN -->|信用卡号|信用卡号码<!-- zh-TW -->|信用卡卡號</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_expiration_month_re">expir|exp.*month|exp.*date|ccmonth<!-- de-DE -->|gueltig|gültig|monat<!-- es -->|fecha<!-- fr-FR -->|date.*exp<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|月</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_expiration_date_re">exp|^/|year<!-- de-DE -->|ablaufdatum|gueltig|gültig|yahr<!-- es -->|fecha<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|年|有效期</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_ignored_re">^card</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_fax_re">fax<!-- fr-FR -->|télécopie|telecopie<!-- ja-JP -->|ファックス<!-- ru -->|факс<!-- zh-CN -->|传真<!-- zh-TW -->|傳真</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_country_code_re">country.*code|ccode|_cc</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_area_code_notext_re">^\\($</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_prefix_separator_re">^-$|^\\)$</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_suffix_separator_re">^-$</string>
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_province">Provincia</string>
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_postal_code">Códigu postal</string>
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_state">Estáu</string>
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_zip_code">Códigu postal</string>
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_county">Conceyu</string>
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_island">Islla</string>
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_district">Distritu</string>
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_department">Departamentu</string>
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_prefecture">Prefectura</string>
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_parish">Distritu</string>
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_area">Área</string>
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_emirate">Emiratu</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_readHistoryBookmarks">consultar l\'historial y marcadores web</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_readHistoryBookmarks">Permite que l\'aplicación consulte l\'historial de toles URL visitaes pol restolador web y tolos sos marcadores. Nota: esti permisu nun puen usalu restoladores esternos nin otres aplicaciones que tengan funciones de navegación per Internet.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_writeHistoryBookmarks">escribir nel historial y nos marcadores web</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <string name="permdesc_writeHistoryBookmarks" product="tablet">Permite que l\'app
+        modifique l\'historial o los marcadores del restolador almacenaos na
+        tablet. L\'aplicación pue usar esti permisu pa desaniciar o modificar datos
+        del restolador. Nota: Esti permisu nun pue usase por restoladores
+        esternos nin otres apps que tengan funciones de navegación per Internet.</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <string name="permdesc_writeHistoryBookmarks" product="default">Permite que l\'app
+        modifique l\'historial o los marcadores del restolador almacenaos nel
+        tefnu. L\'aplicación pue usar esti permisu pa desaniciar o modificar datos
+        del restolador. Nota: Esti permisu nun pue usase por restoladores
+        esternos nin otres apps que tengan funciones de navegación per Internet.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
   <string name="permlab_setAlarm">afitar una alarma</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <string name="permdesc_setAlarm">Permite que l\'app afite una alarma
+        nuna app instalada d\'alarmes. Ye dable que dalgunes apps
+        d\'alarma nun incluyan esta función.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
   <string name="permlab_addVoicemail">amestar buzón de voz</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
   <string name="permdesc_addVoicemail">Permite que l\'aplicación amieste mensaxes a la bandexa d\'entrada del buzón de voz.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_writeGeolocationPermissions">modificar los permisos de llocalización xeográfica del restolador web</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_writeGeolocationPermissions">Permite que l\'aplicación modifique los permisos de llocalización xeográfica del restolador web. Les aplicaciones malintencionaes puen usar esti permisu p\'autorizar l\'unviu d\'información sobre la llocalización a sitios web arbitrarios.</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
   <string name="save_password_message">¿Quies que\'l restolador web recuerde esta contraseña?</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
   <string name="save_password_notnow">Agora non</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
   <string name="save_password_remember">Recordar</string>
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
   <string name="save_password_never">Enxamás</string>
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
   <string name="open_permission_deny">Nun tienes permisu p\'abrir esta páxina.</string>
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
   <string name="text_copied">Testu copiáu al cartafueyu.</string>
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
   <string name="more_item_label">Más</string>
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
   <string name="prepend_shortcut_label">MENU+</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
   <string name="menu_space_shortcut_label">espaciu</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <string name="menu_enter_shortcut_label">intro</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">desaniciar</string>
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Guetar</string>
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_search">Guetar</string>
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
   <string name="searchview_description_query">Consulta</string>
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_clear">Desaniciar consulta</string>
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_submit">Unviar consulta</string>
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_voice">Guetar por voz</string>
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
   <string name="enable_explore_by_touch_warning_title">¿Habilitar esploración táctil?</string>
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
   <string name="enable_explore_by_touch_warning_message" product="tablet"><xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> quier habilitar la esploración táctil. Cuando esta función tea activada, vas poder escuchar o ver descripciones del conteníu esbilláu o usar xestos pa interactuar cola tablet.</string>
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
   <string name="enable_explore_by_touch_warning_message" product="default"><xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> quier habilitar la esploración táctil. Cuando esta función tea activada, vas poder escuchar o ver descripciones del conteníu esbilláu o usar xestos pa interactuar col teléfonu.</string>
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
   <string name="oneMonthDurationPast">hai un mes</string>
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
   <string name="beforeOneMonthDurationPast">hai más d\'un mes</string>
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <plurals name="last_num_days">
+    <item quantity="one">Últimu <xliff:g id="count">%d</xliff:g> día</item>
+    <item quantity="other">Últimos <xliff:g id="count">%d</xliff:g> díes</item>
+  </plurals>
+  <!-- This is used to express that something has occurred within the last month -->
   <string name="last_month">el mes pasáu</string>
+  <!-- This is used to express that something happened longer ago than the previous options -->
   <string name="older">anterior</string>
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
   <string name="preposition_for_date">el <xliff:g id="DATE">%s</xliff:g></string>
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
   <string name="preposition_for_time">a les <xliff:g id="TIME">%s</xliff:g></string>
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
   <string name="preposition_for_year">en <xliff:g id="YEAR">%s</xliff:g></string>
+  <!-- Appened to express the value is this unit of time: singular day -->
   <string name="day">día</string>
+  <!-- Appened to express the value is this unit of time: plural days -->
   <string name="days">díes</string>
+  <!-- Appened to express the value is this unit of time: singular hour -->
   <string name="hour">hora</string>
+  <!-- Appened to express the value is this unit of time: plural hours -->
   <string name="hours">hores</string>
+  <!-- Appened to express the value is this unit of time: singular minute -->
   <string name="minute">min</string>
+  <!-- Appened to express the value is this unit of time: plural minutes -->
   <string name="minutes">minutos</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="second">segundu</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="seconds">segundos</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="week">selmana</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="weeks">selmanes</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="year">añu</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="years">años</string>
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <plurals name="duration_seconds">
+    <item quantity="one">1 segundu</item>
+    <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> segundos</item>
+  </plurals>
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <plurals name="duration_minutes">
+    <item quantity="one">1 minutu</item>
+    <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> minutos</item>
+  </plurals>
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <plurals name="duration_hours">
+    <item quantity="one">1 hora</item>
+    <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> hores</item>
+  </plurals>
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
   <string name="VideoView_error_title">Incidencies col videu</string>
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
   <string name="VideoView_error_text_invalid_progressive_playback">Esti videu nun pue tresmitise al preséu.</string>
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
   <string name="VideoView_error_text_unknown">Nun pue reproducise\'l videu.</string>
+  <!-- Button to close error alert when a video cannot be played -->
   <string name="VideoView_error_button">Aceutar</string>
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
   <string name="relative_time">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string>
+  <!-- Quoted name for 12pm, lowercase -->
   <string name="noon">"meudía"</string>
+  <!-- Quoted name for 12pm, uppercase first letter -->
   <string name="Noon">"Meudía"</string>
+  <!-- Quoted name for 12am, lowercase -->
   <string name="midnight">"medianueche"</string>
+  <!-- Quoted name for 12am, uppercase first letter -->
   <string name="Midnight">"Medianueche"</string>
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
   <string name="elapsed_time_short_format_mm_ss"><xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g></string>
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
   <string name="elapsed_time_short_format_h_mm_ss"><xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g></string>
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
   <string name="selectAll">Esbillar too</string>
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
   <string name="cut">Cortar</string>
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
   <string name="copy">Copiar</string>
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
   <string name="paste">Apegar</string>
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
   <string name="replace">Sustituyir\u2026</string>
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
   <string name="delete">Desaniciar</string>
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
   <string name="copyUrl">Copiar URL</string>
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
   <string name="selectTextMode">Esbillar testu</string>
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
   <string name="textSelectionCABTitle">Seleición de testu</string>
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
   <string name="addToDictionary">Amestar al diccionariu</string>
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
   <string name="deleteText">Desaniciar</string>
+  <!-- EditText context menu -->
   <string name="inputMethod">Métodu d\'introducción de testu</string>
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
   <string name="editTextMenuTitle">Aiciones de testu</string>
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
   <string name="low_internal_storage_view_title">Queda poco espaciu</string>
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
   <string name="low_internal_storage_view_text">Ye dable que dalgunes funciones del sistema nun funcionen.</string>
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
   <string name="low_internal_storage_view_text_no_boot">Nun hai espaciu bastante pal sistema. Comprueba qu\'heba 250 MB llibres y reanicia\'l preséu.</string>
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
   <string name="app_running_notification_title"><xliff:g id="APP_NAME">%1$s</xliff:g> ta executándose</string>
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
   <string name="app_running_notification_text">Toca pa obtener más información o pa detener l\'aplicación.</string>
+  <!-- Preference framework strings. -->
   <string name="ok">Aceutar</string>
+  <!-- Preference framework strings. -->
   <string name="cancel">Encaboxar</string>
+  <!-- Preference framework strings. -->
   <string name="yes">Aceutar</string>
+  <!-- Preference framework strings. -->
   <string name="no">Encaboxar</string>
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
   <string name="dialog_alert_title">Atención</string>
+  <!-- Text shown by list fragment when waiting for data to display. -->
   <string name="loading">Cargando\u2026</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_on">SÍ</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_off">NON</string>
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
   <string name="whichApplication">Completar aición usando</string>
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
   <string name="whichApplicationNamed">Completar aición usando %1$s</string>
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
   <string name="whichViewApplication">Abrir con</string>
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
   <string name="whichViewApplicationNamed">Abrir con %1$s</string>
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
   <string name="whichEditApplication">Editar con</string>
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
   <string name="whichEditApplicationNamed">Editar con %1$s</string>
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
   <string name="whichSendApplication">Compartir con</string>
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
   <string name="whichSendApplicationNamed">Compartir con %1$s</string>
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
   <string name="whichHomeApplication">Esbillar una aplicación na pantalla d\'aniciu</string>
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
   <string name="whichHomeApplicationNamed">Usar %1$s como aplicación d\'aniciu</string>
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
   <string name="alwaysUse">Usar siempre pa esta aición</string>
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
   <string name="use_a_different_app">Usar una app distinta</string>
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
   <string name="clearDefaultHintMsg">Pa desaniciar los valores predeterminaos, vete a Axustes del sistema &gt; Aplicaciones &gt; Descargaes.</string>
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
   <string name="chooseActivity">Esbilla una aición</string>
+  <!-- title for the USB activity chooser. -->
   <string name="chooseUsbActivity">Seleicionar una aplicación pal preséu USB</string>
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
   <string name="noApplications">Nenguna aplicación pue facer esta aición.</string>
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">Detúvose l\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g>.</string>
+  <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">Detúvose\'l procesu <xliff:g id="PROCESS">%1$s</xliff:g>.</string>
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application">L\'aplicación <xliff:g id="APPLICATION">%2$s</xliff:g> nun respuende.\n\n¿Quies zarrala?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_process">L\'actividá <xliff:g id="ACTIVITY">%1$s</xliff:g> nun respuende.\n\n¿Quies zarrala?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_application_process">L\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> nun respuende. ¿Quies zarrala?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_process">El procesu <xliff:g id="PROCESS">%1$s</xliff:g> nun respuende.\n\n¿Quies zarralu?</string>
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
   <string name="force_close">Aceutar</string>
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
   <string name="report">Informar</string>
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
   <string name="wait">Esperar</string>
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
   <string name="webpage_unresponsive">La páxina nun respuende.\n\n¿Quies zarrala?</string>
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_title">Aplicación redireicionada</string>
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_replace"><xliff:g id="APP_NAME">%1$s</xliff:g> ta executándose.</string>
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_original">Primeramente, anicióse l\'aplicación <xliff:g id="APP_NAME">%1$s</xliff:g>.</string>
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
   <string name="screen_compat_mode_scale">Escala</string>
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
   <string name="screen_compat_mode_show">Amosar siempre</string>
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
   <string name="screen_compat_mode_hint">Pa volver a habilitar esta opción, vete a Axustes &gt; Aplicaciones &gt; Descargaes.</string>
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
   <string name="smv_application">L\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> (procesu <xliff:g id="PROCESS">%2$s</xliff:g>) infrinxó la política StrictMode autoaplicable.</string>
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
   <string name="smv_process">El procesu <xliff:g id="PROCESS">%1$s</xliff:g> infrinxó la política StrictMode autoaplicable.</string>
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
   <string name="android_upgrading_title">Anovando Android</string>
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
   <string name="android_upgrading_fstrim">Optimizando almacenamientu.</string>
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
   <string name="android_upgrading_apk">Optimizando aplicación <xliff:g id="NUMBER_0">%1$d</xliff:g> de <xliff:g id="NUMBER_1">%2$d</xliff:g>\u2026</string>
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <string name="android_preparing_apk">Preparando <xliff:g id="appname">%1$s</xliff:g>.</string>
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
   <string name="android_upgrading_starting_apps">Aniciando aplicaciones</string>
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
   <string name="android_upgrading_complete">Finando arranque\u2026</string>
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
   <string name="heavy_weight_notification"><xliff:g id="APP">%1$s</xliff:g> n\'execución</string>
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
   <string name="heavy_weight_notification_detail">Toca esta opción pa cambiar a l\'aplicación.</string>
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
   <string name="heavy_weight_switcher_title">¿Cambiar aplicaciones?</string>
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
   <string name="heavy_weight_switcher_text">Ta executándose otra aplicación. P\'aniciar una aplicación nueva, has detenela.</string>
   <string name="old_app_action">Volver a <xliff:g id="OLD_APP">%1$s</xliff:g></string>
   <string name="old_app_description">Nun aniciar la nueva aplicación</string>
   <string name="new_app_action">Aniciar <xliff:g id="OLD_APP">%1$s</xliff:g></string>
   <string name="new_app_description">Detener l\'aplicación anterior ensin guardar</string>
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <string name="dump_heap_notification"><xliff:g id="proc">%1$s</xliff:g> perpasó la llende de
+        memoria</string>
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <string name="dump_heap_notification_detail">Recopilóse\'l volcáu de pila;
+        toca pa compartir</string>
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <string name="dump_heap_title">¿Compartir volcáu de pila?</string>
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <string name="dump_heap_text">El procesu <xliff:g id="proc">%1$s</xliff:g> perpasó la llende
+        de memoria de procesu de <xliff:g id="size">%2$s</xliff:g>. Hai un volcáu de pila disponible
+        pa que puedas compartilu col programador. Curiáu, esti volcáu de pila
+        pue contener información personal a la que pue acceder l\'app.</string>
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
   <string name="sendText">Seleiciona una aición pal testu</string>
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
   <string name="volume_ringtone">Volume del timbre</string>
+  <!-- Title of the dialog where the user is adjusting the music volume -->
   <string name="volume_music">Volume multimedia</string>
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
   <string name="volume_music_hint_playing_through_bluetooth">Reproduciendo a traviés de Bluetooth</string>
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
   <string name="volume_music_hint_silent_ringtone_selected">Tonu de silenciu afitáu</string>
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
   <string name="volume_call">Volume de la llamada</string>
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
   <string name="volume_bluetooth_call">Volume de la llamada de Bluetooth</string>
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
   <string name="volume_alarm">Volume d\'alarma</string>
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
   <string name="volume_notification">Volume de notificaciones</string>
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
   <string name="volume_unknown">Volume</string>
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_bluetooth">Volume de Bluetooth</string>
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_ringer">Volume del tonu</string>
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_incall">Volume de llamada</string>
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_media">Volume multimedia</string>
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">Volume de notificaciones</string>
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">Tonu predetermináu</string>
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <string name="ringtone_default_with_actual">Tonu predetermináu (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)</string>
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
   <string name="ringtone_silent">Nengún</string>
+  <!-- The title of the ringtone picker dialog. -->
   <string name="ringtone_picker_title">Tonos</string>
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
   <string name="ringtone_unknown">Tonu desconocíu</string>
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <plurals name="wifi_available">
+    <item quantity="one">Rede Wi-Fi disponible</item>
+    <item quantity="other">Redes Wi-Fi disponibles</item>
+  </plurals>
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <plurals name="wifi_available_detailed">
+    <item quantity="one">Rede Wi-Fi abierta disponible</item>
+    <item quantity="other">Redes Wi-Fi abiertes disponibles</item>
+  </plurals>
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <string name="wifi_available_sign_in">Coneutase a una rede Wi-Fi.</string>
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <string name="network_available_sign_in">Acceder a la rede</string>
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
   <string name="network_available_sign_in_detailed"><xliff:g id="network_ssid">%1$s</xliff:g></string>
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <string name="wifi_no_internet">La rede Wi-Fi nun tiene accesu a Internet</string>
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <string name="wifi_no_internet_detailed">Toca pa opciones</string>
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
   <string name="wifi_watchdog_network_disabled">Nun pudo afitase conexón cola rede Wi-Fi.</string>
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
   <string name="wifi_watchdog_network_disabled_detailed"> tien una conexón inestable a Internet.</string>
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <string name="wifi_connect_alert_title">¿Permitir conexón?</string>
+  <!-- message explaining who is connecting to what -->
+  <string name="wifi_connect_alert_message">L\'app %1$s quier coneutase a la rede Wi-Fi %2$s</string>
+  <!-- default application in case name can not be found -->
+  <string name="wifi_connect_default_application">Una aplicación</string>
   <string name="wifi_p2p_dialog_title">Wi-Fi Direutu</string>
   <string name="wifi_p2p_turnon_message">Aniciar Wi-Fi Direct. Va desactivase\'l funcionamientu de la zona o del cliente Wi-Fi.</string>
   <string name="wifi_p2p_failed_message">Nun pudo aniciase Wi-Fi Direct.</string>
@@ -854,83 +2062,262 @@
   <string name="wifi_p2p_show_pin_message">PIN:</string>
   <string name="wifi_p2p_frequency_conflict_message" product="tablet">La tablet va desconeutase temporalmente de la rede Wi-Fi mientres teas coneutáu a  <xliff:g id="DEVICE_NAME">%1$s</xliff:g></string>
   <string name="wifi_p2p_frequency_conflict_message" product="default">El teléfonu va desconeutase temporalmente de la rede Wi-Fi mientres teas coneutáu a <xliff:g id="DEVICE_NAME">%1$s</xliff:g>.</string>
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">Inxertar carácter</string>
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">Unviando mensaxes SMS\u2026</string>
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_control_message">&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ta unviando un gran númberu de mensaxes SMS. ¿Quies permitir que l\'aplicación siga unviando mensaxes?</string>
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_yes">Permitir</string>
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Refugar</string>
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; quier unviar un mensaxe a &lt;b&gt;<xliff:g id="DEST_ADDRESS">%2$s</xliff:g>&lt;/b&gt;.</string>
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_details">Esto <b>pue ocasionar cargos</b> na to cuenta móvil.</string>
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
   <string name="sms_premium_short_code_details"><b>Esto va ocasionar cargos na to cuenta móvil.</b></string>
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_allow">Unviar</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_deny">Encaboxar</string>
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="sms_short_code_remember_choice">Recordar opción esbillada</string>
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
   <string name="sms_short_code_remember_undo_instruction">Pues cambiar esta opción más tarde en Axustes &gt; Aplicaciones.</string>
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_always_allow">Permitir siempre</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">Nun permitir enxamás</string>
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">Tarxeta SIM desaniciada</string>
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <string name="sim_removed_message">La rede móvil nun va tar disponible hasta que reanicies el preséu con una tarxeta SIM válida.</string>
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
   <string name="sim_done_button">Fecho</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_added_title">Tarxeta SIM amestada</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
   <string name="sim_added_message">Reanicia\'l preséu p\'acceder a la rede móvil.</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
   <string name="sim_restart_button">Reaniciar</string>
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
   <string name="time_picker_dialog_title">Afitar hora</string>
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
   <string name="date_picker_dialog_title">Afitar data</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_set">Afitar</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_done">Fecho</string>
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
   <string name="perms_new_perm_prefix"><font size="12" fgcolor="#ff33b5e5">NUEVU:</font></string>
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
   <string name="perms_description_app">Proporcionáu por <xliff:g id="APP_NAME">%1$s</xliff:g></string>
+  <!-- Shown for an application when it doesn't require any permission grants. -->
   <string name="no_permissions">Nun fai falta nengún permisu</string>
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
   <string name="perm_costs_money">ye dable que se cobre por usar l\'aplicación.</string>
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
   <string name="usb_storage_activity_title">Almacenamientu USB masivu</string>
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
   <string name="usb_storage_title">Conexón per USB</string>
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_message" product="nosdcard">Coneutóse\'l preséu al ordenador per USB. Toca\'l siguiente botón si quies tresferir ficheros ente l\'ordenador y l\'almacenamientu USB del preséu.</string>
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_message" product="default">Coneutóse\'l preséu al ordenador per USB. Toca\'l siguiente botón si quies tresferir ficheros ente l\'ordenador y la tarxeta SD del preséu.</string>
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
   <string name="usb_storage_button_mount">Activar almacenamientu USB</string>
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_error_message" product="nosdcard">Hebo un fallu al usar l\'almacenamientu USB como almacenamientu USB masivu.</string>
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
   <string name="usb_storage_error_message" product="default">Hebo un fallu al usar la tarxeta SD pal almacenamientu USB masivu.</string>
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
   <string name="usb_storage_notification_title">Conexón per USB</string>
+  <!-- See USB_STORAGE. This is the message. -->
   <string name="usb_storage_notification_message">Toca pa tresferir ficheros</string>
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
   <string name="usb_storage_stop_notification_title">Desactivar almacenamientu USB</string>
+  <!-- See USB_STORAGE. This is the message. -->
   <string name="usb_storage_stop_notification_message">Toca pa desactivar l\'almacenamientu USB.</string>
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
   <string name="usb_storage_stop_title">L\'almacenamientu USB ta n\'usu</string>
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_stop_message" product="nosdcard">Enantes de desactivar l\'almacenamientu USB, desactiva l\'almacenamientu USB del preséu Android del ordenador.</string>
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
   <string name="usb_storage_stop_message" product="default">Enantes de desactivar l\'almacenamientu USB, desactiva la tarxeta SD del preséu Android del ordenador.</string>
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
   <string name="usb_storage_stop_button_mount">Desactivar almacenamientu USB</string>
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
   <string name="usb_storage_stop_error_message">Hebo un fallu al desactivar l\'almacenamientu USB. Comprueba que desactivasti\'l host USB, y darréu, vuelvi a intentalo.</string>
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
   <string name="dlg_confirm_kill_storage_users_title">Activar almacenamientu USB</string>
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
   <string name="dlg_confirm_kill_storage_users_text">Si actives l\'almacenamientu USB, van parase dalgunes aplicaciones que tas usando y ye dable que nun tean disponibles hasta que lu desactives.</string>
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
   <string name="dlg_error_title">Fallu de funcionamientu de USB</string>
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
   <string name="dlg_ok">Aceutar</string>
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <string name="usb_charging_notification_title">USB pa cargar</string>
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <string name="usb_mtp_notification_title">USB pa tresferir ficheros</string>
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <string name="usb_ptp_notification_title">USB pa tresferir semeyes</string>
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <string name="usb_midi_notification_title">USB pa MIDI</string>
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
   <string name="usb_accessory_notification_title">Coneutáu a un accesoriu USB</string>
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <string name="usb_notification_message">Toca pa más opciones.</string>
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
   <string name="adb_active_notification_title">Depuración USB coneutada</string>
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
   <string name="adb_active_notification_message">Toca pa desactivar la depuración USB.</string>
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
   <string name="select_input_method">Cambiar tecláu</string>
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
   <string name="configure_input_methods">Esbillar teclaos</string>
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
   <string name="show_ime">Amosar métodu d\'entrada</string>
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
   <string name="hardware">Hardware</string>
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <string name="select_keyboard_layout_notification_title">Seleiciona un diseñu de tecláu</string>
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <string name="select_keyboard_layout_notification_message">Toca pa seleicionar un diseñu de tecláu.</string>
   <string name="fast_scroll_alphabet"> ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="fast_scroll_numeric_alphabet"> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>candidatos</u></string>
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <string name="ext_media_checking_notification_title">Tresnando\'l mediu <xliff:g id="name" example="SD card">%s</xliff:g></string>
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <string name="ext_media_checking_notification_message">Verificando fallos</string>
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <string name="ext_media_new_notification_message">Deteutóse <xliff:g id="name" example="SD card">%s</xliff:g> nuevu</string>
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <string name="ext_media_ready_notification_message">Pa tresferir semeyes y conteníu multimedia</string>
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <string name="ext_media_unmountable_notification_title"><xliff:g id="name" example="SD card">%s</xliff:g> ta dañáu</string>
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <string name="ext_media_unmountable_notification_message"><xliff:g id="name" example="SD card">%s</xliff:g> ta dañáu. Toca pa iguar.</string>
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <string name="ext_media_unsupported_notification_title"><xliff:g id="name" example="SD card">%s</xliff:g> non compatible</string>
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <string name="ext_media_unsupported_notification_message">El preséu nun ye compatible con <xliff:g id="name" example="SD card">%s</xliff:g>. Toca la pantalla pa configuralu nun formatu compatible.</string>
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <string name="ext_media_badremoval_notification_title">Desmontóse <xliff:g id="name" example="SD card">%s</xliff:g> de mou inesperáu.</string>
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <string name="ext_media_badremoval_notification_message">Pa evitar perda de datos, desactiva\'l preséu <xliff:g id="name" example="SD card">%s</xliff:g> enantes d\'estrayelu</string>
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <string name="ext_media_nomedia_notification_title">Estráxose <xliff:g id="name" example="SD card">%s</xliff:g></string>
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <string name="ext_media_nomedia_notification_message"><xliff:g id="name" example="SD card">%s</xliff:g> estrayíu; inxerta ún nuevu</string>
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <string name="ext_media_unmounting_notification_title">Espulsando\'l mediu <xliff:g id="name" example="SD card">%s</xliff:g>\u2026</string>
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <string name="ext_media_unmounting_notification_message">Nun estrayer</string>
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <string name="ext_media_init_action">Configurar</string>
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <string name="ext_media_unmount_action">Espulsar</string>
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <string name="ext_media_browse_action">Esplorar</string>
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <string name="ext_media_missing_title">Nun s\'atopa <xliff:g id="name" example="SD card">%s</xliff:g></string>
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <string name="ext_media_missing_message">Volver a inxertar preséu</string>
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <string name="ext_media_move_specific_title">Moviendo <xliff:g id="name" example="Calculator">%s</xliff:g></string>
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <string name="ext_media_move_title">Moviendo datos</string>
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <string name="ext_media_move_success_title">Tresferencia completa</string>
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <string name="ext_media_move_success_message">Tresfiriéronse los datos a <xliff:g id="name" example="SD card">%s</xliff:g></string>
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <string name="ext_media_move_failure_title">Nun pudieron tresferise datos</string>
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <string name="ext_media_move_failure_message">Los datos quedaron na llocalización orixinal</string>
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <string name="ext_media_status_removed">Estrayíu</string>
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <string name="ext_media_status_unmounted">Espulsáu</string>
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
   <string name="ext_media_status_checking">Comprobando\u2026</string>
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <string name="ext_media_status_mounted">Llistu</string>
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <string name="ext_media_status_mounted_ro">Namái-llectura</string>
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <string name="ext_media_status_bad_removal">Nun s\'estraxo de mou seguru</string>
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <string name="ext_media_status_unmountable">Toyíu</string>
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <string name="ext_media_status_unsupported">Non compatible</string>
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <string name="ext_media_status_ejecting">Espulsando\u2026</string>
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <string name="ext_media_status_formatting">Formatiando\u2026</string>
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <string name="ext_media_status_missing">Non inxertáu</string>
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
   <string name="activity_list_empty">Nun s\'atopó nenguna actividá coincidente.</string>
-  <string name="permlab_route_media_output">Dirixir salida de mediu</string>
+  <!-- Title of an application permission that lets an application route media output. -->
+  <string name="permlab_route_media_output">route media output</string>
+  <!-- Description of an application permission that lets an application route media output. -->
   <string name="permdesc_route_media_output">Permite que l\'aplicación dirixa salides de medios a otros preseos esternos.</string>
-  <string name="permlab_readInstallSessions">Consultar sesiones d\'instalación</string>
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <string name="permlab_readInstallSessions">lleer sesiones instalaes</string>
+  <!-- Description of an application permission that lets it read install sessions. -->
   <string name="permdesc_readInstallSessions">Permite qu\'una aplicación consulte sesiones d\'instalación pa ver detalles tocante a instalaciones de paquetes activos.</string>
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <string name="permlab_requestInstallPackages">solicitar paquetes instalaos</string>
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <string name="permdesc_requestInstallPackages">Permite qu\'una app solicite la instalación de paquetes.</string>
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
   <string name="tutorial_double_tap_to_zoom_message_short">Toca dos vegaes p\'acceder al control de zoom.</string>
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
   <string name="gadget_host_error_inflating">Nun pudo amestase\'l widget.</string>
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
   <string name="ime_action_go">Dir</string>
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
   <string name="ime_action_search">Guetar</string>
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
   <string name="ime_action_send">Unviar</string>
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
   <string name="ime_action_next">Siguiente</string>
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
   <string name="ime_action_done">Fecho</string>
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
   <string name="ime_action_previous">Anterior</string>
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <string name="ime_action_default">Executar</string>
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">Marcar númberu\ncon <xliff:g id="NUMBER">%s</xliff:g></string>
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <string name="create_contact_using">Crear un contautu\na partir de <xliff:g id="NUMBER">%s</xliff:g></string>
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
   <string name="grant_credentials_permission_message_header">Les siguientes aplicaciones soliciten permisu p\'acceder a la to cuenta agora y nel futuru.</string>
   <string name="grant_credentials_permission_message_footer">¿Quies permitir esta solicitú?</string>
   <string name="grant_permissions_header_text">Solicitú d\'accesu</string>
@@ -938,324 +2325,820 @@
   <string name="deny">Refugar</string>
   <string name="permission_request_notification_title">Permisu solicitáu</string>
   <string name="permission_request_notification_with_subtitle">Permisu solicitáu\npa la cuenta <xliff:g id="ACCOUNT">%s</xliff:g></string>
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
   <string name="forward_intent_to_owner">Tas usando esta app fuera del perfil de trabayu</string>
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
   <string name="forward_intent_to_work">Tas usando esta app nel to perfil de trabayu</string>
+  <!-- Label to show for a service that is running because it is an input method. -->
   <string name="input_method_binding_label">Métodu d\'introducción de testu</string>
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
   <string name="sync_binding_label">Sincronización</string>
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
   <string name="accessibility_binding_label">Accesibilidá</string>
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
   <string name="wallpaper_binding_label">Fondu de pantalla</string>
+  <!-- Dialog title for user to select a different wallpaper from service list -->
   <string name="chooser_wallpaper">Camudar fondu de pantalla</string>
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
   <string name="notification_listener_binding_label">Deteutor de notificaciones</string>
+  <!-- Label to show for a service that is running because it is providing conditions. -->
   <string name="condition_provider_service_binding_label">Fornidor de condiciones</string>
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
   <string name="vpn_title">VPN activada</string>
+  <!-- The title of the notification when VPN is active with an application name. -->
   <string name="vpn_title_long">VPN activada por <xliff:g id="APP">%s</xliff:g></string>
+  <!-- The text of the notification when VPN is active. -->
   <string name="vpn_text">Toca p\'alministrar la rede.</string>
+  <!-- The text of the notification when VPN is active with a session name. -->
   <string name="vpn_text_long">Coneutáu a <xliff:g id="SESSION">%s</xliff:g>. Toca p\'alministrar la rede.</string>
+  <!-- Notification title when connecting to lockdown VPN. -->
   <string name="vpn_lockdown_connecting">Coneutando VPN siempre activada…</string>
+  <!-- Notification title when connected to lockdown VPN. -->
   <string name="vpn_lockdown_connected">VPN siempre activada coneutada</string>
+  <!-- Notification title when error connecting to lockdown VPN. -->
   <string name="vpn_lockdown_error">Fallu de VPN siempre activada</string>
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
   <string name="vpn_lockdown_config">Toca pa configurar</string>
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
   <string name="upload_file">Esbillar ficheru</string>
+  <!-- Label for the file upload control when no file has been chosen yet -->
   <string name="no_file_chosen">Ficheru non esbilláu</string>
+  <!-- Label for <input type="reset"> button in html -->
   <string name="reset">Restablecer</string>
+  <!-- Label for <input type="submit"> button in html -->
   <string name="submit">Unviar</string>
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
   <string name="car_mode_disable_notification_title">Habilitóse\'l mou coche.</string>
   <string name="car_mode_disable_notification_message">Toca pa salir del mou coche.</string>
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
   <string name="tethered_notification_title">Anclaxe a rede/Zona Wi-Fi activu</string>
   <string name="tethered_notification_message">Toca pa configurar</string>
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
   <string name="back_button_label">Atrás</string>
   <string name="next_button_label">Siguiente</string>
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
   <string name="skip_button_label">Saltar</string>
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
   <string name="no_matches">Nun hai coincidencies.</string>
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
   <string name="find_on_page">Guetar na páxina</string>
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <plurals name="matches_found">
+    <!-- Case of one match -->
+    <item quantity="one">Una coincidencia</item>
+    <!-- Case of multiple total matches -->
+    <item quantity="other"><xliff:g id="INDEX">%d</xliff:g> de <xliff:g id="TOTAL">%d</xliff:g></item>
+  </plurals>
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
   <string name="action_mode_done">Listo</string>
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
   <string name="progress_erasing" product="nosdcard">Desaniciando almacenamientu USB\u2026</string>
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
   <string name="progress_erasing" product="default">Desaniciando tarxeta SD\u2026</string>
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
   <string name="share">Compartir</string>
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
   <string name="find">Guetar</string>
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
   <string name="websearch">Guetar na web</string>
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
   <string name="find_next">Atopar siguiente</string>
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
   <string name="find_previous">Atopar anterior</string>
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
   <string name="gpsNotifTicker">Solicitú de llocalización de <xliff:g id="NAME">%s</xliff:g></string>
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
   <string name="gpsNotifTitle">Solicitú de llocalización</string>
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
   <string name="gpsNotifMessage">Solicitú unviada por <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)</string>
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
   <string name="gpsVerifYes">Sí</string>
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
   <string name="gpsVerifNo">Non</string>
+  <!-- Error message when the sync tried to delete too many things -->
   <string name="sync_too_many_deletes">Perpasóse la llende de desanicios.</string>
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
   <string name="sync_too_many_deletes_desc">Hai <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> elementos desaniciaos pa <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g> (cuenta <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>). ¿Qué quies facer?</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
   <string name="sync_really_delete">Desaniciar elementos</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
   <string name="sync_undo_deletes">Desfacer los desanicios</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
   <string name="sync_do_nothing">Nun facer un res agora</string>
+  <!-- Choose Account Activity label -->
   <string name="choose_account_label">Esbilla una cuenta</string>
   <string name="add_account_label">"Amestar una cuenta"</string>
+  <!-- List item to add an account [CHAR LIMIT=20] -->
   <string name="add_account_button_label">Amestar cuenta</string>
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_button">Aumentar</string>
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
   <string name="number_picker_decrement_button">Amenorgar</string>
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_scroll_mode">Caltén primíu <xliff:g id="VALUE">%s</xliff:g>.</string>
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_scroll_action">Esliza\'l deu hacia arriba p\'aumentar y hacia abaxo p\'amenorgar.</string>
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_minute_button">Aumentar minutos</string>
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_minute_button">Amenorgar minutos</string>
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_hour_button">Aumentar hores</string>
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_hour_button">Amenorgar hores</string>
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_set_pm_button">Afitar p.m.</string>
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_set_am_button">Afitar a.m.</string>
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_month_button">Aumentar mes</string>
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_month_button">Amenorgar mes</string>
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_day_button">Aumentar díes</string>
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_day_button">Amenorgar díes</string>
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_year_button">Aumentar añu</string>
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_year_button">Amenorgar año</string>
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <string name="date_picker_prev_month_button">Mes anterior</string>
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <string name="date_picker_next_month_button">Mes siguiente</string>
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_alt">Alt</string>
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_cancel">Encaboxar</string>
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Desaniciar</string>
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_done">Fecho</string>
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_mode_change">Cambéu de mou</string>
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_shift">Mayús</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_enter">Intro</string>
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
   <string name="activitychooserview_choose_application">Esbillar una aplicación</string>
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
   <string name="activitychooserview_choose_application_error">Nun pudo abrise <xliff:g id="APPLICATION_NAME">%s</xliff:g></string>
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
   <string name="shareactionprovider_share_with">Compartir con</string>
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
   <string name="shareactionprovider_share_with_application">Compartir con <xliff:g id="APPLICATION_NAME">%s</xliff:g></string>
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="content_description_sliding_handle">"Caltén primíu l'iconu de desbloquéu y eslízalu."</string>
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
   <string name="description_target_unlock_tablet">Esliza\'l deu pa desbloquiar.</string>
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
   <string name="keyboard_headset_required_to_hear_password">Coneuta un auricular pa escuchar les contraseñes.</string>
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
   <string name="keyboard_password_character_no_headset">Puntu</string>
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
   <string name="action_bar_home_description">Dir al escritoriu</string>
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
   <string name="action_bar_up_description">Desplazase hacia arriba</string>
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
   <string name="action_menu_overflow_description">Más opciones</string>
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
   <string name="action_bar_home_description_format">%1$s, %2$s</string>
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
   <string name="action_bar_home_subtitle_description_format">%1$s, %2$s, %3$s</string>
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
   <string name="storage_internal">Almacenamientu internu</string>
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
   <string name="storage_sd_card">Tarxeta SD</string>
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <string name="storage_sd_card_label">Tarxeta SD de <xliff:g id="manufacturer" example="SanDisk">%s</xliff:g></string>
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <string name="storage_usb_drive">Unidá USB</string>
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <string name="storage_usb_drive_label">Unidá USB de <xliff:g id="manufacturer" example="Seagate">%s</xliff:g></string>
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
   <string name="storage_usb">Almacenamientu USB</string>
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_warning_title">Avisu d\'usu de datos</string>
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_warning_body">Toca pa ver l\'usu y axustes.</string>
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_3g_limit_title">Algamóse la llende de datos 2G-3G</string>
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_4g_limit_title">Algamóse la llende de datos 4G</string>
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_mobile_limit_title">Algamóse la llende de datos móviles</string>
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_wifi_limit_title">Llende de datos Wi-Fi algamada</string>
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_limit_body">Datos posaos restu de ciclu</string>
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_3g_limit_snoozed_title">Llende de datos 2G-3G perpasada</string>
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_4g_limit_snoozed_title">Llende de datos 4G perpasada</string>
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_mobile_limit_snoozed_title">Perpasóse llende datos móviles</string>
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_wifi_limit_snoozed_title">Llende de datos Wi-Fi perpasada</string>
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_limit_snoozed_body">Llende perpasada en <xliff:g id="SIZE">%s</xliff:g></string>
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
   <string name="data_usage_restricted_title">Conexones automátiques restrinxíes</string>
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
   <string name="data_usage_restricted_body">Toca pa desaniciar la restricción.</string>
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
   <string name="ssl_certificate">Certificáu de seguranza</string>
+  <!-- Message on an SSL Certificate dialog -->
   <string name="ssl_certificate_is_valid">Esti certificáu ye válidu.</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_to">Emitíu pa:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="common_name">Nome común:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="org_name">Organización:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="org_unit">Departamentu:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_by">Emitíu por:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="validity_period">Validez:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_on">Data d\'emisión:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="expires_on">Data de caducidá:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="serial_number">Númberu de serie:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="fingerprints">Buelgues dixitales:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="sha256_fingerprint">Buelga dixital SHA-256:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="sha1_fingerprint">Buelga dixital SHA-1:</string>
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
   <string name="activity_chooser_view_see_all">Ver too</string>
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
   <string name="activity_chooser_view_dialog_title_default">Selecionar actividá</string>
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
   <string name="share_action_provider_share_with">Compartir con</string>
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
   <string name="list_delimeter">", "</string>
+  <!-- STK sending DTMF, SMS, USSD, SS -->
   <string name="sending">Unviando\u2026</string>
+  <!-- STK launch Browser -->
   <string name="launchBrowserDefault">¿Aniciar el restolador web?</string>
+  <!-- STK setup Call -->
   <string name="SetupCallDefault">¿Aceutar la llamada?</string>
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_always">Siempre</string>
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_once">Namái una vegada</string>
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
   <string name="activity_resolver_work_profiles_support">%1$s nun almites perfiles de trabayu</string>
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="tablet">Tablet</string>
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="default">Teléfonu</string>
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name_headphones">Auriculares</string>
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name_dock_speakers">Altavoces de la base</string>
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
   <string name="default_media_route_name_hdmi">HDMI</string>
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
   <string name="default_audio_route_category_name">Sistema</string>
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
   <string name="bluetooth_a2dp_audio_route_name">Audiu Bluetooth</string>
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
   <string name="wireless_display_route_description">Pantalla inalámbrica</string>
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
   <string name="media_route_button_content_description">Cast</string>
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
   <string name="media_route_chooser_title">Coneutar a preséu</string>
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
   <string name="media_route_chooser_title_for_remote_display">Unviar pantalla a preséu</string>
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
   <string name="media_route_chooser_searching">Guetando por preseos…</string>
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
   <string name="media_route_chooser_extended_settings">Axustes</string>
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
   <string name="media_route_controller_disconnect">Desconeutar</string>
+  <!-- Status message for remote routes attempting to scan/determine availability -->
   <string name="media_route_status_scanning">Analizando\u2026</string>
+  <!-- Status message for a remote route attempting to connect -->
   <string name="media_route_status_connecting">Coneutando\u2026</string>
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
   <string name="media_route_status_available">Disponible</string>
+  <!-- Status message for remote routes that are not available for connection right now -->
   <string name="media_route_status_not_available">Non disponible</string>
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
   <string name="media_route_status_in_use">N\'usu</string>
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
   <string name="display_manager_built_in_display_name">Pantalla integrada</string>
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
   <string name="display_manager_hdmi_display_name">Pantalla HDMI</string>
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
   <string name="display_manager_overlay_display_name">Superposición #<xliff:g id="ID">%1$d</xliff:g></string>
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
   <string name="display_manager_overlay_display_title"><xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g> x <xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> dpi</string>
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
   <string name="display_manager_overlay_display_secure_suffix">, seguru</string>
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">¿Escaecisti\'l patrón?</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">El patrón ye incorreutu</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">Contraseña incorreuta</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">PIN incorreutu</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown">Inténtalo otra vuelta en <xliff:g id="NUMBER">%1$d</xliff:g> segundos.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">Dibuxa\'l to patrón de desbloquéu.</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">Inxerta\'l PIN de la tarxeta SIM.</string>
+  <!-- Instructions for using the PIN unlock screen -->
   <string name="kg_pin_instructions">Introduz el PIN.</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">Escribi la contraseña.</string>
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint">La tarxeta SIM ta inhabilitada. Pa continuar, inxerta\'l códigu PUK. Si quies obtener más información, ponte en contautu col operador</string>
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
   <string name="kg_puk_enter_pin_hint">Introduz el códigu PIN deseáu</string>
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
   <string name="kg_enter_confirm_pin_hint">Confirma\'l códigu PIN</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM…</string>
+  <!-- Message shown when the user enters the wrong PIN code -->
   <string name="kg_password_wrong_pin_code">Códigu PIN incorreutu</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">Introduz un códigu PIN con una llonxitú comprendida ente cuatro y ocho díxitos.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
   <string name="kg_invalid_sim_puk_hint">El códigu PUK tien de tener ocho númberos como mínimo.</string>
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">Vuelvi a introducir el códigu PUK correutu. Si introduces un códigu incorreutu delles vegaes, va inhabilitase la tarxeta SIM.</string>
+  <!-- String shown in PUK screen when PIN codes don't match -->
   <string name="kg_invalid_confirm_pin_hint" product="default">Los códigos PIN nun concasen.</string>
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
   <string name="kg_login_too_many_attempts">Abondos intentos incorreutos de crear el patrón</string>
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
   <string name="kg_login_instructions">Pa desbloquiar el teléfonu, anicia sesión cola to cuenta de Google.</string>
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_username_hint">Nome d\'usuariu (corréu-e)</string>
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_password_hint">Contraseña</string>
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
   <string name="kg_login_submit_button">Aniciar sesión</string>
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
   <string name="kg_login_invalid_input">El nome d\'usuariu o la contraseña nun son válidos.</string>
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
   <string name="kg_login_account_recovery_hint">Si escaecisti\'l nome d\'usuariu o la contraseña,\nvete a la páxina \"<b>google.com/accounts/recovery"</b>.</string>
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
   <string name="kg_login_checking_password">Comprobando cuenta…</string>
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
   <string name="kg_too_many_failed_pin_attempts_dialog_message">Punxisti un códigu PIN incorreutu <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nVuelvi a intentalo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
   <string name="kg_too_many_failed_password_attempts_dialog_message">Punxisti una contraseña incorreuta <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nVuelvi a intentalo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
   <string name="kg_too_many_failed_pattern_attempts_dialog_message">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. \n\nVuelvi a intentalo en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="tablet">Intentasti desbloquiar la tablet <xliff:g id="NUMBER_0">%d</xliff:g> vegaes, pero nun pudisti. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, van reafitase los datos de fábrica y van perdese tolos datos del usuariu.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="default">Intentasti desbloquiar el teléfonu <xliff:g id="NUMBER_0">%d</xliff:g> vegaes, pero nun pudisti. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, van reafitase los datos de fábrica y van perdese tolos datos del usuariu.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="tablet">Intentasti desbloquiar la tablet <xliff:g id="NUMBER">%d</xliff:g> vegaes, pero nun pudisti. Van reafitase los datos de fábrica del preséu.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="default">Intentasti desbloquiar el teléfonu <xliff:g id="NUMBER">%d</xliff:g> vegaes, pero nun pudisti. Van reafitase los datos de fábrica del preséu.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tablet">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tener d\'usar una cuenta de corréu-e pa desbloquiar la tablet.\n\n Vuelvi a intentalo en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="default">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tener d\'usar una cuenta de corréu-e pa desbloquiar el teléfonu.\n\n Vuelvi a intentalo en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</string>
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
   <string name="kg_text_message_separator" product="default">" — "</string>
+  <!-- The delete-widget drop target button text -->
   <string name="kg_reordering_delete_drop_target_text">Desaniciar</string>
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
   <string name="safe_media_volume_warning" product="default">
        ¿Quies xubir el volume penriba del nivel recomendáu?\n\nEscuchar soníos al altu la lleva mentanto llargos períodos de tiempu pue dañar los oyíos
     </string>
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
   <string name="continue_to_enable_accessibility">Caltén la pantalla primida con dos deos p\'habilitar les funciones d\'accesibilidá.</string>
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
   <string name="accessibility_enabled">Accesibilidá habilitada</string>
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
   <string name="enable_accessibility_canceled">Accesibilidá encaboxada</string>
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
   <string name="user_switched">Usuariu actual: <xliff:g id="NAME">%1$s</xliff:g></string>
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
   <string name="user_switching_message">Camudando a <xliff:g id="name" example="Bob">%1$s</xliff:g>\u2026</string>
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
   <string name="owner_name" msgid="3879126011135546571">Propietariu</string>
+  <!-- Error message title [CHAR LIMIT=35] -->
   <string name="error_message_title">Fallu</string>
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
   <string name="error_message_change_not_allowed">Esti cambéu nun ta permitíu pol alministrador</string>
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
   <string name="app_not_found">Nun s\'atopó nenguna aplicación que pueda facer esta aición.</string>
   <string name="revoke">Revocar</string>
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
   <string name="mediasize_iso_a0">ISO A0</string>
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
   <string name="mediasize_iso_a1">ISO A1</string>
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
   <string name="mediasize_iso_a2">ISO A2</string>
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
   <string name="mediasize_iso_a3">ISO A3</string>
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
   <string name="mediasize_iso_a4">ISO A4</string>
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
   <string name="mediasize_iso_a5">ISO A5</string>
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
   <string name="mediasize_iso_a6">ISO A6</string>
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
   <string name="mediasize_iso_a7">ISO A7</string>
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
   <string name="mediasize_iso_a8">ISO A8</string>
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
   <string name="mediasize_iso_a9">ISO A9</string>
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
   <string name="mediasize_iso_a10">ISO A10</string>
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
   <string name="mediasize_iso_b0">ISO B0</string>
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
   <string name="mediasize_iso_b1">ISO B1</string>
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
   <string name="mediasize_iso_b2">ISO B2</string>
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
   <string name="mediasize_iso_b3">ISO B3</string>
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
   <string name="mediasize_iso_b4">ISO B4</string>
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
   <string name="mediasize_iso_b5">ISO B5</string>
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
   <string name="mediasize_iso_b6">ISO B6</string>
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
   <string name="mediasize_iso_b7">ISO B7</string>
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
   <string name="mediasize_iso_b8">ISO B8</string>
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
   <string name="mediasize_iso_b9">ISO B9</string>
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
   <string name="mediasize_iso_b10">ISO B10</string>
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
   <string name="mediasize_iso_c0">ISO C0</string>
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
   <string name="mediasize_iso_c1">ISO C1</string>
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
   <string name="mediasize_iso_c2">ISO C2</string>
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
   <string name="mediasize_iso_c3">ISO C3</string>
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
   <string name="mediasize_iso_c4">ISO C4</string>
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
   <string name="mediasize_iso_c5">ISO C5</string>
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
   <string name="mediasize_iso_c6">ISO C6</string>
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
   <string name="mediasize_iso_c7">ISO C7</string>
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
   <string name="mediasize_iso_c8">ISO C8</string>
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
   <string name="mediasize_iso_c9">ISO C9</string>
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
   <string name="mediasize_iso_c10">ISO C10</string>
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
   <string name="mediasize_na_letter">Carta</string>
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
   <string name="mediasize_na_gvrnmt_letter">Carta del gobiernu</string>
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
   <string name="mediasize_na_legal">Llegal</string>
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
   <string name="mediasize_na_junior_legal">Junior legal</string>
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
   <string name="mediasize_na_ledger">Doble carta</string>
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
   <string name="mediasize_na_tabloid">Tabloide</string>
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
   <string name="mediasize_na_index_3x5">Index Card 3x5</string>
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
   <string name="mediasize_na_index_4x6">Index Card 4x6</string>
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
   <string name="mediasize_na_index_5x8">Index Card 5x8</string>
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
   <string name="mediasize_na_monarch">Monarch</string>
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
   <string name="mediasize_na_quarto">Quarto</string>
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
   <string name="mediasize_na_foolscap">Foolscap</string>
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
   <string name="mediasize_chinese_roc_8k">ROC 8K</string>
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
   <string name="mediasize_chinese_roc_16k">ROC 16K</string>
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
   <string name="mediasize_chinese_prc_1">PRC 1</string>
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
   <string name="mediasize_chinese_prc_2">PRC 2</string>
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
   <string name="mediasize_chinese_prc_3">PRC 3</string>
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
   <string name="mediasize_chinese_prc_4">PRC 4</string>
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
   <string name="mediasize_chinese_prc_5">PRC 5</string>
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
   <string name="mediasize_chinese_prc_6">PRC 6</string>
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
   <string name="mediasize_chinese_prc_7">PRC 7</string>
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
   <string name="mediasize_chinese_prc_8">PRC 8</string>
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
   <string name="mediasize_chinese_prc_9">PRC 9</string>
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
   <string name="mediasize_chinese_prc_10">PRC 10</string>
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_prc_16k">PRC 16K</string>
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_om_pa_kai">Pa Kai</string>
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_dai_pa_kai">Dai Pa Ka</string>
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_jurro_ku_kai">Jurro Ku Kai</string>
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
   <string name="mediasize_japanese_jis_b10">JIS B10</string>
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
   <string name="mediasize_japanese_jis_b9">JIS B9</string>
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
   <string name="mediasize_japanese_jis_b8">JIS B8</string>
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
   <string name="mediasize_japanese_jis_b7">JIS B7</string>
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
   <string name="mediasize_japanese_jis_b6">JIS B6</string>
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
   <string name="mediasize_japanese_jis_b5">JIS B5</string>
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
   <string name="mediasize_japanese_jis_b4">JIS B4</string>
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
   <string name="mediasize_japanese_jis_b3">JIS B3</string>
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
   <string name="mediasize_japanese_jis_b2">JIS B2</string>
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
   <string name="mediasize_japanese_jis_b1">JIS B1</string>
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
   <string name="mediasize_japanese_jis_b0">JIS B0</string>
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
   <string name="mediasize_japanese_jis_exec">JIS Exec</string>
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
   <string name="mediasize_japanese_chou4">Chou4</string>
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
   <string name="mediasize_japanese_chou3">Chou3</string>
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
   <string name="mediasize_japanese_chou2">Chou2</string>
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
   <string name="mediasize_japanese_hagaki">Hagaki</string>
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
   <string name="mediasize_japanese_oufuku">Oufuku</string>
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
   <string name="mediasize_japanese_kahu">Kahu</string>
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
   <string name="mediasize_japanese_kaku2">Kaku2</string>
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
   <string name="mediasize_japanese_you4">You4</string>
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
   <string name="mediasize_unknown_portrait">Cualquier tamañu vertical</string>
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
   <string name="mediasize_unknown_landscape">Cualquier tamañu horizontal</string>
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
   <string name="write_fail_reason_cancelled">Encaboxáu</string>
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
   <string name="write_fail_reason_cannot_write">Fallu al escribir conteníu</string>
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
   <string name="reason_unknown">desconocíu</string>
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
   <string name="reason_service_unavailable">Serviciu d\'impresión non habilitáu</string>
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
   <string name="print_service_installed_title">Instalóse\'l serviciu <xliff:g id="NAME">%s</xliff:g></string>
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
   <string name="print_service_installed_message">Tocar p\'habilitar</string>
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_admin_pin">Introduz el PIN del alministrador</string>
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_pin">Inxertar PIN</string>
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
   <string name="restr_pin_incorrect">Incorreutu</string>
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_old_pin">PIN actual</string>
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_new_pin">PIN nuevu</string>
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
   <string name="restr_pin_confirm_pin">Confirma\'l PIN nuevu</string>
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
   <string name="restr_pin_create_pin">Crear PIN pa modificar restricciones</string>
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
   <string name="restr_pin_error_doesnt_match">Los númberos PIN nun concasen. Vuelvi a intentalo.</string>
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
   <string name="restr_pin_error_too_short">El PIN ye enforma curtiu. Tien de tener al menos 4 díxitos.</string>
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <plurals name="restr_pin_countdown">
+    <item quantity="one">Inténtalo en 1 s</item>
+    <item quantity="other">Inténtalo en <xliff:g id="COUNT">%d</xliff:g> s</item>
+  </plurals>
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
   <string name="restr_pin_try_later">Volver a intentalo dempués</string>
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <string name="immersive_cling_title">Visualización en pantalla completa</string>
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <string name="immersive_cling_description">Pa salir, esliza\'l deu hacia abaxo dende la parte superior.</string>
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <string name="immersive_cling_positive">Atalántolo</string>
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
   <string name="done_label">Fecho</string>
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
   <string name="hour_picker_description">Control eslizante circular d\'hores</string>
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
   <string name="minute_picker_description">Control eslizante circular de minutos</string>
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
   <string name="select_hours">Seleicionar hores</string>
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
   <string name="select_minutes">Seleicionar minutos</string>
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
   <string name="select_day">Seleicionar mes y día</string>
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
   <string name="select_year">Seleicionar añu</string>
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
   <string name="deleted_key"><xliff:g id="key" example="4">%1$s</xliff:g> desaniciáu</string>
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
   <string name="managed_profile_label_badge"><xliff:g id="label" example="Email">%1$s</xliff:g> de trabayu</string>
+  <!-- DO NOT TRANSLATE -->
   <string name="time_placeholder">--</string>
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <string name="date_picker_month_typeface">sans-serif-medium</string>
+  <!-- DO NOT TRANSLATE -->
+  <string name="date_picker_day_of_week_typeface">sans-serif-medium</string>
+  <!-- DO NOT TRANSLATE -->
+  <string name="date_picker_day_typeface">sans-serif-medium</string>
+  <!-- Notify use that they are in Lock-to-app -->
   <string name="lock_to_app_toast">Pa desactivar esta pantalla, caltén primíos al empar los botones de retrocesu y Visión xeneral.</string>
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
   <string name="lock_to_app_toast_accessible">Pa desactivar esta pantalla, caltén primíu\'l botón Visión xeneral.</string>
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <string name="lock_to_app_toast_locked">L\'app ta fixada: nun se permite desfixala nesti preséu.</string>
+  <!-- Starting lock-to-app indication. -->
   <string name="lock_to_app_start">Pantalla fixada</string>
+  <!-- Exting lock-to-app indication. -->
   <string name="lock_to_app_exit">Pantalla desfixada</string>
+  <!-- Lock-to-app unlock pin string -->
   <string name="lock_to_app_unlock_pin">Solicitar PIN pa desactivar</string>
+  <!-- Lock-to-app unlock pattern string -->
   <string name="lock_to_app_unlock_pattern">Solicitar patrón de desbloquéu pa desactivar</string>
+  <!-- Lock-to-app unlock password string -->
   <string name="lock_to_app_unlock_password">Solicitar contraseña pa desactivar</string>
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <string name="package_installed_device_owner">Instaláu pol alministrador</string>
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <string name="package_updated_device_owner">Anováu pol alministrador</string>
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <string name="package_deleted_device_owner">Desaniciáu pol alministrador</string>
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_minutes_summary_short">
+    <item quantity="one">Mentanto 1 min (hasta la(les) <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    <item quantity="other">Mentanto %1$d mins (hasta la(les) <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+  </plurals>
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_hours_summary_short">
+    <item quantity="one">Mentanto 1 hr (hasta la(les) <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    <item quantity="other">Mentanto %1$d hrs (hasta la(les) <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+  </plurals>
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_minutes">
+    <item quantity="one">Mientres un minutu</item>
+    <item quantity="other">Mientres %d minutos</item>
+  </plurals>
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_minutes_short">
+    <item quantity="one">Mentanto 1 min</item>
+    <item quantity="other">Mentanto %d mins</item>
+  </plurals>
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_hours">
+    <item quantity="one">Mientres una hora</item>
+    <item quantity="other">Mientres %d hores</item>
+  </plurals>
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_hours_short">
+    <item quantity="one">Mentanto 1 hr</item>
+    <item quantity="other">Mentanto %d hrs</item>
+  </plurals>
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <string name="zen_mode_alarm">Hasta les <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g> hores (próxima alarma)</string>
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <string name="zen_mode_forever">Hasta que lo desactives</string>
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <string name="zen_mode_forever_dnd">Hasta que desactives Nun molestar</string>
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <string name="zen_mode_rule_name_combination"><xliff:g id="first" example="Weeknights">%1$s</xliff:g> / <xliff:g id="rest" example="Meetings">%2$s</xliff:g></string>
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
   <string name="zen_mode_feature_name">Nun molestar</string>
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <string name="zen_mode_downtime_feature_name">Tiempu d\'inactividá</string>
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <string name="zen_mode_default_weeknights_name">Nueche, na selmana</string>
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <string name="zen_mode_default_weekends_name">Fin de selmana</string>
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <string name="zen_mode_default_events_name">Eventu</string>
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <string name="notification_work_profile_content_description">Perfil de trabayu</string>
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <string name="usb_midi_peripheral_name">Puertu USB de periféricos Android</string>
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <string name="usb_midi_peripheral_manufacturer_name">Android</string>
+  <!-- Product name for USB MIDI Peripheral port -->
+  <string name="usb_midi_peripheral_product_name">Puertu USB de periféricos</string>
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
   <string name="floating_toolbar_open_overflow_description">Más opciones</string>
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <string name="floating_toolbar_close_overflow_description">Zarrar la barra de ferramientes flotante</string>
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- 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> elementu esbilláu</item>
+    <item quantity="other"><xliff:g id="count" example="3">%1$d</xliff:g> elementos esbillaos</item>
+  </plurals>
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
 </resources>
diff --git a/core/res/res/values-az-rAZ/cm_strings.xml b/core/res/res/values-az-rAZ/cm_strings.xml
index cde10dc..519809f 100644
--- a/core/res/res/values-az-rAZ/cm_strings.xml
+++ b/core/res/res/values-az-rAZ/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Ekran şəkli</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">qorunan SMS qəbul et</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Tətbiqetməyə qorunan bir SMS qəbul etmə icazəsi verər.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">qorunan SMS siyahısını dəyişdir</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Tətbiqetməyə qorunan SMS ünvan siyahısını dəyişdirmə icazəsi verər.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Təhlükəsizlik</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Cihaz təhlükəsizlik məlumatı ilə bağlı icazələr.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">telefon qara siyahısını oxu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Tətbiqetmənin gələn zəngləri və ya mesajları əngəllənmiş telefon nömrələri haqqında məlumat oxumasına icazə verər.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">telefon qara siyahısını dəyişdir</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Tətbiqetmənin gələn zəngləri və ya mesajları əngəllənmiş telefon nömrələrini dəyişdirməsinə icazə verər.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">klaviatura divar kağızını tənzimlə</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Tətbiqetmənin kilit ekranı divar kağızını dəyişdirməsinə icazə verər.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Yenidən başlat</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Hazırki</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Yenidən başlat</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Bərpa rejimi (Recovery)</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Önyükləyici (Bootloader)</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Endirmə rejimi</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Proqram təminatını yenidən başlatma</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Yenidən başlat</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Planşetiniz yenidən başladılacaq.</string>
   <string name="reboot_confirm" product="default">Telefonunuz yenidən başlayacaq.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Yenidən başladılır\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Tətbiq sonlandırıldı</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">Şəbəkə üzərindən ADB fəaldır</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USB &amp; şəbəkə üzərindən ADB fəaldır</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Xəta ayırdetməni ləğv etmək üçün toxunun.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; şəbəkə</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Şəbəkə</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">tətbiqetmə başlatmanın qarşısını al</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s quraşdırılmayıb</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Üstünlük</string>
   <string name="silent_mode_none">Yoxdur</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">SIM abunəliyini dəyişmə ilə əlaqədar Wi-Fi internet paylaşma ləğv edildi</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Wi-Fi\'ı bağla</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Gizlilik Qorumasını fəallaşdır ya da ləğv et</string>
   <string name="permdesc_changePrivacyGuardState">Tətbiqetməyə başqa bir tətbiqetmənin Gizlilik Qorumasını işlədib işlədə bilməyəcəyini müəyyənləşdirmə imkanı verər. Əgər tətbiqetmə Gizlilik Qoruması ilə işləyərsə şəxslər, zəng qeydləri və ya mesajlar kimi şəxsi verilənlərə müraciət edə bilməyəcək.</string>
   <string name="privacy_guard_notification">Gizlilik Qoruması fəaldır</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> şəxsi verilənlərə müraciət edə bilməyəcək</string>
   <string name="privacy_guard_dialog_title">Gizlilik Qoruması</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> <xliff:g id="op">%2$s</xliff:g> icazəsindən istifadə etmək istəyir.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Seçimimi yadda saxla</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">kameraya müraciət</string>
   <string name="app_ops_access_location">olduğunuz yerə müraciət</string>
   <string name="app_ops_access_notifications">bildirişləri oxu</string>
@@ -111,19 +149,22 @@
   <string name="app_ops_write_mms">MMS mesajı yazın</string>
   <string name="app_ops_write_sms">SMS mesajı yazın</string>
   <string name="app_ops_su">root müraciəti əldə et</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Bu ekranı çıxarmaq üçün Geri düyməsinə toxunub basılı tutun.</string>
-  <string name="live_display_auto">Avtomatik</string>
-  <string name="live_display_auto_summary">Gün çıxandan və batandan sonra ekranın rəng hərarətini avtomatik tənzimləyər</string>
-  <string name="live_display_off">Bağlı</string>
-  <string name="live_display_off_summary">Bütün tənzimləmələri ləğv et</string>
-  <string name="live_display_day">Gündüz</string>
-  <string name="live_display_day_summary">Yalnız gündüz tənziml. istifadə et</string>
-  <string name="live_display_night">Gecə</string>
-  <string name="live_display_night_summary">Yalnız gecə tənziml. istifadə et</string>
-  <string name="live_display_outdoor">Açıq hava (parlaq günəş)</string>
-  <string name="live_display_outdoor_summary">Yalnız açıq hava tənziml. istifadə et</string>
-  <string name="live_display_hint">LiveDisplay göz yorğunluğunuzu azaldıb gecələri yuxulamağınıza kömək edə bilər. Yoxlamaq üçün bura klikləyin!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Bağlı cihaz yoxdur</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> cihaz bağlıdır</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> cihaz bağlıdır</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">batareya statistikalarını sıfırla</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Tətbiqetmənin aşağı batareya istifadə verilənlərini sıfırlamasına icazə verər.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-be/cm_strings.xml b/core/res/res/values-be/cm_strings.xml
index 0c83b38..5e73c39 100644
--- a/core/res/res/values-be/cm_strings.xml
+++ b/core/res/res/values-be/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Здымак экрану</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">атрыманне абароненых SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Дазваляе праграме атрымліваць абароненыя SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">мадыфікацыя спісу абароненых SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Дадатак зможа змяняць спіс адрасатаў абароненых SMS-паведамленняў.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Бяспека</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Дазволы, што адносяцца да бяспекі дадзеных на прыладзе.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">прагляд чорнага спісу</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Дазваляе праграме праглядаць звесткі пра нумары тэлефонаў, ад якіх заблакаваны тэлефанаванні ці паведамленні.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">мадыфікацыя чорнага спісу</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Дазваляе праграме ўносіць змены ў спіс нумароў тэлефонаў, ад якіх заблакаваны тэлефанаванні ці паведамленні.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">усталёўка шпалераў экрану блакавання</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Дазваляе праграме змяняць шпалеры экрану блакавання.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Перазагрузіць</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Бягучы</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Перазагрузіць</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Рэжым аднаўлення</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Загрузчык</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Спампоўкі</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Перазапуск інтэрфейсу</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Перазагрузіць</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Ваш планшэт будзе перазапушчаны.</string>
   <string name="reboot_confirm" product="default">Ваш тэлефон будзе перазапушчаны.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Перазапуск\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Дадатак зачынены</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB праз сетку ўключана</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB праз USB &amp; сетку ўключана</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Націснуць для выключэння наладкі.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">па сетцы &amp; USB</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Па сетцы</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Перахоп запуску дадаткаў</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s не ўсталявана</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Важныя</string>
   <string name="silent_mode_none">Не</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Выключаныя Wi-Fi кропкі доступу ў сувязі са зменай падпіскі SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Вымкнуць Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">уключэнне ці выключэнне рэжыму абароны прыватнасці</string>
   <string name="permdesc_changePrivacyGuardState">Дазваляе праграме выбіраць, ці будзе іншая праграма працаваць у рэжыме абароны прыватнасці. Калі праграма запушчана ў рэжыме абароны прыватнасці, яна не будзе мець доступу да асабістых дадзеных, такіх як кантакты, паведамленні ці гісторыя тэлефанаванняў.</string>
   <string name="privacy_guard_notification">Рэжым абароны прыватнасці актыўны</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> не будзе мець доступу да асабістых дадзеных</string>
   <string name="privacy_guard_dialog_title">Рэжым абароны</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> жадае <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Запамятаць вырашэнне</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">атрымаць доступ да камеры</string>
   <string name="app_ops_access_location">атрымаць доступ да месцазнаходжання прылады</string>
   <string name="app_ops_access_notifications">атрымаць доступ да апавяшчэнняў</string>
@@ -97,6 +135,7 @@
   <string name="app_ops_start_at_bootup">прызначыць запуск пры ўлучэнні прылады</string>
   <string name="app_ops_toast_window">адлюстроўваць усплывальныя паведамленні</string>
   <string name="app_ops_toggle_bluetooth">пераключыць стан Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">пераключыць стан сотавай сеткі</string>
   <string name="app_ops_toggle_nfc">пераключыць стан модуля NFC</string>
   <string name="app_ops_toggle_wifi">пераключыць стан Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">атрымаць кіраванне гучнасцю будзільніка</string>
@@ -127,21 +166,28 @@
   <string name="app_ops_get_accounts">атрымаць інфармацыю карыстальнікаў</string>
   <string name="app_ops_wifi_change">Змяніць стан Wi-Fi</string>
   <string name="app_ops_su">атрымаць правы суперкарыстальніка</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Каб адмацаваць экран, націсніце і ўтрымвайце кнопку \"Назад\".</string>
-  <string name="live_display_auto">Аўтаматычна</string>
-  <string name="live_display_auto_summary">Аўтаматычная падладка колеравай тэмпературы экрана пасля заходу і ўзыходу сонца</string>
-  <string name="live_display_off">Адключыць</string>
-  <string name="live_display_off_summary">Адключыць аўтападладку</string>
-  <string name="live_display_day">Дзень</string>
-  <string name="live_display_day_summary">Толькі дзённыя налады</string>
-  <string name="live_display_night">Ноч</string>
-  <string name="live_display_night_summary">Толькі начныя налады</string>
-  <string name="live_display_outdoor">На вуліцы (яскравае сонца)</string>
-  <string name="live_display_outdoor_summary">Толькі вулічны рэжым</string>
-  <string name="live_display_hint">LiveDisplay дапаможа зменшыць глядзельную напругу і палепшыць сон. Націсніце тут, каб паспрабаваць!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Няма падлучаных прылад</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> падлучаная прылада</string>
   <string name="tethered_notification_multi_device_message">Падлучана прылад: <xliff:g id="count">%1$s</xliff:g></string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Запуск дадатку забаронены</string>
   <string name="notify_package_component_protected_text">Дадатак <xliff:g id="app_name">%1$s</xliff:g> заблакаваны на запуск. Націсні, каб увесці паролль і запусціць дадатак.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Батарэя цалкам зараджана</string>
+  <string name="notify_battery_fully_charged_text">Адлучы зарадную прыладу каб павялічыць тэрмін жыцця батарэі.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">Абнуленне статыстыкі батарэі</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Дазволіць дадатку чысціць дадзеныя пра выкарыстанне акумулятарнай батарэі прылады.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM-картка змянілася</string>
+  <string name="uicc_hot_swapped_event_text">Націсні, каб усталяваць параметры па змаўчанні</string>
 </resources>
diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml
index 4bbe54a..94637b6 100644
--- a/core/res/res/values-be/strings.xml
+++ b/core/res/res/values-be/strings.xml
@@ -19,124 +19,1777 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="byteShort">Б</string>
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <string name="byteShort">Біт</string>
+  <!-- Suffix added to a number to signify size in kilobytes. -->
   <string name="kilobyteShort">КБ</string>
+  <!-- Suffix added to a number to signify size in megabytes. -->
   <string name="megabyteShort">МБ</string>
+  <!-- Suffix added to a number to signify size in gigabytes. -->
   <string name="gigabyteShort">ГБ</string>
+  <!-- Suffix added to a number to signify size in terabytes. -->
   <string name="terabyteShort">TБ</string>
+  <!-- Suffix added to a number to signify size in petabytes. -->
   <string name="petabyteShort">ПБ</string>
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
   <string name="fileSizeSuffix"><xliff:g id="number" example="123">%1$s</xliff:g><xliff:g id="unit" example="KB">%2$s</xliff:g></string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <string name="durationDays"><xliff:g id="days">%1$d</xliff:g> содняў</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <string name="durationDayHours"><xliff:g id="days">%1$d</xliff:g> содні
+            <xliff:g id="hours">%2$d</xliff:g> гадзінаў</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <string name="durationDayHour"><xliff:g id="days">%1$d</xliff:g> содні
+            <xliff:g id="hours">%2$d</xliff:g>гадзін</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <string name="durationHours"><xliff:g id="hours">%1$d</xliff:g> гадзінаў</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <string name="durationHourMinutes"><xliff:g id="hours">%1$d</xliff:g> гадзін
+            <xliff:g id="minutes">%2$d</xliff:g> хвілін</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <string name="durationHourMinute"><xliff:g id="hours">%1$d</xliff:g> г
+            <xliff:g id="minutes">%2$d</xliff:g> хв</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <string name="durationMinutes"><xliff:g id="minutes">%1$d</xliff:g> хвілінаў</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <string name="durationMinute"><xliff:g id="minutes">%1$d</xliff:g> хвіліна</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <string name="durationMinuteSeconds"><xliff:g id="minutes">%1$d</xliff:g> хвілін
+            <xliff:g id="seconds">%2$d</xliff:g> сэкунд</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <string name="durationMinuteSecond"><xliff:g id="minutes">%1$d</xliff:g> хвілін
+            <xliff:g id="seconds">%2$d</xliff:g> сэкунда</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <string name="durationSeconds"><xliff:g id="seconds">%1$d</xliff:g> сэкундаў</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <string name="durationSecond"><xliff:g id="seconds">%1$d</xliff:g> сэкунд</string>
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <string name="untitled">&lt;Без назвы&gt;</string>
+  <!-- How to display the lack of a phone number -->
+  <string name="emptyPhoneNumber">(Няма нумару тэлефону)</string>
+  <!-- How to display the lack of a name -->
+  <string name="unknownName">Невядомы</string>
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <string name="defaultVoiceMailAlphaTag">Галасавая пошта</string>
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <string name="defaultMsisdnAlphaTag">MSISDN1</string>
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <string name="mmiError">Праблема падчас падлучэньня, магчыма памылка коду MMI.</string>
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <string name="mmiFdnError">Абмежаваньне: выкарыстоўваюцца толькі дазволеныя нумары.</string>
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <string name="serviceEnabled">Служба была ўключана.</string>
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <string name="serviceEnabledFor">Служба была ўключана для:</string>
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <string name="serviceDisabled">Служба была адключана.</string>
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <string name="serviceRegistered">Рэгістрацыя прайшла пасьпяхова.</string>
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <string name="serviceErased">Пасьпяхова выдалена.</string>
+  <!-- Displayed when a SIM password was entered incorrectly. -->
   <string name="passwordIncorrect">Памылковы пароль.</string>
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
   <string name="mmiComplete">Запыт MMI завершаны.</string>
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <string name="badPin">Памылка: неабходны стары PIN-код.</string>
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
   <string name="badPuk">Уведзены памылковы PUK-код.</string>
-  <string name="invalidPin">Увядзіце PIN-код (ад 4 да 8 лічбаў).</string>
-  <string name="invalidPuk">Увядзіце PUK-код з 8 лічбаў ці больш.</string>
-  <string name="needPuk2">Для разблакавання SIM-карткі увядзіце код PUK2.</string>
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <string name="mismatchPin">PIN-коды ня супадаюць.</string>
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <string name="invalidPin">PIN-код (ад 4 да 8 лічбаў).</string>
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <string name="invalidPuk">PUK-код ад 8 лічбаў і больш.</string>
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <string name="needPuk">SIM-картка заблакавана PUK-кодам. Неабходны PUK-код, каб разблакаваць картку.</string>
+  <string name="needPuk2">Для разблакаваньня SIM-карткі неабходны PUK2-код.</string>
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <string name="enablePin">Памылка. Падлучы блакаваньне SIM-карткі ці карткі RUIM.</string>
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
   <plurals name="pinpuk_attempts">
     <item quantity="one">У вас засталася <xliff:g id="number">%d</xliff:g> спроба перад тым, як SIM-картка будзе заблакавана.</item>
     <item quantity="few">У вас засталася <xliff:g id="number">%d</xliff:g> спробы перад тым, як SIM-картка будзе заблакавана.</item>
     <item quantity="other">У вас засталася <xliff:g id="number">%d</xliff:g> спробы перад тым, як SIM-картка будзе заблакавана.</item>
   </plurals>
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <string name="imei">IMEI</string>
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <string name="meid">MEID</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <string name="ClipMmi">Уваходны выклік</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <string name="ClirMmi">Зыходны выклік</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <string name="ColrMmi">Абмежаваньне ідэнтыфікатару падлучанай лініі</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <string name="CfMmi">Пераадрасаваньне выклікаў</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <string name="CwMmi">Чаканьне выкліку</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
   <string name="BaMmi">Забарона выклікаў</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <string name="PwdMmi">Зьмена пароля</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <string name="PinMmi">Зьмена PIN-коду</string>
+  <string name="CnipMmi">Бягучы нумар выкліку</string>
+  <string name="CnirMmi">Нумар выкліку абмежаваны</string>
+  <string name="ThreeWCMmi">Трохбаковы выклік</string>
+  <string name="RuacMmi">Адмова ад непажаданых выклікаў</string>
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
   <string name="wfcRegErrorTitle">Wi-Fi выклік</string>
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
   <string name="wfcSpnFormat">%s</string>
+  <!-- Template for showing operator name for data connection while WFC is active -->
   <string name="wfcDataSpnFormat">%s</string>
+  <!-- WFC, summary for Disabled -->
   <string name="wifi_calling_off_summary">Адключана</string>
+  <!-- WFC, summary for Wi-Fi Preferred -->
   <string name="wfc_mode_wifi_preferred_summary">Wi-Fi пераважна</string>
+  <!-- WFC, summary for Cellular Preferred -->
   <string name="wfc_mode_cellular_preferred_summary">Сотавы пераважна</string>
+  <!-- WFC, summary for Wi-Fi Only -->
   <string name="wfc_mode_wifi_only_summary">толькі Wi-Fi</string>
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <string name="global_actions_toggle_airplane_mode">Рэжым лёту</string>
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
   <string name="global_action_lockdown">Блакаваць зараз</string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sim_communication">Дазваляе праграме дасылаць каманды да SIM-карткі. Гэта вельмі небяспечна.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_transmitIr">выкарыстанне інфрачырвонай перадачы</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="tablet">Дазваляе праграме выкарыстоўваць інфрачырвоны перадатчык планшэту.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="default">Дазваляе праграме выкарыстоўваць інфрачырвоны перадатчык тэлефону.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
   <string name="cancel">Скасаваць</string>
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
   <string name="no">Скасаваць</string>
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_on">УКЛ</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_off">ВЫКЛ</string>
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_deny">Скасаваць</string>
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_cancel">Скасаваць</string>
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
   <string name="error_message_change_not_allowed">Гэтае дзеянне забаронена адміністратарам</string>
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
   <string name="mediasize_iso_a0">ISO A0 (841х1189 мм)</string>
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
   <string name="mediasize_iso_a1">ISO A1 (594х841 мм)</string>
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
   <string name="mediasize_iso_a2">ISO A2 (420х594 мм)</string>
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
   <string name="mediasize_iso_a3">ISO A3 (297х420 мм)</string>
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
   <string name="mediasize_iso_a4">ISO A4 (210x297 мм)</string>
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
   <string name="mediasize_iso_a5">ISO A5 (148x210 мм)</string>
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
   <string name="mediasize_iso_a6">ISO A6 (105x148 мм)</string>
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
   <string name="mediasize_iso_a7">ISO A7 (74x105 мм)</string>
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
   <string name="mediasize_iso_a8">ISO A8 (52x74 мм)</string>
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
   <string name="mediasize_iso_a9">ISO A9 (37x52 мм)</string>
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
   <string name="mediasize_iso_a10">ISO A10 (26x37 мм)</string>
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
   <string name="mediasize_iso_b0">ISO B0 (1000x1414 мм)</string>
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
   <string name="mediasize_iso_b1">ISO B1 (707x1000 мм)</string>
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
   <string name="mediasize_iso_b2">ISO B2 (500x707 мм)</string>
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
   <string name="mediasize_iso_b3">ISO B3 (353x500 мм)</string>
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
   <string name="mediasize_iso_b4">ISO B4 (250x353 мм)</string>
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
   <string name="mediasize_iso_b5">ISO B5 (176x250 мм)</string>
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
   <string name="mediasize_iso_b6">ISO B6 (125x176 мм)</string>
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
   <string name="mediasize_iso_b7">ISO B7 (88x125 мм)</string>
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
   <string name="mediasize_iso_b8">ISO B8 (62x88 мм)</string>
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
   <string name="mediasize_iso_b9">ISO B9 (44x62 мм)</string>
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
   <string name="mediasize_iso_b10">ISO B10 (31x44 мм)</string>
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
   <string name="mediasize_iso_c0">ISO C0 (917x1297 мм)</string>
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
   <string name="mediasize_iso_c1">ISO C1 (648x917 мм)</string>
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
   <string name="mediasize_iso_c2">ISO C2 (458x648 мм)</string>
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
   <string name="mediasize_iso_c3">ISO C3 (324x458 мм)</string>
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
   <string name="mediasize_iso_c4">ISO C4 (229x324 мм)</string>
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
   <string name="mediasize_iso_c5">ISO C5 (162x229 мм)</string>
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
   <string name="mediasize_iso_c6">ISO C6 (114x162 мм)</string>
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
   <string name="mediasize_iso_c7">ISO C7 (81x114 мм)</string>
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
   <string name="mediasize_iso_c8">ISO C8 (57x81 мм)</string>
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
   <string name="mediasize_iso_c9">ISO C9 (40x57 мм)</string>
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
   <string name="mediasize_iso_c10">ISO C10 (28x40 мм)</string>
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
   <string name="mediasize_na_letter">Letter (216x279 мм)</string>
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
   <string name="mediasize_na_gvrnmt_letter">Government Letter (203x267 мм)</string>
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
   <string name="mediasize_na_legal">Legal (216x356 мм)</string>
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
   <string name="mediasize_na_junior_legal">Junior Legal (203x127 мм)</string>
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
   <string name="mediasize_na_ledger">Ledger (432x279 мм)</string>
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
   <string name="mediasize_na_tabloid">Tabloid (279x432 мм)</string>
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
   <string name="mediasize_na_index_3x5">Index Card 3x5 (76x127 мм)</string>
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
   <string name="mediasize_na_index_4x6">Index Card 4x6 (102x152 мм)</string>
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
   <string name="mediasize_na_index_5x8">Index Card 5x8 (127x203 мм)</string>
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
   <string name="mediasize_na_monarch">Monarch (184x267 мм)</string>
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
   <string name="mediasize_na_quarto">Quarto (203x254 мм)</string>
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
   <string name="mediasize_na_foolscap">Foolscap (203x330 мм)</string>
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
   <string name="mediasize_chinese_roc_8k">ROC 8K (270x390 мм)</string>
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
   <string name="mediasize_chinese_roc_16k">ROC 16K (195x270 мм)</string>
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
   <string name="mediasize_chinese_prc_1">PRC 1 (102x165 мм)</string>
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
   <string name="mediasize_chinese_prc_2">PRC 2 (102x176 мм)</string>
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
   <string name="mediasize_chinese_prc_3">PRC 3 (125x176 мм)</string>
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
   <string name="mediasize_chinese_prc_4">PRC 4 (110x208 мм)</string>
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
   <string name="mediasize_chinese_prc_5">PRC 5 (110x220 мм)</string>
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
   <string name="mediasize_chinese_prc_6">PRC 6 (120x320 мм)</string>
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
   <string name="mediasize_chinese_prc_7">PRC 7 (160x230 мм)</string>
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
   <string name="mediasize_chinese_prc_8">PRC 8 (120x309 мм)</string>
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
   <string name="mediasize_chinese_prc_9">PRC 9 (229x324 мм)</string>
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
   <string name="mediasize_chinese_prc_10">PRC 10 (324x458 мм)</string>
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_prc_16k">PRC 16K (146x215 мм)</string>
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_om_pa_kai">Pa Kai (146x215 мм)</string>
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_dai_pa_kai">Dai Pa Kai (275x395 мм)</string>
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_jurro_ku_kai">Jurro Ku Kai (275x395 мм)</string>
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
   <string name="mediasize_japanese_jis_b10">JIS B10 (32x45 мм)</string>
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
   <string name="mediasize_japanese_jis_b9">JIS B9 (45x64 мм)</string>
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
   <string name="mediasize_japanese_jis_b8">JIS B8 (64x91 мм)</string>
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
   <string name="mediasize_japanese_jis_b7">JIS B7 (91x128 мм)</string>
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
   <string name="mediasize_japanese_jis_b6">JIS B6 (128x182 мм)</string>
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
   <string name="mediasize_japanese_jis_b5">JIS B5 (182x257 мм)</string>
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
   <string name="mediasize_japanese_jis_b4">JIS B4 (257x364 мм)</string>
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
   <string name="mediasize_japanese_jis_b3">JIS B3 (364x515 мм)</string>
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
   <string name="mediasize_japanese_jis_b2">JIS B2 (515x728 мм)</string>
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
   <string name="mediasize_japanese_jis_b1">JIS B1 (728x1030 мм)</string>
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
   <string name="mediasize_japanese_jis_b0">JIS B0 (1030x1456 мм)</string>
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
   <string name="mediasize_japanese_jis_exec">JIS Exec (216x330 мм)</string>
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
   <string name="mediasize_japanese_chou4">Chou4 (90x205 мм)</string>
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
   <string name="mediasize_japanese_chou3">Chou3 (120x235 мм)</string>
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
   <string name="mediasize_japanese_chou2">Chou2 (111,1x146 мм)</string>
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
   <string name="mediasize_japanese_hagaki">Hagaki (100x148 мм)</string>
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
   <string name="mediasize_japanese_oufuku">Oufuku (148x200 мм)</string>
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
   <string name="mediasize_japanese_kahu">Kaku (240x322,1 мм)</string>
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
   <string name="mediasize_japanese_kaku2">Kaku2 (240x332 мм)</string>
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
   <string name="mediasize_japanese_you4">You4 (105x235 мм)</string>
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
   <string name="write_fail_reason_cancelled">Скасавана</string>
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
 </resources>
diff --git a/core/res/res/values-bg/cm_strings.xml b/core/res/res/values-bg/cm_strings.xml
index 384826d..8b94d24 100644
--- a/core/res/res/values-bg/cm_strings.xml
+++ b/core/res/res/values-bg/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Снимка на екрана</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">приемай защитени SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Разрешава на приложението да приема входящи защитени SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">Модифициране на списъка със защитени SMS</string>
-  <string name="permdesc_modifyProtectedSmsList">Разрешава на приложението да модифицира списъка с контакти на защитените SMS.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">Разрешава на приложението да модифицира списъка с контакти на защитените SMS съобщения.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Сигурност</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Разрешения, свързани с информацията за защита на устройството.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">Прочетете списъка с блокирани контакти</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Разрешава на приложението да прочетете информацията за телефонни номера, които са блокирани за входящи повиквания или съобщения.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">Промяна на списъка с блокирани контакти</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Разрешава на приложението да промени телефонните номера, които са блокирани за входящи повиквания или съобщения.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Задаване на тапет за заключен екран</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Разрешава на едно приложение да променя тапета на заключения екран.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Рестартиране</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Текущ</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Рестартиране</string>
-  <string name="reboot_recovery">Възстановяване</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">Режим на възстановяване</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Буутлоудър</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Изтегляне</string>
-  <string name="reboot_soft">Бързо рестартиране</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">Софтуерно рестартиране</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Рестартиране</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Таблетът ще се рестартира.</string>
   <string name="reboot_confirm" product="default">Телефонът ще се рестартира.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Рестартиране\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Затворено приложение</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB над мрежата е активиран</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB над USB &amp; мрежата е активирана</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Докоснете за да деактивирате отстраняване на грешки.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s </xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; мрежа</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Мрежа</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Прихвани стартиращите приложения</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s не е инсталиран</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Приоритет</string>
   <string name="silent_mode_none">Без</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Изключена Wi-Fi точка за достъп, поради промяна в абонаментна на СИМ</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Изключете Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Активира или деактивира Защитен режим</string>
   <string name="permdesc_changePrivacyGuardState">Разрешава на приложението да променя статута на поверителност на друго приложение. Когато едно приложение се използва с защита на поверителността, не може да има достъп до персонални данни, като контакти, регистри с повиквания или съобщения.</string>
   <string name="privacy_guard_notification">Защитен режим e активен</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s </xliff:g> няма да можете да получите достъп до лични данни</string>
   <string name="privacy_guard_dialog_title">Защитен режим</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s </xliff:g> бих искал да <xliff:g id="op">%2$s </xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Запомни избора ми</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">достъп до камерата</string>
   <string name="app_ops_access_location">достъп до вашето местоположение</string>
   <string name="app_ops_access_notifications">прочети своите известия</string>
@@ -89,7 +127,7 @@
   <string name="app_ops_read_clipboard">прегледай клипборда</string>
   <string name="app_ops_read_contacts">прегледай контактите</string>
   <string name="app_ops_read_mms">прегледай MMS съобщенията</string>
-  <string name="app_ops_read_sms">прегледай SMS съобщенията</string>
+  <string name="app_ops_read_sms">прегледайте вашите SMS съобщения</string>
   <string name="app_ops_receive_sms">получихте SMS съобщение</string>
   <string name="app_ops_record_audio">записване на звук</string>
   <string name="app_ops_send_mms">Изпращане на MMS съобщение</string>
@@ -127,24 +165,29 @@
   <string name="app_ops_turn_on_screen">включи екрана</string>
   <string name="app_ops_get_accounts">изведи акаунти на устройството</string>
   <string name="app_ops_wifi_change">променете състоянието на Wi-Fi</string>
-  <string name="app_ops_su">получете root достъп</string>
+  <string name="app_ops_su">получете администраторски права</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">За да освободите този екран, докоснете и задръжте бутона назад.</string>
-  <string name="live_display_auto">Автоматичен</string>
-  <string name="live_display_auto_summary">Настройва автоматично температурата на цветовете на екрана след залез и изгрев</string>
-  <string name="live_display_off">Изключен</string>
-  <string name="live_display_off_summary">Деактивира всички корекции</string>
-  <string name="live_display_day">Дневен</string>
-  <string name="live_display_day_summary">Използва само дневните настройки</string>
-  <string name="live_display_night">Нощен</string>
-  <string name="live_display_night_summary">Използва само нощните настройки</string>
-  <string name="live_display_outdoor">На открито (ярко слънце)</string>
-  <string name="live_display_outdoor_summary">Използвай само настройките за открито</string>
-  <string name="live_display_hint">Използването на Адаптивен екран може да помогне за намаляване умората в очите през нощта. Докоснете тук, за да го изпробвате!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Няма свързано устройство</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> устройството е свързано</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s </xliff:g> устройствата са свързани</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Старта на приложението блокиран</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> е блокиран. Докосни за да потвърдиш старта на приложението.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Батерията е напълно заредена</string>
   <string name="notify_battery_fully_charged_text">Изключете зарядното устройството за да удължите живота на батерията.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">Нулиране статистиката на батерията</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Позволява заявление да рестартирате текущите данни за използването на ниско ниво на батерията.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">СИМ картите са променени</string>
+  <string name="uicc_hot_swapped_event_text">Докоснете за да зададете настройките по подразбиране на СИМ картата</string>
 </resources>
diff --git a/core/res/res/values-bn-rBD/cm_strings.xml b/core/res/res/values-bn-rBD/cm_strings.xml
index dd7686b..148a78d 100644
--- a/core/res/res/values-bn-rBD/cm_strings.xml
+++ b/core/res/res/values-bn-rBD/cm_strings.xml
@@ -17,38 +17,76 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">স্ক্রীনসর্ট</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">সুরক্ষিত এসএমএস গৃহীত হবে</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">একটি আগত সুরক্ষিত এসএমএস গ্রহণ করতে অ্যাপটিকে অনুমতি দিন।</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">সংরক্ষিত এসএমএস তালিকা পরিবর্তন করতে সক্ষম</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">নিরাপত্তা</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">ডিভাইসের নিরাপত্তা তথ্য সংক্রান্ত অনুমতি।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">ফোনের নিষিদ্ধ তালিকা পড়ুন</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">একটি অ্যাপকে অভিমুখী কল বা বার্তার জন্য অবরুদ্ধ ফোন নাম্বারের তথ্য পাঠের অনুমতি দিন।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">ফোনের নিষিদ্ধ তালিকা পরিবর্তন করুন</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">একটি অ্যাপকে অভিমুখী কল বা বার্তার জন্য অবরুদ্ধ ফোন নাম্বার পরিবর্তনের অনুমতি দিন।</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">কীগার্ড ওয়ালপেপার নির্ধারণ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">অ্যাপটিকে লক স্ক্রীন ওয়ালপেপার পরিবর্তনের অনুমতি দিন।</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">পুনরায় চালু</string>
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">পুনরায় চালু</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">পুনরুদ্ধার</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">বুটলোডার</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">ডাউনলোড</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">দ্রুত পুনরায় চালু</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">আপনার ট্যাবলেট পুনরায় চালু হবে।</string>
   <string name="reboot_confirm" product="default">আপনার ফোন পুনরায় চালু হবে।</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">পুনরায় চালু হচ্ছে\u2026</string>
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">নেটওয়ার্কের উপর এডিবি সক্রিয়</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">এডিবির উপর ইউএসবি &amp; নেটওয়ার্ক সক্রিয়</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">ডিবাগ নিষ্ক্রিয় করতে স্পর্শ করুন।</string>
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">অগ্রাধিকার</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">ওয়াইফাই বন্ধ করুন</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">গোপনীয়তা রক্ষাকারী সক্রিয় বা নিস্ক্রিয় করুন</string>
   <string name="permdesc_changePrivacyGuardState">অ্যাপটি কে অন্য অ্যাপ পরিবর্তন করার অনুমতি দিন যা গোপনীয়তা রক্ষাকারী সঙ্গে চলমান। যখন একটি অ্যাপ গোপনীয়তা রক্ষাকারী সঙ্গে চলমান থাকে তখন এটি ব্যক্তিগত তথ্য ব্যাবহার করতে পারবে না, যেমন যোগাযোগ, কল লগ, বা বার্তা।</string>
   <string name="privacy_guard_notification">গোপনীয়তা রক্ষাকারী সক্রিয়</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> ব্যাক্তিগত তথ্য ব্যাবহার করতে পারবেন না</string>
   <string name="privacy_guard_dialog_title">গোপনীয়তা রক্ষাকারী</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> করতে চায় <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">ক্যামেরায় প্রবেশাধিকার</string>
   <string name="app_ops_access_location">আপনার অবস্থানে প্রবেশাধিকার</string>
   <string name="app_ops_access_notifications">আপনার নোটিফিকেশানস প্রবেশাধিকার</string>
@@ -87,11 +125,17 @@
   <string name="app_ops_use_voice_volume">ভয়েস কলের ভলিউম নিয়ন্ত্রণ</string>
   <string name="app_ops_write_mms">এমএমএস বার্তা লিখুন</string>
   <string name="app_ops_write_sms">এসএমএস বার্তা লিখুন</string>
-  <string name="live_display_auto">স্বয়ংক্রিয়</string>
-  <string name="live_display_off">বন্ধ</string>
-  <string name="live_display_off_summary">সব সামঞ্জস্যগুলি অক্ষম করুন</string>
-  <string name="live_display_day_summary">শুধু দিবা রূপান্তর নির্ধারণ ব্যবহার করুন</string>
-  <string name="live_display_night_summary">কেবল রাতের রূপান্তর নির্ধারণ ব্যবহার করুন</string>
-  <string name="live_display_outdoor">বহিরঙ্গন (উজ্জ্বল সূর্যালোক)</string>
-  <string name="live_display_outdoor_summary">শুধুমাত্র বহিরঙ্গন রূপান্তর নির্ধারণ ব্যবহার করুন</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">ব্যাটারির পরিসংখ্যান পুনঃবিন্যাস করুন</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-br-rFR/cm_strings.xml b/core/res/res/values-br-rFR/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-br-rFR/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-br-rFR/strings.xml b/core/res/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-br-rFR/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-bs-rBA/cm_strings.xml b/core/res/res/values-bs-rBA/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-bs-rBA/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-bs-rBA/strings.xml b/core/res/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-bs-rBA/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-ca/cm_strings.xml b/core/res/res/values-ca/cm_strings.xml
index a229976..38d14a5 100644
--- a/core/res/res/values-ca/cm_strings.xml
+++ b/core/res/res/values-ca/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Captura de pantalla</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">rebre SMS protegits</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Permet a l\'aplicació rebre un SMS entrant protegit.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modifica la llista d\'SMS protegits</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Permet a l\'aplicació modificar la llista d\'adreces d\'SMS protegits.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Seguretat</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Permisos relacionats amb la informació de seguretat del dispositiu.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">llegeix la llista negra del telèfon</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Permet a una aplicació llegir informació sobre números de telèfon que estan bloquejats per a trucades entrants o missatges.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">canvia la llista negra del telèfon</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Permet a una aplicació canviar els números de telèfon que estan bloquejats per a trucades entrants o missatges.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">estableix el fons de la pantalla de bloqueig</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Permet que una aplicació estableixi el fons de la pantalla de bloqueig.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reinicia</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Actual</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reinicia</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recuperació</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Descàrrega</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Reinici ràpid</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reinicia</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">La teva tauleta es reiniciarà.</string>
   <string name="reboot_confirm" product="default">El teu telèfon es reiniciarà.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">S\'està reiniciant\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplicació matada</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB sobre xarxa habilitat</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB sobre USB i xarxa habilitat</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Toca per deshabilitar la depuració.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; xarxa</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Xarxa</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">interceptar el llançament d\'una aplicació</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s no està instal·lat</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritat</string>
   <string name="silent_mode_none">Cap</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">S\'ha deshabilitat el punt d\'accés Wi-Fi degut a un canvi en la subscripció de la SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Apaga el Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">activa o desactiva el guarda de privacitat</string>
   <string name="permdesc_changePrivacyGuardState">Permet a l\'aplicació fer el canvi d\'estat de privacitat d\'una altra aplicació. Quan una aplicació s\'executa amb el guarda de privacitat, no tindrà accés a les dades personals com els contactes, registres de trucades, o missatges.</string>
   <string name="privacy_guard_notification">Guarda de privacitat actiu</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> no tindrà accés a dades personals</string>
   <string name="privacy_guard_dialog_title">Guarda de privacitat</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> voldria <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Recorda la meva elecció</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">accedir a la càmera</string>
   <string name="app_ops_access_location">accedir a la teva ubicació</string>
   <string name="app_ops_access_notifications">llegir les teves notificacions</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">obtenir els comptes del dispositiu</string>
   <string name="app_ops_wifi_change">canviar l\'estat del Wi-Fi</string>
   <string name="app_ops_su">obtenir accés de superusuari</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Per desancorar aquesta pantalla, toca i aguanta el botó Enrera.</string>
-  <string name="live_display_auto">Automàtic</string>
-  <string name="live_display_auto_summary">Ajusta automàticament la temperatura de color de la pantalla després de la posta de sol i de l\'alba</string>
-  <string name="live_display_off">No</string>
-  <string name="live_display_off_summary">Deshabilita tots els ajustaments</string>
-  <string name="live_display_day">Dia</string>
-  <string name="live_display_day_summary">Utilitza només la configuració de dia</string>
-  <string name="live_display_night">Nit</string>
-  <string name="live_display_night_summary">Utilitza només la configuració de nit</string>
-  <string name="live_display_outdoor">Exterior (sol intens)</string>
-  <string name="live_display_outdoor_summary">Utilitza només la configuració d\'exterior</string>
-  <string name="live_display_hint">LiveDisplay pot ajudar-te a reduir la fatiga ocular i ajudar-te a dormir a la nit. Fes clic aquí per provar-ho!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Cap dispositiu connectat</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositiu connectat</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> dispositius connectats</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Execució de l\'activitat bloquejada</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> està protegit de ser executada. Clica per autentificar i executar l\'aplicació.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Bateria completament carregada</string>
   <string name="notify_battery_fully_charged_text">Desconnecta el teu dispositiu del carregador per millorar la longevitat de la bateria.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">reinicia les estadístiques de la bateria</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permet a una aplicació reiniciar les dades actuals de baix nivell d\'us de la bateria.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Les targetes SIM s\'han canviat</string>
+  <string name="uicc_hot_swapped_event_text">Pica per establir les preferències de la targeta SIM predeterminada</string>
 </resources>
diff --git a/core/res/res/values-cs/cm_strings.xml b/core/res/res/values-cs/cm_strings.xml
index 9395ff9..acfb108 100644
--- a/core/res/res/values-cs/cm_strings.xml
+++ b/core/res/res/values-cs/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Snímek obrazovky</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">přijímat chráněné SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Umožňuje přijímat příchozí chráněné SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">upravit seznam chráněných SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Umožňuje aplikaci upravit seznam adres chráněných SMS.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Zabezpečení</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Oprávnění vztahující se k informacím o zabezpečení zařízení.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">čtení černé listiny telefonu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Umožňuje čtení informací o telefonních číslech, která jsou blokována pro příjem hovorů nebo zpráv.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">změnit černou listinu telefonu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Umožňuje změnit telefonní čísla, která jsou blokována pro příjem hovorů nebo zpráv.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">nastavit tapetu zámku kláves</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Umožní změnit tapetu zámku obrazovky.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Restartovat</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Aktuální</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reboot</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Soft reboot</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Restartovat</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tablet bude restartován.</string>
   <string name="reboot_confirm" product="default">Telefon bude restartován.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Restart\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplikace byla ukončena</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB po síti povoleno</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB přes USB a po síti povoleno</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Dotykem zakázat ladění.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB a síť</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Síť</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">zachytit spuštění aplikace</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">Aplikace %s není nainstalována</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Priorita</string>
   <string name="silent_mode_none">Žádný</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Hotspot Wi\u2011Fi byl kvůli změně připojení SIM vypnut</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Vypnout Wi\u2011Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">povolit či zakázat Ochranu soukromí</string>
   <string name="permdesc_changePrivacyGuardState">Umožní změnit pravidla, zda bude některá aplikace spuštěna v režimu Ochrany soukromí. Pokud je aplikace spuštěna v režimu Ochrany soukromí, tato aplikace nemá umožněn přístup k osobním datům jako jsou kontakty, historie volání nebo zprávy.</string>
   <string name="privacy_guard_notification">Ochrana soukromí aktivní</string>
   <string name="privacy_guard_notification_detail">Aplikaci <xliff:g id="app">%1$s</xliff:g> nebude umožněn přístup k osobním údajům</string>
   <string name="privacy_guard_dialog_title">Ochrana soukromí</string>
   <string name="privacy_guard_dialog_summary">Aplikace <xliff:g id="app">%1$s</xliff:g> se pokouší <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Zapamatovat si volbu</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">používat fotoaparát</string>
   <string name="app_ops_access_location">zjišťovat polohu</string>
   <string name="app_ops_access_notifications">číst upozornění</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">získat účty zařízení</string>
   <string name="app_ops_wifi_change">změna stavu Wi\u2011Fi</string>
   <string name="app_ops_su">získat root přístup</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Chcete-li odebrat tuto obrazovku, podržte tlačítko Zpět.</string>
-  <string name="live_display_auto">Automaticky</string>
-  <string name="live_display_auto_summary">Automaticky upravit teplotu barev obrazovky po západu a východu slunce</string>
-  <string name="live_display_off">Vypnuto</string>
-  <string name="live_display_off_summary">Zakázat všechny úpravy</string>
-  <string name="live_display_day">Den</string>
-  <string name="live_display_day_summary">Nastavení pouze pro den</string>
-  <string name="live_display_night">Noc</string>
-  <string name="live_display_night_summary">Nastavení pouze pro noc</string>
-  <string name="live_display_outdoor">Venku (slunečno)</string>
-  <string name="live_display_outdoor_summary">Nastavení pouze pro venkovní</string>
-  <string name="live_display_hint">LiveDisplay může pomoci proti namáhání očí a také spánku v noci. Dotykem zde tuto funkci můžete vyzkoušet!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Žádné připojené zařízení</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> připojené zařízení</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> připojená zařízení</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Spuštění aktivity zablokováno</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> je chráněna před spuštěním. Dotykem autorizovat spuštění aplikace.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Baterie je nabitá</string>
   <string name="notify_battery_fully_charged_text">Pro zlepšení životnosti baterie odpojte zařízení od nabíječky.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">obnovení statistiky baterie</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Umožní provést obnovení/vyčištění informací o využívání baterie.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Byly vyměněny SIM karty</string>
+  <string name="uicc_hot_swapped_event_text">Dotykem nastavit výchozí předvolby SIM karty</string>
 </resources>
diff --git a/core/res/res/values-csb-rPL/cm_strings.xml b/core/res/res/values-csb-rPL/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-csb-rPL/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-csb-rPL/strings.xml b/core/res/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-csb-rPL/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-cy/cm_strings.xml b/core/res/res/values-cy/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-cy/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-cy/strings.xml b/core/res/res/values-cy/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-cy/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-da/cm_strings.xml b/core/res/res/values-da/cm_strings.xml
index f901c9d..316be92 100644
--- a/core/res/res/values-da/cm_strings.xml
+++ b/core/res/res/values-da/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Skærmbillede</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">modtag beskyttet SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Tillader at app\'en kan modtage en indgående beskyttet SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">rediger beskyttet SMS liste</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Tillader at app\'en kan ændre den beskyttede SMS adresseliste.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sikkerhed</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Tilladelser vedr. enhedens sikkerhedsinformation.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">læs telefonens sortliste</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Tillader en app at læse informationer om telefonnumre, som er blokerede for indgående opkald eller beskeder.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">ændre telefonens sortliste</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Tillader en app at ændre telefonnumre, som er blokerede for indgående opkald eller beskeder.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">angive baggrund til keyguard</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Tillader en app at ændre baggrund for skærmlåsen.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Genstart</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Aktuel</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Genstart</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Blød genstart</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Genstart</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Din tablet vil genstarte.</string>
   <string name="reboot_confirm" product="default">Din telefon vil genstarte.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Genstarter\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">App lukket</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB via netværk aktiveret</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB via USB &amp; netværk aktiveret</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Tryk for at deaktivere fejlretning.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; netværk</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Netværk</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">afbryd app-opstart</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s er ikke installeret</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritet</string>
   <string name="silent_mode_none">Ingen</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Deaktiverede Wi-Fi hotspot på grund af en ændring af dit SIM abonnement</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Slå Wi-Fi fra</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">aktivér eller deaktivér privatlivsvagt</string>
   <string name="permdesc_changePrivacyGuardState">Tillader app\'en at ændre, om en anden app kører med Privatlivsvagt. Når en app kører med Privatlivsvagt, vil den ikke have adgang til personlige data såsom kontakter, opkaldslister eller beskeder.</string>
   <string name="privacy_guard_notification">Privatlivsvagt aktiv</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> vil ikke kunne tilgå personlige data</string>
   <string name="privacy_guard_dialog_title">Privatlivsvagt</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> ønsker at <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Husk mit valg</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">tilgå kameraet</string>
   <string name="app_ops_access_location">tilgå din placering</string>
   <string name="app_ops_access_notifications">læse dine meddelelser</string>
@@ -97,6 +135,7 @@
   <string name="app_ops_start_at_bootup">starte ved opstart</string>
   <string name="app_ops_toast_window">vis toast beskeder</string>
   <string name="app_ops_toggle_bluetooth">tænde/slukke Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">slå mobildata til/fra</string>
   <string name="app_ops_toggle_nfc">NFC til/fra</string>
   <string name="app_ops_toggle_wifi">Wi-Fi til/fra</string>
   <string name="app_ops_use_alarm_volume">kontrollere lydstyrken for alarmer</string>
@@ -113,22 +152,42 @@
   <string name="app_ops_write_sms">skrive en SMS-besked</string>
   <string name="app_ops_use_fingerprint">brug fingeraftryk</string>
   <string name="app_ops_add_voicemail">tilføj en voicemail</string>
+  <string name="app_ops_read_phone_state">tilgå telefon status</string>
   <string name="app_ops_scan_wifi">skan Wi-Fi-netværk</string>
   <string name="app_ops_change_wallpaper">skift baggrund</string>
+  <string name="app_ops_assist_structure">brug hjælpe struktur</string>
+  <string name="app_ops_assist_screenshot">tag et skærmbillede</string>
+  <string name="app_ops_use_body_sensors">brug kropssensorer</string>
+  <string name="app_ops_read_cell_broadcasts">læs celle beskeder</string>
+  <string name="app_ops_mock_location">immitér din placering</string>
+  <string name="app_ops_read_external_storage">læs eksternt lager</string>
+  <string name="app_ops_write_external_storage">skriv eksternt lager</string>
+  <string name="app_ops_turn_on_screen">tænd skærmen</string>
+  <string name="app_ops_get_accounts">hent enhedskonti</string>
+  <string name="app_ops_wifi_change">ændre Wi-Fi tilstand</string>
   <string name="app_ops_su">få root-adgang</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">For at frigøre denne skærm, tryk og hold Tilbage-knappen nede.</string>
-  <string name="live_display_auto">Automatisk</string>
-  <string name="live_display_auto_summary">Justerer automatisk farvetemperaturen på skærmen efter solnedgang og solopgang</string>
-  <string name="live_display_off">Fra</string>
-  <string name="live_display_off_summary">Deaktivere alle justeringer</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Brug kun dag-indstillinger</string>
-  <string name="live_display_night">Nat</string>
-  <string name="live_display_night_summary">Brug kun nat-indstillinger</string>
-  <string name="live_display_outdoor">Udendørs (stærk sol)</string>
-  <string name="live_display_outdoor_summary">Brug kun udendørsindstillinger</string>
-  <string name="live_display_hint">LiveDisplay kan hjælpe med at reducere overanstrengelse af øjnene og hjælpe dig med at sove om natten. Klik her for at prøve det!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ingen tilsluttet enhed</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> tilsluttet enhed</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> tilsluttede enheder</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Aktivitetsstart blokeret</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> er beskyttet mod at blive startet. Tryk for at godkende og starte programmet.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batteriet er fuldt opladet</string>
+  <string name="notify_battery_fully_charged_text">Afbryd din enhed fra opladeren for at forbedre batteriets levetid.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">nulstil batteristatistik</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Tillader en app at nulstille den aktuelle statistik over batteriforbruget.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM-kort er ændret</string>
+  <string name="uicc_hot_swapped_event_text">Tryk for at angive standardindstillinger for SIM-kortet</string>
 </resources>
diff --git a/core/res/res/values-de/cm_strings.xml b/core/res/res/values-de/cm_strings.xml
index 6854614..5209a36 100644
--- a/core/res/res/values-de/cm_strings.xml
+++ b/core/res/res/values-de/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Bildschirmfoto</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">geschützte SMS empfangen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Ermöglicht der App, eine eingehende geschützte SMS zu empfangen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">Liste der geschützten SMS ändern</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Ermöglicht der App, die Adressliste der geschützten SMS zu ändern.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sicherheit</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Berechtigungen im Zusammenhang mit der Gerätesicherheit.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">Sperrliste lesen</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Ermöglicht der App, gesperrte Telefonnummern für eingehende Anrufe oder Nachrichten zu lesen.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">Sperrliste ändern</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Ermöglicht der App, gesperrte Telefonnummern für eingehende Anrufe oder Nachrichten zu ändern.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Sperrbildschirm-Hintergrund ändern</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Ermöglicht der App, den Sperrbildschirm-Hintergrund zu ändern.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Neu starten</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Aktuell</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Neu starten</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Warmstart</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Neu starten</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Ihr Tablet wird neu gestartet.</string>
   <string name="reboot_confirm" product="default">Ihr Telefon wird neu gestartet.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Neustart wird durchgeführt\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Anwendung beendet</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB über Netzwerk aktiviert</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB über USB &amp; Netzwerk aktiviert</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Berühren, um Debugging zu deaktivieren.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB: <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB und Netzwerk</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Netzwerk</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">App-Start verhindern</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s ist nicht installiert</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Wichtig</string>
   <string name="silent_mode_none">Keine</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Der WLAN-Hotspot wurde aufgrund einer SIM-Abonnementänderung deaktiviert.</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">WLAN ausschalten</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Datenschutz aktivieren oder deaktivieren</string>
   <string name="permdesc_changePrivacyGuardState">Ermöglicht der App, den Datenschutz für andere Apps zu aktivieren oder deaktivieren. Eine App mit aktiviertem Datenschutz hat keinen Zugriff auf persönliche Daten wie Kontakte, Nachrichten oder das Anrufprotokoll.</string>
   <string name="privacy_guard_notification">Datenschutz aktiv</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> hat keinen Zugriff auf persönliche Daten</string>
   <string name="privacy_guard_dialog_title">Datenschutz</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> versucht, <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Meine Auswahl merken</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">auf die Kamera zuzugreifen</string>
   <string name="app_ops_access_location">den Standort abzurufen</string>
   <string name="app_ops_access_notifications">auf Benachrichtigungen zuzugreifen</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">Geräte-Konten abzurufen</string>
   <string name="app_ops_wifi_change">WLAN-Status zu ändern</string>
   <string name="app_ops_su">Root-Zugriff zu erhalten</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Zum Lösen dieser Ansicht drücken und halten Sie die Zurück-Taste.</string>
-  <string name="live_display_auto">Automatisch</string>
-  <string name="live_display_auto_summary">Farbtemperatur des Bildschirms nach Sonnenaufgang und Sonnenuntergang automatisch anpassen</string>
-  <string name="live_display_off">Aus</string>
-  <string name="live_display_off_summary">Alle Anpassungen deaktivieren</string>
-  <string name="live_display_day">Tag</string>
-  <string name="live_display_day_summary">Nur Tag-Modus verwenden</string>
-  <string name="live_display_night">Nacht</string>
-  <string name="live_display_night_summary">Nur Nacht-Modus verwenden</string>
-  <string name="live_display_outdoor">Außen (helle Sonne)</string>
-  <string name="live_display_outdoor_summary">Nur Außen-Modus verwenden</string>
-  <string name="live_display_hint">LiveDisplay kann gegen eine Überanstrengung der Augen und beim Schlafen in der Nacht helfen. Klicken Sie hier, um es auszuprobieren!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Kein verbundenes Gerät</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> verbundenes Gerät</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> verbundene Geräte</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Start der Aktivität blockiert</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> ist vom Starten abgehalten worden. Tippen Sie, um sich zu authentifizieren und die App zu starten.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Akku vollständig aufgeladen</string>
   <string name="notify_battery_fully_charged_text">Trennen Sie Ihr Gerät jetzt vom Ladegerät, um die Lebensdauer des Akkus nicht zu beeinträchtigen.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">Akku-Verlaufsdetails zurücksetzen</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Ermöglicht einer App, die Akku-Verlaufsdetails zurückzusetzen.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM-Karten haben sich geändert</string>
+  <string name="uicc_hot_swapped_event_text">Tippen, um die Standardeinstellungen für die SIM-Karte festzulegen</string>
 </resources>
diff --git a/core/res/res/values-el/cm_strings.xml b/core/res/res/values-el/cm_strings.xml
index 931c58a..a872602 100644
--- a/core/res/res/values-el/cm_strings.xml
+++ b/core/res/res/values-el/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Στιγμιότυπο οθόνης</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">λήψη προστατευμένων SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Επιτρέπει στην εφαρμογή να λαμβάνει εισερχόμενα προστατευμένα SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">τροποποίηση λίστας προστατευμένων SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Επιτρέπει στην εφαρμογή την τροποποίηση της λίστας προστατευμένων SMS.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Ασφάλεια</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Δικαιώματα που σχετίζονται με την ασφάλεια των πληροφοριών της συσκευής.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">ανάγνωση της μαύρης λίστας τηλεφώνου</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Επιτρέπει σε μια εφαρμογή την ανάγνωση πληροφοριών σχετικά με τους αριθμούς τηλεφώνου που έχουν αποκλειστεί για εισερχόμενες κλήσεις ή μηνύματα.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">αλλαγή της μαύρης λίστας τηλεφώνου</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Επιτρέπει σε μια εφαρμογή την αλλαγή των αριθμών τηλεφώνου που έχουν αποκλειστεί για εισερχόμενες κλήσεις ή μηνύματα.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">ορισμός ταπετσαρίας οθόνης κλειδώματος</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Επιτρέπει σε μια εφαρμογή την αλλαγή της ταπετσαρίας της οθόνης κλειδώματος.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Επανεκκίνηση</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Τρέχων</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Επανεκκίνηση</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Γρήγορη επανεκκίνηση</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Επανεκκίνηση</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Το tablet σας θα κάνει επανεκκίνηση.</string>
   <string name="reboot_confirm" product="default">Το τηλέφωνό σας θα κάνει επανεκκίνηση.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Επανεκκίνηση\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Η εφαρμογή τερματίστηκε</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB μέσω δικτύου ενεργοποιημένο</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB μέσω USB &amp; δικτύου ενεργοποιημένο</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Αγγίξτε για απενεργοποίηση του εντοπισμού σφαλμάτων.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; δίκτυο</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Δίκτυο</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">παρεμπόδιση έναρξης εφαρμογών</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">Το %s δεν είναι εγκατεστημένο</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Προτεραιότητα</string>
   <string name="silent_mode_none">Κανένα</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Το Wi-Fi hotspot απενεργοποιήθηκε λόγω αλλαγής συνδρομής SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Απενεργοποίηση Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">ενεργοποίηση ή απενεργοποίηση της Προστασίας Απορρήτου</string>
   <string name="permdesc_changePrivacyGuardState">Επιτρέπει στην εφαρμογή τον χειρισμό άλλων εφαρμογών με την Προστασία Απορρήτου. Όταν μια εφαρμογή τρέχει με την Προστασία Απορρήτου, δεν θα έχει πρόσβαση στα προσωπικά σας δεδομένα όπως επαφές, μηνύματα ή το αρχείο κλήσεων.</string>
   <string name="privacy_guard_notification">Προστασία Απορρήτου ενεργή</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> δεν θα μπορεί να έχει πρόσβαση στα προσωπικά σας δεδομένα</string>
   <string name="privacy_guard_dialog_title">Προστασία Απορρήτου</string>
   <string name="privacy_guard_dialog_summary">Το <xliff:g id="app">%1$s</xliff:g> ζητά: <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Απομνημόνευση της επιλογής μου</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">πρόσβαση στην φωτογρ. μηχανή</string>
   <string name="app_ops_access_location">πρόσβαση στην τοποθεσία σας</string>
   <string name="app_ops_access_notifications">ανάγνωση των ειδοποιήσεών σας</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">ανάγνωση λογαριασμών συσκευής</string>
   <string name="app_ops_wifi_change">αλλαγή κατάστασης Wi-Fi</string>
   <string name="app_ops_su">πρόσβαση root</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Για να ξεκαρφιτσώσετε αυτήν την οθόνη, αγγίξτε και κρατήστε πατημένο το πλήκτρο Πίσω.</string>
-  <string name="live_display_auto">Αυτόματη</string>
-  <string name="live_display_auto_summary">Αυτόματη ρύθμιση της θερμοκρασίας χρώματος της οθόνης μετά το ηλιοβασίλεμα και την ανατολή του ηλίου</string>
-  <string name="live_display_off">Απενεργοποιημένη</string>
-  <string name="live_display_off_summary">Απενεργοποίηση όλων των ρυθμίσεων</string>
-  <string name="live_display_day">Ημέρα</string>
-  <string name="live_display_day_summary">Χρήση μόνο των ρυθμίσεων ημέρας</string>
-  <string name="live_display_night">Νύχτα</string>
-  <string name="live_display_night_summary">Χρήση μόνο των ρυθμίσεων νύχτας</string>
-  <string name="live_display_outdoor">Εξωτερικός χώρος (ήλιος)</string>
-  <string name="live_display_outdoor_summary">Χρήση μόνο των ρυθμίσεων εξωτερικού χώρου</string>
-  <string name="live_display_hint">Το LiveDisplay μπορεί να βοηθήσει στη μείωση της κόπωσης των ματιών και να σας βοηθήσει να κοιμηθείτε τη νύχτα. Κάντε κλικ εδώ για να το δοκιμάσετε!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Καμία συνδεδεμένη συσκευή</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> συνδεδεμένη συσκευή</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> συνδεδεμένες συσκευές</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Η εκκίνηση της δραστηριότητας αποκλείστηκε</string>
   <string name="notify_package_component_protected_text">Η εφαρμογή <xliff:g id="app_name">%1$s</xliff:g> είναι προστατευμένη. Πιέστε για έλεγχο ταυτότητας και εκκίνηση της εφαρμογής.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Μπαταρία πλήρως φορτισμένη</string>
   <string name="notify_battery_fully_charged_text">Αποσυνδέστε τη συσκευή από το φορτιστή για να βελτιώσετε τη μακροζωία της μπαταρίας.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">επαναφορά στατιστικών μπαταρίας</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Επιτρέπει σε μια εφαρμογή να κάνει επαναφορά τα χαμηλού επιπέδου δεδομένα χρήσης μπαταρίας.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Οι κάρτες SIM έχουν αλλάξει</string>
+  <string name="uicc_hot_swapped_event_text">Πατήστε για να ορίσετε τις προεπιλεγμένες προτιμήσεις των καρτών</string>
 </resources>
diff --git a/core/res/res/values-en-rAU/cm_strings.xml b/core/res/res/values-en-rAU/cm_strings.xml
index 8eb89c6..1ccf5e4 100644
--- a/core/res/res/values-en-rAU/cm_strings.xml
+++ b/core/res/res/values-en-rAU/cm_strings.xml
@@ -17,43 +17,81 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Screenshot</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">receive protected SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Allows the app to receive an incoming protected SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modify protected SMS list</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Allows the app to modify the protected SMS address list.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Security</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Permissions related to device security information.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">read phone blacklist</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Allows an app to read information about phone numbers that are blocked for incoming calls or messages.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">change phone blacklist</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Allows an app to change the phone numbers that are blocked for incoming calls or messages.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">set keyguard wallpaper</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Allows an app to change the lock screen wallpaper.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reboot</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Current</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reboot</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Soft reboot</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reboot</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Your tablet will reboot.</string>
   <string name="reboot_confirm" product="default">Your phone will reboot.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Rebooting\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">App killed</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB over network enabled</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB over USB &amp; network enabled</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Touch to disable debugging.</string>
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">intercept app launch</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s is not installed</string>
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">enable or disable Privacy Guard</string>
   <string name="permdesc_changePrivacyGuardState">Allows the app to change whether another app runs with Privacy Guard. When an app is running with Privacy Guard, it will not have access to personal data such as contacts, call logs, or messages.</string>
   <string name="privacy_guard_notification">Privacy Guard active</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> will not be able to access personal data</string>
   <string name="privacy_guard_dialog_title">Privacy Guard</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> would like to <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Remember my choice</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">access the camera</string>
   <string name="app_ops_access_location">access your location</string>
   <string name="app_ops_access_notifications">read your notifications</string>
@@ -103,18 +141,19 @@
   <string name="app_ops_write_mms">write an MMS message</string>
   <string name="app_ops_write_sms">write an SMS message</string>
   <string name="app_ops_su">get root access</string>
-  <string name="live_display_auto">Automatic</string>
-  <string name="live_display_auto_summary">Automatically adjust color temperature of screen after sunset and sunrise</string>
-  <string name="live_display_off">Off</string>
-  <string name="live_display_off_summary">Disable all adjustments</string>
-  <string name="live_display_day">Day</string>
-  <string name="live_display_day_summary">Use day settings only</string>
-  <string name="live_display_night">Night</string>
-  <string name="live_display_night_summary">Use night settings only</string>
-  <string name="live_display_outdoor">Outdoor (bright sun)</string>
-  <string name="live_display_outdoor_summary">Use outdoor settings only</string>
-  <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">No connected device</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> connected device</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> connected devices</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-en-rGB/cm_strings.xml b/core/res/res/values-en-rGB/cm_strings.xml
new file mode 100644
index 0000000..34be26c
--- /dev/null
+++ b/core/res/res/values-en-rGB/cm_strings.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <string name="app_ops_toggle_mobile_data">toggle mobile data</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-en-rIN/cm_strings.xml b/core/res/res/values-en-rIN/cm_strings.xml
index e5dadee..7a726eb 100644
--- a/core/res/res/values-en-rIN/cm_strings.xml
+++ b/core/res/res/values-en-rIN/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Screenshot</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">receive protected SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Allows the app to receive an incoming protected SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modify protected SMS list</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Allows the app to modify the protected SMS address list.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Security</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Permissions related to device security information.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">read phone blacklist</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Allows an app to read information about phone numbers that are blocked for incoming calls or messages.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">change phone blacklist</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Allows an app to change the phone numbers that are blocked for incoming calls or messages.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">set keyguard wallpaper</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Allows an app to change the lock screen wallpaper.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reboot</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Current</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reboot</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Soft reboot</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reboot</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Your tablet will reboot.</string>
   <string name="reboot_confirm" product="default">Your phone will reboot.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Rebooting\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">App killed</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB over network enabled</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB over USB &amp; network enabled</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Touch to disable debugging.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; network</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Network</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">intercept app launch</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s is not installed</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Priority</string>
   <string name="silent_mode_none">None</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Disabled Wi-Fi hotspot due to SIM subscription change</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Turn Wi-Fi off</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">enable or disable Privacy Guard</string>
   <string name="permdesc_changePrivacyGuardState">Allows the app to change whether another app runs with Privacy Guard. When an app is running with Privacy Guard, it will not have access to personal data such as contacts, call logs, or messages.</string>
   <string name="privacy_guard_notification">Privacy Guard active</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> will not be able to access personal data</string>
   <string name="privacy_guard_dialog_title">Privacy Guard</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> would like to <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Remember my choice</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">access the camera</string>
   <string name="app_ops_access_location">access your location</string>
   <string name="app_ops_access_notifications">read your notifications</string>
@@ -127,19 +165,22 @@
   <string name="app_ops_get_accounts">get device accounts</string>
   <string name="app_ops_wifi_change">change Wi-Fi state</string>
   <string name="app_ops_su">get root access</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">To unpin this screen, touch and hold the Back button.</string>
-  <string name="live_display_auto">Automatic</string>
-  <string name="live_display_auto_summary">Automatically adjust color temperature of screen after sunset and sunrise</string>
-  <string name="live_display_off">Off</string>
-  <string name="live_display_off_summary">Disable all adjustments</string>
-  <string name="live_display_day">Day</string>
-  <string name="live_display_day_summary">Use day settings only</string>
-  <string name="live_display_night">Night</string>
-  <string name="live_display_night_summary">Use night settings only</string>
-  <string name="live_display_outdoor">Outdoor (bright sun)</string>
-  <string name="live_display_outdoor_summary">Use outdoor settings only</string>
-  <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">No connected device</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> connected device</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> connected devices</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">reset battery statistics</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Allows an application to reset the current low-level battery use data.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-en-rPT/cm_strings.xml b/core/res/res/values-en-rPT/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-en-rPT/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-en-rPT/strings.xml b/core/res/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-en-rPT/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-eo/cm_strings.xml b/core/res/res/values-eo/cm_strings.xml
index 3c9f036..842c264 100644
--- a/core/res/res/values-eo/cm_strings.xml
+++ b/core/res/res/values-eo/cm_strings.xml
@@ -17,109 +17,55 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="global_action_screenshot">Ekrankopio</string>
-  <string name="permlab_receiveProtectedSms">Alvenis protektita SMS</string>
-  <string name="permdesc_receiveProtectedSms">Permesi al la aplikaĵo ricevi alvenintan protektitan SMS.</string>
-  <string name="permlab_modifyProtectedSmsList">ŝanĝi liston de protektitaj SMS</string>
-  <string name="permdesc_modifyProtectedSmsList">Permesi al la aplikaĵo ŝanĝi la liston de protektitaj SMS.</string>
-  <string name="permgrouplab_security">Sekureco</string>
-  <string name="permgroupdesc_security">Permesoj rilataj al aparata sekureca informo.</string>
-  <string name="permlab_readPhoneBlacklist">legi telefonan nigran liston</string>
-  <string name="permdesc_readPhoneBlacklist">Permesas al aplikaĵo lefi informon pri telefon-numeroj, kiuj estas blokitaj por alvenantaj alvokoj aŭ mesaĝoj.</string>
-  <string name="permlab_changePhoneBlacklist">ŝanĝi telefonan nigran liston</string>
-  <string name="permdesc_changePhoneBlacklist">Permesas al aplikaĵo ŝanĝi telefon-numerojn, kiuj estas blokitaj por alvenintaj alvokoj aŭ mesaĝoj.</string>
-  <string name="permlab_setKeyguardWallpaper">difini la ŝlosan ekranfonon</string>
-  <string name="permdesc_setKeyguardWallpaper">Permesas al aplikaĵo ŝanĝi la ŝlosan fonekranon.</string>
-  <string name="global_action_reboot">Relanĉi</string>
-  <string name="global_action_current_user">Nuna</string>
-  <string name="reboot_reboot">Relanĉi</string>
-  <string name="reboot_recovery">Riparado</string>
-  <string name="reboot_bootloader">Praŝargilo</string>
-  <string name="reboot_download">Elŝuti</string>
-  <string name="reboot_soft">Varma relanĉado</string>
-  <string name="reboot_title">Relanĉado</string>
-  <string name="reboot_confirm" product="tablet">Via tabulo relanĉiĝos.</string>
-  <string name="reboot_confirm" product="default">Via telefono relanĉiĝos.</string>
-  <string name="reboot_progress">Relanĉado\u2026</string>
-  <string name="app_killed_message">Aplikaĵo mortigita</string>
-  <string name="adb_net_active_notification_title">reta ADB ŝaltita</string>
-  <string name="adb_both_active_notification_title">ADB sur USB &amp; reto aktiva</string>
-  <string name="adb_active_generic_notification_message">Tuŝeti por malŝalti sencimigon.</string>
-  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
-  <string name="adb_active_custom_tile_both">USB &amp; reto</string>
-  <string name="adb_active_custom_tile_usb">USB</string>
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile_net">Reto</string>
-  <string name="permlab_interceptPackageLaunch">interkapti lanĉadon de aplikaĵo</string>
-  <string name="stylus_app_not_installed">%s ne estas instalita</string>
-  <string name="permlab_changePrivacyGuardState">ŝalti aŭ malsălti protektadon de datumoj</string>
-  <string name="permdesc_changePrivacyGuardState">Permesas al la aplikaĵo ŝanĝi ĉu alia aplikaĵo funkcias kun protektado de datumoj. Kiam aplikaĵo funkcias kun protektado de datumoj, ĝi ne rajtos aliri al personaj datumoj kiel kontaktuloj, protokoloj de alvokoj, aŭ mesaĝoj.</string>
-  <string name="privacy_guard_notification">Protektado de datumoj aktiva</string>
-  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> ne povos aliri personajn datumojn</string>
-  <string name="privacy_guard_dialog_title">Protektado de datumoj</string>
-  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> ŝatus <xliff:g id="op">%2$s</xliff:g>.</string>
-  <string name="permission_remember_choice">Memori mian elekton</string>
-  <string name="app_ops_access_camera">aliri al fotilo</string>
-  <string name="app_ops_access_location">aliri al via loko</string>
-  <string name="app_ops_access_notifications">legi viajn atentigojn</string>
-  <string name="app_ops_activate_vpn">aktivigi VPN</string>
-  <string name="app_ops_auto_start">lanĉiĝi dum sistema ŝaltado</string>
-  <string name="app_ops_delete_call_log">forigi vian protokolon de alvokoj</string>
-  <string name="app_ops_delete_contacts">forigi viajn kontaktulojn</string>
-  <string name="app_ops_delete_mms">forigi viajn MMS mesaĝojn</string>
-  <string name="app_ops_delete_sms">forigi viajn SMS mesaĝojn</string>
-  <string name="app_ops_draw_on_top">movi fenestron supren</string>
-  <string name="app_ops_get_usage_stats">akiri statistikojn pri la uzado de aplikaĵo</string>
-  <string name="app_ops_keep_device_awake">konservi vian aparaton veka</string>
-  <string name="app_ops_make_phone_call">fari voĉan alvokon</string>
-  <string name="app_ops_modify_calendar">ĝistatigi vian kalendaron</string>
-  <string name="app_ops_modify_call_log">ĝisdatigi la protokolon de alvokoj</string>
-  <string name="app_ops_modify_clipboard">ŝanĝi la tondejon</string>
-  <string name="app_ops_modify_contacts">ĝisdatiĝi viajn kontaktulojn</string>
-  <string name="app_ops_modify_settings">ĝisdatigi sisteman agordon</string>
-  <string name="app_ops_mute_unmute_microphone">mutigi/malmutigi la mikrofonon</string>
-  <string name="app_ops_play_audio">ludi sonojn</string>
-  <string name="app_ops_post_notification">sendi atentigon</string>
-  <string name="app_ops_project_media">projetko medio</string>
-  <string name="app_ops_read_calendar">legi vian kalendaron</string>
-  <string name="app_ops_read_call_log">legi la protokolon de alvokoj</string>
-  <string name="app_ops_read_clipboard">legi la tondejon</string>
-  <string name="app_ops_read_contacts">legi viajn kontaktulojn</string>
-  <string name="app_ops_read_mms">legi viajn MMS mesaĝojn</string>
-  <string name="app_ops_read_sms">legi viajn SMS mesaĝojn</string>
-  <string name="app_ops_receive_sms">ricevi SMS mesaĝon</string>
-  <string name="app_ops_record_audio">registri sonon</string>
-  <string name="app_ops_send_mms">sendi MMS mesaĝon</string>
-  <string name="app_ops_send_sms">sendi SMS mesaĝon</string>
-  <string name="app_ops_start_at_bootup">lanĉiĝi dum sistema ŝaltado</string>
-  <string name="app_ops_toast_window">afiŝi atentigojn</string>
-  <string name="app_ops_toggle_bluetooth">(mal)ŝalti Bludenton</string>
-  <string name="app_ops_toggle_nfc">(mal)ŝalti NFC</string>
-  <string name="app_ops_use_alarm_volume">kontroli laŭtecon de alarmoj</string>
-  <string name="app_ops_use_audio_focus">kontroli sonan fokuson</string>
-  <string name="app_ops_use_bluetooth_volume">kontroli laŭtecon de Bludento</string>
-  <string name="app_ops_use_master_volume">kontroli la cêfan laŭtecon</string>
-  <string name="app_ops_use_media_buttons">uzi la aŭdvidajn butonojn</string>
-  <string name="app_ops_use_media_volume">kontroli laŭtecon de aŭdvidaj</string>
-  <string name="app_ops_use_notification_volume">kontroli laŭtecon de atentigoj</string>
-  <string name="app_ops_use_ring_volume">kontroli laŭtecon de sonoro</string>
-  <string name="app_ops_use_vibrate">uzi tuŝeblan retroefikon</string>
-  <string name="app_ops_use_voice_volume">kontroli laŭtecon de voĉaj alvokoj</string>
-  <string name="app_ops_write_mms">skribi MMS-mesaĝon</string>
-  <string name="app_ops_write_sms">skribi SMS-mesaĝon</string>
-  <string name="app_ops_su">akiri radikuzantajn permesojn</string>
-  <string name="lock_to_app_toast_no_navbar">Por malŝlosi tiun ekranon, tuŝetu kaj tenu la Reen butonon.</string>
-  <string name="live_display_auto">Aŭtomata</string>
-  <string name="live_display_auto_summary">Aŭtomate alĝustigi kolortemperaturon de la ekrano post sunsubiro kaj suniĝo</string>
-  <string name="live_display_off">For</string>
-  <string name="live_display_off_summary">Malŝalti ĉiujn ĝustigojn</string>
-  <string name="live_display_day">Tago</string>
-  <string name="live_display_day_summary">Uzi nur tagajn agordojn</string>
-  <string name="live_display_night">Nokto</string>
-  <string name="live_display_night_summary">Uzi nur noktajn agordojn</string>
-  <string name="live_display_outdoor">Ekstere (brila suno)</string>
-  <string name="live_display_outdoor_summary">Uzi nur eksterajn parametrojn</string>
-  <string name="live_display_hint">LiveDisplay povas helpi vin malgrandigi okulo-streĉon nokte. Alklaku tie por provi!</string>
-  <string name="tethered_notification_no_device_message">Neniu konektata aparato</string>
-  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> konektita aparato</string>
-  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> konektitaj aparatoj</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-eo/strings.xml b/core/res/res/values-eo/strings.xml
index 907df4e..f58ee6e 100644
--- a/core/res/res/values-eo/strings.xml
+++ b/core/res/res/values-eo/strings.xml
@@ -19,206 +19,1731 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
   <string name="byteShort">B</string>
-  <string name="kilobyteShort">KB</string>
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <string name="kilobyteShort">kB</string>
+  <!-- Suffix added to a number to signify size in megabytes. -->
   <string name="megabyteShort">MB</string>
+  <!-- Suffix added to a number to signify size in gigabytes. -->
   <string name="gigabyteShort">GB</string>
+  <!-- Suffix added to a number to signify size in terabytes. -->
   <string name="terabyteShort">TB</string>
+  <!-- Suffix added to a number to signify size in petabytes. -->
   <string name="petabyteShort">PB</string>
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <string name="durationDays"><xliff:g id="days">%1$d</xliff:g> tagoj</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <string name="durationDayHours"><xliff:g id="days">%1$d</xliff:g> tago
+            <xliff:g id="hours">%2$d</xliff:g> horoj</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <string name="durationDayHour"><xliff:g id="days">%1$d</xliff:g> tago
+            <xliff:g id="hours">%2$d</xliff:g> horo</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <string name="durationHours"><xliff:g id="hours">%1$d</xliff:g> horoj</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
   <string name="untitled">&lt;Sentitola&gt;</string>
+  <!-- How to display the lack of a phone number -->
   <string name="emptyPhoneNumber">(Neniu telefonnumero)</string>
-  <string name="unknownName">Nekonate</string>
-  <string name="defaultVoiceMailAlphaTag">Voĉa mesaĝo</string>
-  <string name="passwordIncorrect">Nekorekta pasvorto.</string>
-  <string name="mmiComplete">MMI kompleta.</string>
-  <string name="badPin">La malnova PIN kiun vi tajpis estas nekorekta.</string>
+  <!-- How to display the lack of a name -->
+  <string name="unknownName">Nekonata</string>
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <string name="passwordIncorrect">Malĝusta pasvorto.</string>
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
   <string name="imei">IMEI</string>
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
   <string name="meid">MEID</string>
-  <string name="PwdMmi">Pasvorta ŝanĝo</string>
-  <string name="PinMmi">Ŝanĝo de PIN</string>
-  <string name="DndMmi">Ne ĝenu</string>
-  <string name="serviceClassData">Datumo</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <string name="wfcSpnFormat">%s</string>
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <string name="wfcDataSpnFormat">%s</string>
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Mi</string>
-  <string name="recent_tasks_title">Lasttempaj</string>
-  <string name="global_action_bug_report">Cimraporto</string>
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <string name="global_actions_toggle_airplane_mode">Aviadila reĝimo</string>
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
   <string name="global_action_settings">Agordoj</string>
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <string name="status_bar_notification_info_overflow">999+</string>
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
   <string name="safeMode">Sekura reĝimo</string>
-  <string name="managed_profile_label">Laborejo</string>
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_contacts">Kontaktoj</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_location">Loko</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_calendar">Kalendaro</string>
-  <string name="permgrouplab_storage">Memorilo</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_microphone">Mikrofono</string>
-  <string name="permgroupdesc_microphone">registri sonon</string>
-  <string name="permgrouplab_camera">Fotilo</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_phone">Telefono</string>
-  <string name="permlab_readContacts">legi viajn kontaktulojn</string>
-  <string name="permlab_readCallLog">legi alvokan protokolon</string>
-  <string name="permlab_recordAudio">registri sonon</string>
-  <string name="permlab_accessNotifications">atingi atentigojn</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_killBackgroundProcesses">fermi aliajn aplikaĵojn</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readContacts">legi viajn kontaktojn</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
   <string name="phoneTypeCustom">Propra</string>
-  <string name="phoneTypeHome">Hejmo</string>
-  <string name="phoneTypeWork">Laborejo</string>
-  <string name="phoneTypeFaxWork">Laboreja faksilo</string>
-  <string name="phoneTypeFaxHome">Hejma faksilo</string>
-  <string name="phoneTypePager">Televokilo</string>
-  <string name="phoneTypeOther">Aliaj</string>
-  <string name="phoneTypeCallback">Revoko</string>
-  <string name="phoneTypeCar">Aŭtomobilo</string>
-  <string name="phoneTypeOtherFax">Plia telekopiilo</string>
-  <string name="phoneTypeTelex">Telekso</string>
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
   <string name="eventTypeCustom">Propra</string>
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
   <string name="eventTypeBirthday">Naskiĝtago</string>
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
   <string name="eventTypeAnniversary">Datreveno</string>
-  <string name="eventTypeOther">Aliaj</string>
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
   <string name="emailTypeCustom">Propra</string>
-  <string name="emailTypeHome">Hejmo</string>
-  <string name="emailTypeWork">Laborejo</string>
-  <string name="emailTypeOther">Aliaj</string>
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
   <string name="postalTypeCustom">Propra</string>
-  <string name="postalTypeHome">Hejmo</string>
-  <string name="postalTypeWork">Laborejo</string>
-  <string name="postalTypeOther">Aliaj</string>
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
   <string name="imTypeCustom">Propra</string>
-  <string name="imTypeHome">Hejmo</string>
-  <string name="imTypeWork">Laborejo</string>
-  <string name="imTypeOther">Aliaj</string>
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
   <string name="imProtocolCustom">Propra</string>
-  <string name="orgTypeWork">Laborejo</string>
-  <string name="orgTypeOther">Aliaj</string>
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
   <string name="orgTypeCustom">Propra</string>
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
   <string name="relationTypeCustom">Propra</string>
-  <string name="relationTypeChild">Ido</string>
-  <string name="relationTypeManager">Estro</string>
-  <string name="relationTypeSpouse">Edz(in)o</string>
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <string name="relationTypeBrother">Frato</string>
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <string name="relationTypeFather">Patro</string>
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <string name="relationTypeFriend">Amiko</string>
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <string name="relationTypeMother">Patrino</string>
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <string name="relationTypeSister">Fratino</string>
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
   <string name="sipAddressTypeCustom">Propra</string>
-  <string name="sipAddressTypeHome">Hejmo</string>
-  <string name="sipAddressTypeWork">Laborejo</string>
-  <string name="sipAddressTypeOther">Aliaj</string>
-  <string name="lockscreen_pattern_wrong">Provu denove</string>
-  <string name="lockscreen_password_wrong">Provu denove</string>
-  <string name="lockscreen_transport_pause_description">Paŭzi</string>
-  <string name="lockscreen_transport_play_description">Ludi</string>
-  <string name="lockscreen_transport_stop_description">Haltigi</string>
-  <string name="lockscreen_transport_rew_description">Reen</string>
-  <string name="emergency_calls_only" msgid="2485604591272668370">Nur urĝaj alvokoj</string>
-  <string name="lockscreen_glogin_username_hint">Uzantnomo (retmesaĝo)</string>
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <string name="lockscreen_pattern_wrong">Reprovi</string>
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <string name="lockscreen_password_wrong">Reprovi</string>
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_password_hint">Pasvorto</string>
-  <string name="lockscreen_glogin_submit_button">Aliĝi</string>
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
   <string name="lockscreen_unlock_label">Malŝlosi</string>
-  <string name="keyguard_accessibility_widget_empty_slot">Malplene</string>
-  <string name="keyguard_accessibility_status">Stato</string>
-  <string name="keyguard_accessibility_camera">Fotilo</string>
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <string name="keyguard_accessibility_widget_empty_slot">Malplena</string>
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_word">vorto</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
   <string name="hour_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="pm">%P</xliff:g>"</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
   <string name="hour_cap_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="PM">%p</xliff:g>"</string>
-  <string name="factorytest_reboot">Restartigi</string>
-  <string name="save_password_label">Konfirmi</string>
-  <string name="autofill_state">Stato</string>
-  <string name="autofill_department">Distrikto</string>
-  <string name="autofill_area">Areo</string>
-  <string name="save_password_notnow">Ne nun</string>
-  <string name="save_password_remember">Memorigi</string>
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <string name="autofill_address_name_separator">\u0020</string>
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <string name="autofill_address_summary_separator">,\u0020</string>
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <string name="autofill_country_re">country|location<!-- ja-JP -->|国<!-- zh-CN -->|国家</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <string name="autofill_username_re">user.?name|user.?id<!-- de-DE -->|vollständiger.?name<!-- zh-CN -->|用户名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
   <string name="save_password_never">Neniam</string>
-  <string name="menu_space_shortcut_label">spaco</string>
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">forigi</string>
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Serĉi</string>
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_search">Serĉi</string>
-  <string name="searchview_description_voice">Voĉa serĉado</string>
-  <string name="oneMonthDurationPast">antaŭ 1 monato</string>
-  <string name="last_month">Lastmonate</string>
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
   <string name="day">tago</string>
+  <!-- Appened to express the value is this unit of time: plural days -->
   <string name="days">tagoj</string>
+  <!-- Appened to express the value is this unit of time: singular hour -->
   <string name="hour">horo</string>
+  <!-- Appened to express the value is this unit of time: plural hours -->
   <string name="hours">horoj</string>
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
   <string name="week">semajno</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="weeks">semajnoj</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="year">jaro</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="years">jaroj</string>
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <plurals name="duration_seconds">
+    <item quantity="one">1 sekundo</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> sekundoj</item>
+  </plurals>
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
   <string name="relative_time">"<xliff:g id="date" example="4 hours ago">%1$s</xliff:g>, <xliff:g id="time" example="11:00 am">%2$s</xliff:g>"</string>
-  <string name="selectAll">Elekti ĉiujn</string>
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <string name="elapsed_time_short_format_mm_ss"><xliff:g id="minutes" example="1">%1$02d</xliff:g>:<xliff:g id="seconds" example="23">%2$02d</xliff:g></string>
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <string name="elapsed_time_short_format_h_mm_ss"><xliff:g id="hours" example="1">%1$d</xliff:g>:<xliff:g id="minutes" example="43">%2$02d</xliff:g>:<xliff:g id="seconds" example="33">%3$02d</xliff:g></string>
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
   <string name="cut">Eltondi</string>
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
   <string name="copy">Kopii</string>
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
   <string name="paste">Alglui</string>
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
   <string name="delete">Forigi</string>
-  <string name="copyUrl">Kopii la URL-on</string>
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
   <string name="deleteText">Forigi</string>
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
   <string name="cancel">Nuligi</string>
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
   <string name="no">Nuligi</string>
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
   <string name="loading">Ŝarĝado\u2026</string>
-  <string name="capital_on">EK</string>
-  <string name="capital_off">FOR</string>
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
   <string name="whichViewApplication">Malfermi per</string>
-  <string name="force_close">Konfirmi</string>
-  <string name="screen_compat_mode_scale">Skali</string>
-  <string name="volume_music">Aŭdvida laŭteco</string>
-  <string name="volume_alarm">Laŭteco de alarmo</string>
-  <string name="volume_notification">Atentiga laŭteco</string>
-  <string name="volume_icon_description_bluetooth">Bludanta laŭteco</string>
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_yes">Permesi</string>
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Malpermesi</string>
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_allow">Sendi</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_deny">Nuligi</string>
-  <string name="sms_short_code_remember_choice">Memori mian elekton</string>
-  <string name="sim_done_button">Farite</string>
-  <string name="sim_restart_button">Restartigi</string>
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_set">Agordi</string>
-  <string name="date_time_done">Farite</string>
-  <string name="dlg_ok">Konfirmi</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
   <string name="hardware">Aparataro</string>
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <string name="ext_media_status_removed">Forigita</string>
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
   <string name="ime_action_go">Ek</string>
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
   <string name="ime_action_search">Serĉi</string>
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
   <string name="ime_action_send">Sendi</string>
-  <string name="ime_action_next">Sekva</string>
-  <string name="ime_action_done">Farite</string>
-  <string name="ime_action_default">Lanĉi</string>
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
   <string name="allow">Permesi</string>
   <string name="deny">Malpermesi</string>
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
   <string name="accessibility_binding_label">Alirebleco</string>
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
   <string name="upload_file">Elekti dosieron</string>
-  <string name="reset">Reagordi</string>
-  <string name="submit">Sendi</string>
-  <string name="back_button_label">Reen</string>
-  <string name="next_button_label">Sekva</string>
-  <string name="skip_button_label">Preterpasi</string>
-  <string name="action_mode_done">Farite</string>
-  <string name="progress_erasing" product="nosdcard">Forviŝado de USB-memorilo\u2026</string>
-  <string name="progress_erasing" product="default">Forviŝado de la SD-karto\u2026</string>
-  <string name="share">Komunigi</string>
-  <string name="find">Serĉi</string>
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <string name="share">Konigi</string>
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
   <string name="gpsVerifYes">Jes</string>
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
   <string name="gpsVerifNo">Ne</string>
-  <string name="keyboardview_keycode_alt">Alt-klavo</string>
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_cancel">Nuligi</string>
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Forigi</string>
-  <string name="keyboardview_keycode_done">Farite</string>
-  <string name="keyboardview_keycode_shift">Majuskliga klavo</string>
-  <string name="action_menu_overflow_description">Pliaj opcioj</string>
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <string name="action_bar_home_description_format">%1$s, %2$s</string>
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
   <string name="storage_sd_card">SD-karto</string>
-  <string name="storage_usb">USB memorilo</string>
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <string name="fingerprints">Fingrospuroj:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
   <string name="list_delimeter">", "</string>
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_always">Ĉiam</string>
-  <string name="default_audio_route_name" product="tablet">Tabulkomputilo</string>
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="default">Telefono</string>
-  <string name="default_audio_route_name_headphones">Kapaŭskultilo</string>
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
   <string name="default_audio_route_category_name">Sistemo</string>
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
   <string name="media_route_chooser_extended_settings">Agordoj</string>
-  <string name="media_route_controller_disconnect">Malkonekti</string>
-  <string name="media_route_status_available">Disponebla</string>
-  <string name="media_route_status_not_available">Ne atingebla</string>
-  <string name="kg_login_username_hint">Uzantnomo (retmesaĝo)</string>
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_password_hint">Pasvorto</string>
-  <string name="kg_login_submit_button">Aliĝi</string>
-  <string name="kg_login_checking_password">Kontrolado de konto\u2026</string>
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
   <string name="kg_text_message_separator" product="default">" \u2014 "</string>
+  <!-- The delete-widget drop target button text -->
   <string name="kg_reordering_delete_drop_target_text">Forigi</string>
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
   <string name="owner_name" msgid="3879126011135546571">Posedanto</string>
+  <!-- Error message title [CHAR LIMIT=35] -->
   <string name="error_message_title">Eraro</string>
-  <string name="revoke">Senvalidigi</string>
-  <string name="mediasize_na_gvrnmt_letter">Regada letero</string>
-  <string name="mediasize_na_legal">Laŭleĝa avizo</string>
-  <string name="mediasize_na_tabloid">Etformata gazeto</string>
-  <string name="write_fail_reason_cancelled">Nuligite</string>
-  <string name="reason_unknown">nekonate</string>
-  <string name="done_label">Farite</string>
-  <string name="zen_mode_feature_name">Ne ĝenu</string>
-  <string name="floating_toolbar_open_overflow_description">Pliaj opcioj</string>
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <string name="write_fail_reason_cancelled">Nuligita</string>
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <string name="reason_unknown">nekonata</string>
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
 </resources>
diff --git a/core/res/res/values-es-rCO/cm_strings.xml b/core/res/res/values-es-rCO/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-es-rCO/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-es-rCO/strings.xml b/core/res/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-es-rCO/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-es-rMX/cm_strings.xml b/core/res/res/values-es-rMX/cm_strings.xml
new file mode 100644
index 0000000..f1ca093
--- /dev/null
+++ b/core/res/res/values-es-rMX/cm_strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <string name="app_ops_toggle_mobile_data">conmutar datos móviles</string>
+  <string name="app_ops_toggle_wifi">conmutar Wi-Fi</string>
+  <string name="app_ops_use_fingerprint">usar huella digital</string>
+  <string name="app_ops_add_voicemail">añadir un mensaje de voz</string>
+  <string name="app_ops_read_phone_state">acceder al estado del teléfono</string>
+  <string name="app_ops_scan_wifi">buscar redes Wi-Fi</string>
+  <string name="app_ops_change_wallpaper">cambiar fondo de pantalla</string>
+  <string name="app_ops_assist_structure">usar estructura de asistencia</string>
+  <string name="app_ops_assist_screenshot">tomar captura de pantalla</string>
+  <string name="app_ops_use_body_sensors">usar sensores corporales</string>
+  <string name="app_ops_read_cell_broadcasts">leer transmisiones celulares</string>
+  <string name="app_ops_mock_location">simular ubicación</string>
+  <string name="app_ops_read_external_storage">leer almacenamiento externo</string>
+  <string name="app_ops_write_external_storage">escribir en almacenamiento externo</string>
+  <string name="app_ops_turn_on_screen">encender la pantalla</string>
+  <string name="app_ops_get_accounts">obtener cuentas del dispositivo</string>
+  <string name="app_ops_wifi_change">cambiar el estado de Wi-Fi</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Lanzamiento de la actividad bloqueado</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s </xliff:g> está protegido de ser lanzado. Haz clic para autenticar e iniciar la aplicación.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batería completamente cargada</string>
+  <string name="notify_battery_fully_charged_text">Desconecte su dispositivo del cargador para mejorar la longevidad de la batería.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Las tarjetas SIM han cambiado</string>
+  <string name="uicc_hot_swapped_event_text">Toca para establecer preferencias por defecto de la tarjeta SIM</string>
+</resources>
diff --git a/core/res/res/values-es-rMX/strings.xml b/core/res/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-es-rMX/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-es-rUS/cm_strings.xml b/core/res/res/values-es-rUS/cm_strings.xml
new file mode 100644
index 0000000..74e70ab
--- /dev/null
+++ b/core/res/res/values-es-rUS/cm_strings.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">Captura de pantalla</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_receiveProtectedSms">recibir SMS protegidos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">Permite que la aplicación reciba mensajes SMS entrantes protegidos.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">modificar lista de SMS protegidos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">Permite que la aplicación modifique la lista de contactos SMS protegida.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_security">Seguridad</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">Permisos relacionados con la información de seguridad del dispositivo.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">leer lista negra del teléfono</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">Permite que la aplicación lea la información sobre los números de teléfono bloqueados de llamadas o mensajes entrantes.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">cambiar la lista negra del teléfono</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">Permite que la aplicación cambie los números de teléfono bloqueados de llamadas o mensajes entrantes.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">establecer fondo de pantalla de bloqueo</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">Permite que una aplicación establezca el fondo de pantalla bloqueada.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">Reiniciar</string>
+  <!-- label for current user in phone options dialog -->
+  <string name="global_action_current_user">Actual</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">Reiniciar</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">Modo Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">Modo Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">Descargas</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">Reinicio rápido</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">Reiniciar</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">Tu tablet se reiniciará.</string>
+  <string name="reboot_confirm" product="default">Tu teléfono se reiniciará.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">Reiniciando\u2026</string>
+  <!-- Long-press back kill application -->
+  <string name="app_killed_message">Aplicación finalizada</string>
+  <!-- ADB over network notification -->
+  <string name="adb_net_active_notification_title">ADB sobre red activado</string>
+  <!-- ADB over USB and network notification -->
+  <string name="adb_both_active_notification_title">ADB sobre USB y red activado</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">Toca para desactivar la depuración.</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB y red</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">Red</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">interceptar la ejecución de aplicaciones</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s no está instalado</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">Prioridad</string>
+  <string name="silent_mode_none">Ninguno</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">Zona Wi-Fi desactivada debido a un cambio de suscripción en la SIM</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Desactivar Wi-Fi</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">activar o desactivar Privacy Guard</string>
+  <string name="permdesc_changePrivacyGuardState">Permite que la aplicación modifique si otra aplicación se ejecuta con Privacy Guard. Cuando una aplicación se ejecuta con Privacy Guard, no tendrá acceso a datos personales como contactos, registros de llamadas o mensajes.</string>
+  <string name="privacy_guard_notification">Privacy Guard activada</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> no podrá acceder a los datos personales</string>
+  <string name="privacy_guard_dialog_title">Privacidad</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> quisiera <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">Recordar mi elección</string>
+  <!-- App ops requests -->
+  <string name="app_ops_access_camera">acceder a la cámara</string>
+  <string name="app_ops_access_location">acceder a tu ubicación</string>
+  <string name="app_ops_access_notifications">leer tus notificaciones</string>
+  <string name="app_ops_activate_vpn">activar VPN</string>
+  <string name="app_ops_auto_start">ejecutarse al inicio</string>
+  <string name="app_ops_delete_call_log">borrar el registro de llamadas</string>
+  <string name="app_ops_delete_contacts">borrar tus contactos</string>
+  <string name="app_ops_delete_mms">borrar tus mensajes MMS</string>
+  <string name="app_ops_delete_sms">borrar tus mensajes SMS</string>
+  <string name="app_ops_draw_on_top">dibujar arriba</string>
+  <string name="app_ops_get_usage_stats">obtener estadísticas de uso de aplicaciones</string>
+  <string name="app_ops_keep_device_awake">mantener el dispositivo activado</string>
+  <string name="app_ops_make_phone_call">hacer una llamada telefónica</string>
+  <string name="app_ops_modify_calendar">actualizar el calendario</string>
+  <string name="app_ops_modify_call_log">actualizar el registro de llamadas</string>
+  <string name="app_ops_modify_clipboard">modificar el portapapeles</string>
+  <string name="app_ops_modify_contacts">actualizar tus contactos</string>
+  <string name="app_ops_modify_settings">actualizar configuración del sistema</string>
+  <string name="app_ops_mute_unmute_microphone">silenciar / activar el micrófono</string>
+  <string name="app_ops_play_audio">reproducir el audio</string>
+  <string name="app_ops_post_notification">publicar una notificación</string>
+  <string name="app_ops_project_media">proyectar medios</string>
+  <string name="app_ops_read_calendar">leer el calendario</string>
+  <string name="app_ops_read_call_log">leer el registro de llamadas</string>
+  <string name="app_ops_read_clipboard">leer el portapapeles</string>
+  <string name="app_ops_read_contacts">leer contactos</string>
+  <string name="app_ops_read_mms">leer mensajes MMS</string>
+  <string name="app_ops_read_sms">leer mensajes SMS</string>
+  <string name="app_ops_receive_sms">recibir un mensaje SMS</string>
+  <string name="app_ops_record_audio">grabar audio</string>
+  <string name="app_ops_send_mms">enviar un mensaje MMS</string>
+  <string name="app_ops_send_sms">enviar un mensaje SMS</string>
+  <string name="app_ops_start_at_bootup">iniciar en el encendido</string>
+  <string name="app_ops_toast_window">mostrar mensajes toast</string>
+  <string name="app_ops_toggle_bluetooth">activar/desactivar la conexión Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">conmutar los datos móviles</string>
+  <string name="app_ops_toggle_nfc">activar/desactivar el NFC</string>
+  <string name="app_ops_toggle_wifi">activar/desactivar Wi-Fi</string>
+  <string name="app_ops_use_alarm_volume">controlar del volumen de la alarma</string>
+  <string name="app_ops_use_audio_focus">controlar el foco de audio</string>
+  <string name="app_ops_use_bluetooth_volume">controlar el volumen del Bluetooth</string>
+  <string name="app_ops_use_master_volume">controlar el volumen principal</string>
+  <string name="app_ops_use_media_buttons">usar los botones multimedia</string>
+  <string name="app_ops_use_media_volume">controlar el volumen multimedia</string>
+  <string name="app_ops_use_notification_volume">controlar el volumen de notificaciones</string>
+  <string name="app_ops_use_ring_volume">controlar el volumen del tono de llamada</string>
+  <string name="app_ops_use_vibrate">usar la respuesta háptica</string>
+  <string name="app_ops_use_voice_volume">controlar el volumen de las llamadas de voz</string>
+  <string name="app_ops_write_mms">escribir un mensaje MMS</string>
+  <string name="app_ops_write_sms">escribir un mensaje SMS</string>
+  <string name="app_ops_use_fingerprint">usar huella digital</string>
+  <string name="app_ops_add_voicemail">añadir un mensaje de voz</string>
+  <string name="app_ops_read_phone_state">acceder al estado del teléfono</string>
+  <string name="app_ops_scan_wifi">buscar redes Wi-Fi</string>
+  <string name="app_ops_change_wallpaper">cambiar el fondo de pantalla</string>
+  <string name="app_ops_assist_structure">utilizar estructura de asistencia</string>
+  <string name="app_ops_assist_screenshot">tomar una captura de pantalla</string>
+  <string name="app_ops_use_body_sensors">utilizar sensores corporales</string>
+  <string name="app_ops_read_cell_broadcasts">leer transmisiones celulares</string>
+  <string name="app_ops_mock_location">simular ubicación</string>
+  <string name="app_ops_read_external_storage">leer en almacenamiento externo</string>
+  <string name="app_ops_write_external_storage">escribir en almacenamiento externo</string>
+  <string name="app_ops_turn_on_screen">encender la pantalla</string>
+  <string name="app_ops_get_accounts">obtener cuentas del dispositivo</string>
+  <string name="app_ops_wifi_change">cambiar el estado de Wi-Fi</string>
+  <string name="app_ops_su">obtener acceso root</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">Para desanclar esta pantalla, mantén pulsado el botón Atrás.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">Ningún dispositivo conectado</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo conectado</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivos conectados</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Inicio de actividad bloqueado</string>
+  <string name="notify_package_component_protected_text">El inicio de <xliff:g id="app_name">%1$s </xliff:g> está protegido. Hacer clic para autenticar e iniciar la aplicación.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batería completamente cargada</string>
+  <string name="notify_battery_fully_charged_text">Desconectar el dispositivo del cargador para mejorar la vida útil de la batería.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">restablecer estadísticas de batería</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permite que la aplicación restablezca los datos actuales de uso de la batería.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Las tarjetas SIM han cambiado</string>
+  <string name="uicc_hot_swapped_event_text">Pulsar para establecer preferencias predeterminadas de tarjeta SIM</string>
+</resources>
diff --git a/core/res/res/values-es/cm_strings.xml b/core/res/res/values-es/cm_strings.xml
index eba3ba5..e602fd4 100644
--- a/core/res/res/values-es/cm_strings.xml
+++ b/core/res/res/values-es/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Captura de pantalla</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">recibir SMS protegidos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Permite que la aplicación reciba mensajes SMS entrantes protegidos.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modificar lista de SMS protegidos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Permite que la aplicación modifique la lista de contactos SMS protegidos.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Seguridad</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Permisos relacionados con la seguridad de la información del dispositivo.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">leer lista negra del teléfono</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Permite que la aplicación lea la información sobre los números de teléfono bloqueados para llamadas o mensajes entrantes.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">cambiar la lista negra del teléfono</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Permite que la aplicación cambie los números de teléfono bloqueados de llamadas o mensajes entrantes.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">establecer fondo de pantalla de bloqueo</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Permite que la aplicación establezca el fondo de pantalla de bloqueo.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reiniciar</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Actual</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reiniciar</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Modo Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Descargar</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Reinicio rápido</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reiniciar</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">El tablet se reiniciará.</string>
   <string name="reboot_confirm" product="default">El teléfono se reiniciará.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Reiniciando\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplicación finalizada</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB sobre red activado</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB sobre USB y red activado</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Toca para desactivar la depuración.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB y red</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Red</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">interceptar la ejecución de aplicaciones</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s no está instalada</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioridad</string>
   <string name="silent_mode_none">Ninguno</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Zona Wi-Fi desactivada debido a un cambio de suscripción en la SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Desactivar Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">activar o desactivar el protector de privacidad</string>
   <string name="permdesc_changePrivacyGuardState">Permite que la aplicación cambie el estado de privacidad de otra. Cuando una aplicación se ejecuta con la privacidad activada, no podrá acceder a los datos personales, tales como contactos, mensajes o registros de llamadas.</string>
   <string name="privacy_guard_notification">Privacidad activada</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> no podrá acceder a los datos personales</string>
   <string name="privacy_guard_dialog_title">Privacidad</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> quiere <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Recordar mi elección</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">acceder a la cámara</string>
   <string name="app_ops_access_location">acceder a tu ubicación</string>
   <string name="app_ops_access_notifications">leer tus notificaciones</string>
@@ -97,6 +135,7 @@
   <string name="app_ops_start_at_bootup">ejecutar al inicio</string>
   <string name="app_ops_toast_window">mostrar notificaciones emergentes</string>
   <string name="app_ops_toggle_bluetooth">alternar Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">conmutar datos móviles</string>
   <string name="app_ops_toggle_nfc">alternar NFC</string>
   <string name="app_ops_toggle_wifi">alternar Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">controlar el volumen de la alarma</string>
@@ -127,19 +166,28 @@
   <string name="app_ops_get_accounts">obtener cuentas de dispositivo</string>
   <string name="app_ops_wifi_change">cambiar estado de Wi-Fi</string>
   <string name="app_ops_su">obtener acceso administrativo</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Para liberar esta pantalla, mantén pulsado el botón Atrás.</string>
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Ajustar automáticamente la temperatura del color de pantalla con el amanecer y el anochecer</string>
-  <string name="live_display_off">Desactivado</string>
-  <string name="live_display_off_summary">Desactivar todos los ajustes</string>
-  <string name="live_display_day">Día</string>
-  <string name="live_display_day_summary">Utilizar solo los ajustes de día</string>
-  <string name="live_display_night">Noche</string>
-  <string name="live_display_night_summary">Utilizar solo los ajustes de noche</string>
-  <string name="live_display_outdoor">Al aire libre (luz del sol)</string>
-  <string name="live_display_outdoor_summary">Utilizar solo los ajustes al aire libre</string>
-  <string name="live_display_hint">LiveDisplay puede reducir la fatiga visual y ayudar a dormir por la noche. ¡Toca aquí para probarlo!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ningún dispositivo conectado</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo conectado</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivos conectados</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Lanzamiento de la actividad bloqueado</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> tiene protección para ser ejecutado. Haz clic para autenticar e iniciar la aplicación.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batería completamente cargada</string>
+  <string name="notify_battery_fully_charged_text">Desconecta tu dispositivo del cargador para mejorar la vida útil de la batería.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">restablecer estadísticas de batería</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permite que la aplicación restablezca los datos actuales de uso de la batería.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Las tarjetas SIM han cambiado</string>
+  <string name="uicc_hot_swapped_event_text">Toca para establecer las preferencias por defecto de la tarjeta SIM</string>
 </resources>
diff --git a/core/res/res/values-et-rEE/cm_strings.xml b/core/res/res/values-et-rEE/cm_strings.xml
index c0843d8..3873fe7 100644
--- a/core/res/res/values-et-rEE/cm_strings.xml
+++ b/core/res/res/values-et-rEE/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Ekraanipilt</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">saa kaitstud SMSe</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Lubab rakendusel vastu võtta sissetuleva kaitstud SMSi.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">muuda kaitstud SMS nimekirja</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Lubab rakendusel muuta kaitstud SMS aadressiloendit.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Turvalisus</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Õigused on seotud seadme turvalisuse teabega.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">lugeda telefoni musta nimekirja</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Lubab rakendusel lugeda teavet telefoninumbrite kohta, mis on sissetulevate kõnede ja sõnumite jaoks blokeeritud.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">muuta telefoni musta nimekirja</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Annab rakendusele õiguse muuta sissetulevate kõnede ja sõnumite jaoks blokeeritud numbreid.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">muuta lukuekraani pilti</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Lubab rakendusel muuta lukustusekraani taustapilti.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Taaskäivitamine</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Praegune</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Taaskäivita</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download režiim</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Poolik taaskäivitus</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Taaskäivita</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Teie tahvelarvuti taaskäivitub.</string>
   <string name="reboot_confirm" product="default">Teie telefon taaskäivitub.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Taaskäivitamine\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Rakendus suletud</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB üle võrgu aktiveeritud</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB üle USB &amp; võrgu aktiveeritud</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Puuduta silumise lõpetamiseks.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; võrk</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Võrk</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">rakenduse käivitamise katkestamine</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s ei ole installitud</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioriteet</string>
   <string name="silent_mode_none">Puudub</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">WiFi hotspot lülitati välja kuna muutus SIM kaardi teenused</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Lülita WiFi välja</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">lubada või keelata privaatsuskaitset</string>
   <string name="permdesc_changePrivacyGuardState">Sellega lubate muuta mõne muu rakenduse käivitumist Privaatsuskaitsega. Kui rakendus töötab sisselülitatud Privaatsuskaitsega, puudub rakendusel ligipääs isiklikele andmetele nagu kontaktid, kõnelogid või sõnumid.</string>
   <string name="privacy_guard_notification">Privaatsuskaitse aktiveeritud</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> ei pääse ligi isiklikele andmetele</string>
   <string name="privacy_guard_dialog_title">Privaatsuskaitse</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> tahab <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Jäta meelde minu valik</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">kontrollida kaamerat</string>
   <string name="app_ops_access_location">kontrollida asukohta</string>
   <string name="app_ops_access_notifications">lugeda teateid</string>
@@ -97,7 +135,9 @@
   <string name="app_ops_start_at_bootup">käivitada sisselülitamisel</string>
   <string name="app_ops_toast_window">näidata lühisõnumeid</string>
   <string name="app_ops_toggle_bluetooth">lülitada Bluetooth\'i</string>
+  <string name="app_ops_toggle_mobile_data">lülita mobiilne andmeside sisse-välja</string>
   <string name="app_ops_toggle_nfc">lülitada NFC</string>
+  <string name="app_ops_toggle_wifi">lülita Wi-Fi sisse-välja</string>
   <string name="app_ops_use_alarm_volume">muuta alarmi helitugevust</string>
   <string name="app_ops_use_audio_focus">muuta audio fookust</string>
   <string name="app_ops_use_bluetooth_volume">muuta Bluetooth heli tugevust</string>
@@ -110,20 +150,44 @@
   <string name="app_ops_use_voice_volume">muuta telefoni kõne helitugevust</string>
   <string name="app_ops_write_mms">kirjutada MMS sõnumit</string>
   <string name="app_ops_write_sms">kirjutada SMS sõnumit</string>
+  <string name="app_ops_use_fingerprint">kasuta sõrmejälge</string>
+  <string name="app_ops_add_voicemail">lisa kõnepost</string>
+  <string name="app_ops_read_phone_state">juurdepääs telefoni olekule</string>
+  <string name="app_ops_scan_wifi">otsida Wi-Fi võrke</string>
+  <string name="app_ops_change_wallpaper">muuta taustapilti</string>
+  <string name="app_ops_assist_structure">kasuta assisteeritud struktuuri</string>
+  <string name="app_ops_assist_screenshot">kuvatõmmise tegemine</string>
+  <string name="app_ops_use_body_sensors">kasutada biosensoreid</string>
+  <string name="app_ops_read_cell_broadcasts">lugeda võrguteateid</string>
+  <string name="app_ops_mock_location">teeskle asukohta</string>
+  <string name="app_ops_read_external_storage">lugeda väliselt andmekandjalt</string>
+  <string name="app_ops_write_external_storage">kirjutada välisele andmekandjale</string>
+  <string name="app_ops_turn_on_screen">lülitada ekraan sisse</string>
+  <string name="app_ops_get_accounts">lugeda seadme kasutajaid</string>
+  <string name="app_ops_wifi_change">muuta Wi-Fi olekut</string>
   <string name="app_ops_su">saada root ligipääsu</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Selle ekraani vabastamiseks puudutage ja hoidke all Tagasi nuppu.</string>
-  <string name="live_display_auto">Automaatne</string>
-  <string name="live_display_auto_summary">Automaatselt reguleeri ekraani värvitemperaturri pärast päikeseloojangut ja -tõusu</string>
-  <string name="live_display_off">Väljas</string>
-  <string name="live_display_off_summary">Keela kõik kohandused</string>
-  <string name="live_display_day">Päev</string>
-  <string name="live_display_day_summary">Kasuta ainult päeva seadeid</string>
-  <string name="live_display_night">Öö</string>
-  <string name="live_display_night_summary">Kasuta ainult öö seadeid</string>
-  <string name="live_display_outdoor">Õues (ere päike)</string>
-  <string name="live_display_outdoor_summary">Kasuta ainult õue seadeid</string>
-  <string name="live_display_hint">LiveDisplay võimaldab vähendada silmade pinget ja lasta sul öösel magada. Kliki siin et seda proovida!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Pole ühtegi ühendatud seadet</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ühendatud seade</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> ühendatud seadet</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Tegevuse käivitamine blokeeriti</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> keelati käivitamast. Koputage rakenduse autentimiseks ja käivitamiseks.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Aku täis</string>
+  <string name="notify_battery_fully_charged_text">Ühenda telefon laadijast, et parandada aku eluiga.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">nullida aku statistikat</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Lubab rakendusel nullida aku praeguse madala-tasemelise kasutuse andmed.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM-kaardid on muutunud</string>
+  <string name="uicc_hot_swapped_event_text">Koputa, et muuta SIM-kaardi vaikesätteid</string>
 </resources>
diff --git a/core/res/res/values-eu-rES/cm_strings.xml b/core/res/res/values-eu-rES/cm_strings.xml
index e902e97..847aafc 100644
--- a/core/res/res/values-eu-rES/cm_strings.xml
+++ b/core/res/res/values-eu-rES/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Pantaila-argazkia</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">jaso SMS babestua</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">SMS mezu babestua jasotzea ahalbidetzen dio aplikazioari.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">aldatu SMS babestuen zerrenda</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">SMS babestuen helbide zerrenda aldatzea ahalbidetzen dio aplikazioari.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Segurtasuna</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Gailuaren segurtasun informazioarekin erlazionaturiko baimenak.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">Telefonoaren zerrenda beltza irakurri</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Sarrera dei edo SMS mezuak blokeatuta dituzten telefono zenbakien informazioa irakurtzea ahalbidetzen dio aplikazioari.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">aldatu telefonoen zerrenda beltza</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Sarrera deiak eta SMS mezuak blokeatuta dituzten zenbakien zerrenda aldatzea ahalbidetzen dio aplikazioari.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Ezarri blokeo-pantailarako horma-papera</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Blokeo-pantailarako horma-papera aldatzea ahalbidetzen dio aplikazioari.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Berrabiarazi</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Oraingoa</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Berrabiarazi</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Berreskuratzea</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Abiarazlea</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Deskarga</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Berrabiatze leuna</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Berrabiarazi</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tableta berrabiarazi egingo da.</string>
   <string name="reboot_confirm" product="default">Telefonoa berrabiarazi egingo da.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Berrabiarazten\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplikazioa eten da</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">Sare gaineko ADB gaitua</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USB eta sare gaineko ADB gaitua</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Sakatu arazketa ezgaitzeko.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB eta sarea</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Sarea</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Eragotzi aplikazioak abiaraztea</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s ez dago instalatuta</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Lehentasuna</string>
   <string name="silent_mode_none">Bat ere ez</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wi-Fi gunea desgaitu da SIM harpidetza aldatu delako</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Ezgaitu Wi-Fia</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">gaitu edo ezgaitu Privacy Guard</string>
   <string name="permdesc_changePrivacyGuardState">Beste aplikazio bat Privacy Guard menpean dagoen aldatzea ahalbidetzen dio aplikazioari. Aplikazio bat Privacy Guard menpean dagoenean ezin izango du datu pertsonalik ikusi, ez kontakturik, ez dei erregistrorik, ezta mezurik ere.</string>
   <string name="privacy_guard_notification">Privacy Guard aktibo</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> aplikazioak ezingo du datu pertsonalik irakurri</string>
   <string name="privacy_guard_dialog_title">Privacy Guard</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> aplikazioak <xliff:g id="op">%2$s</xliff:g> ahal izatea nahi du.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Gogoratu nire aukera</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">kamera atzitu</string>
   <string name="app_ops_access_location">zure kokalekua atzitu</string>
   <string name="app_ops_access_notifications">zure jakinarazpenak irakurri</string>
@@ -79,7 +117,7 @@
   <string name="app_ops_modify_call_log">dei erregistroa eguneratu</string>
   <string name="app_ops_modify_clipboard">arbela aldatu</string>
   <string name="app_ops_modify_contacts">zure kontaktuak eguneratu</string>
-  <string name="app_ops_modify_settings">sistema ezarpenak aldatu</string>
+  <string name="app_ops_modify_settings">eguneratu sistemaren ezarpenak</string>
   <string name="app_ops_mute_unmute_microphone">mikrofonoa mututu/desmututu</string>
   <string name="app_ops_play_audio">soinua erreproduzitu</string>
   <string name="app_ops_post_notification">jakinarazpen bat argitaratu</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">eskuratu gailuaren kontuak</string>
   <string name="app_ops_wifi_change">Wi-Fiaren egoera aldatu</string>
   <string name="app_ops_su">root sarbidea eskuratu</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Pantaila hau desiltzatzeko sakatu eta mantendu atzera botoia.</string>
-  <string name="live_display_auto">Automatikoa</string>
-  <string name="live_display_auto_summary">Doitu automatikoki pantailaren kolore tenperatura ilunabarra eta egunsentiaren ostean</string>
-  <string name="live_display_off">Ez</string>
-  <string name="live_display_off_summary">Ezgaitu doitze guztiak</string>
-  <string name="live_display_day">Eguna</string>
-  <string name="live_display_day_summary">Erabili egun ezarpenak besterik ez</string>
-  <string name="live_display_night">Gaua</string>
-  <string name="live_display_night_summary">Erabili gau ezarpenak besterik ez</string>
-  <string name="live_display_outdoor">Kalean (eguzkipean)</string>
-  <string name="live_display_outdoor_summary">Erabili kaleko ezarpenak besterik ez</string>
-  <string name="live_display_hint">LiveDisplayk begi nekea gutxitu eta gauez lo egiten lagundu dezake. Probatu ezazu!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ez da gailurik konektatu</string>
   <string name="tethered_notification_one_device_message">gailu <xliff:g id="count">%1$s</xliff:g> konektatuta</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> gailu konektatuta</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Aktibitatea abiatzea blokeatu da</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> abiatzeko babestuta dago. Sakatu nortasuna egiaztatzeko eta aplikazioa abiatzeko.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Bateria erabat kargatuta</string>
   <string name="notify_battery_fully_charged_text">Deskonektatu zure gailua kargagailutik bateriaren bizitza luzatzeko.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">ezabatu bateriaren estatistikak</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Bateriaren maila baxuko erabilera datuak leheneratzea ahalbidetzen dio aplikazioari.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM txartelak aldatu dira</string>
+  <string name="uicc_hot_swapped_event_text">Sakatu SIM txartelaren lehenetsitako hobespenak ezartzeko</string>
 </resources>
diff --git a/core/res/res/values-fa/cm_strings.xml b/core/res/res/values-fa/cm_strings.xml
index 81d51c3..e8278c2 100644
--- a/core/res/res/values-fa/cm_strings.xml
+++ b/core/res/res/values-fa/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">تصویر صفحه</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">دریافت پیامک محفاظت شده</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">به برنامه اجازه می‌دهد پیام محافظت شده‌ای دریافت کند.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">ویرایش لیست پیامک محافظت شده</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">به برنامه اجازه می‌دهد لیست آدرس پیامک‌های محافظت شده را تغییردهد.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">امنیت</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">مجوزهای مربوط به اطلاعات امنیتی دستگاه.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">مشاهده لیست سیاه گوشی</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">به برنامه اجازه می‌دهد اطلاعات مربوط به شماره تلفن‌های مسدود را برای پیام‌ها یا تماس‌های ورودی بخواند.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">تغییر لیست سیاه گوشی</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">به برنامه اجازه می‌دهد شماره تلفن‌های مسدود را برای پیام‌ها یا تماس‌های ورودی تغییر دهد.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">تنظیم کاغذدیواری قفل صفحه</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">به برنامه اجازه می‌دهد کاغذدیواری قفل صفحه را تغییر دهد.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">راه‌اندازی مجدد</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">فعلی</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">معمولی</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">ریکاوری</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">بوت لودر</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">دانلود</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">سافت</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">راه‌اندازی مجدد</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">تبلت شما مجددا راه‌اندازی خواهد شد.</string>
   <string name="reboot_confirm" product="default">گوشی شما مجددا راه‌اندازی خواهد شد.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">راه‌اندازی مجدد\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">برنامه بسته شد</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ای‌دی‌بی از طریق شبکه فعال شد</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ای‌دی‌بی از طریق شبکه و یواس‌بی فعال شد</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">برای غیرفعال کردن اشکال‌زدایی لمس کنید.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ای‌دی‌بی - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">شبکه و یواس‌بی</string>
   <string name="adb_active_custom_tile_usb">یواس‌بی</string>
   <string name="adb_active_custom_tile_net">شبکه</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">جلوگیری از اجرا شدن برنامه</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s نصب نیست</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">اولویت‌دار</string>
   <string name="silent_mode_none">هیچ‌کدام</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">نقطه اتصال قابل حمل وای‌فای به دلیل تغییر تعرفه سیم کارت، غیرفعال شد</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">خاموش کردن وای‌فای</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">فعال یا غیرفعال کردن محافظ حریم خصوصی</string>
   <string name="permdesc_changePrivacyGuardState">به برنامه اجازه می‌دهد اجرا شدن برنامه‌های دیگر با محافظ حریم خصوصی را تغییر دهد. هنگامی که یک برنامه با محافظ حریم خصوصی اجرا می‌شود، به اطلاعات شخصی مانند مخاطبین، گزارش‌های تماس یا پیام‌ها دسترسی نخواهد داشت.</string>
   <string name="privacy_guard_notification">محافظ حریم خصوصی فعال است</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> به اصلاعات شخصی دسترسی نخواهد داشت</string>
   <string name="privacy_guard_dialog_title">محافظ حریم خصوصی</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> می‌خواهد <xliff:g id="op">%2$s</xliff:g> انجام دهد.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">انتخابم را به یاد داشته باش</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">دسترسی به دوربین</string>
   <string name="app_ops_access_location">دسترسی به مکان شما</string>
   <string name="app_ops_access_notifications">مشاهده اعلان‌های شما</string>
@@ -111,19 +149,22 @@
   <string name="app_ops_write_mms">نوشتن پیام ام‌ام‌اس</string>
   <string name="app_ops_write_sms">نوشتن پیامک</string>
   <string name="app_ops_su">دریافت دسترسی روت</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">برای از سنجاق درآوردن این صفحه، دکمه بازگشت را زده و نگه دارید.</string>
-  <string name="live_display_auto">خودکار</string>
-  <string name="live_display_auto_summary">تنظیم خودکار دمای رنگ صفحه بعد از طلوع و غروب خورشید</string>
-  <string name="live_display_off">خاموش</string>
-  <string name="live_display_off_summary">غیرفعال کردن همه تنظیمات</string>
-  <string name="live_display_day">روز</string>
-  <string name="live_display_day_summary">فقط استفاده از تنظیمات روز</string>
-  <string name="live_display_night">شب</string>
-  <string name="live_display_night_summary">فقط استفاده از تنظیمات شب</string>
-  <string name="live_display_outdoor">فضای باز (نور خورشید)</string>
-  <string name="live_display_outdoor_summary">فقط استفاده از تنظیمات فضای باز</string>
-  <string name="live_display_hint">نمایش پویا کمک می‌کند چشم‌هایتان کم‌تر خسته شده و شب راحت‌تر به خواب بروید. برای امتحان آن اینجا کلیک کنید!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">هیچ دستگاه متصلی وجود ندارد</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> دستگاه متصل</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> دستگاه متصل</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">تنظیم مجدد آمار کارکرد باتری</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">به برنامه اجازه می‌دهد داده‌های مربوط به استفاده از باتری با سطح شارژ پایین را مجددا تنظیم کند.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-fi/cm_strings.xml b/core/res/res/values-fi/cm_strings.xml
index 1df6487..db3b930 100644
--- a/core/res/res/values-fi/cm_strings.xml
+++ b/core/res/res/values-fi/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Kuvakaappaus</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">vastaanota suojattuja tekstiviestejä</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Sallii sovelluksen vastaanottaa suojattuja tekstiviestejä.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">muokkaa suojattujen tekstiviestien listaa</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Sallii sovelluksen muokata suojattujen tekstiviestien osoiteluetteloa.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Turvallisuus</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Laitteen turvallisuuteen liittyvät oikeudet.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">lue puhelimen mustaa listaa</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Sallii sovelluksen lukea tietoja numeroista, joista saapuvat puhelut ja viestit on estetty.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">muokkaa puhelimen mustaa listaa</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Sallii sovelluksen muokata puhelinnumeroita, joista saapuvat puhelut ja viestit on estetty.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">aseta näppäinlukon taustakuva</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Sallii sovelluksen vaihtaa lukitusnäytön taustakuva.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Käynnistä uudelleen</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Nykyinen</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Käynnistä uudelleen</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery-tila</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader-tila</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download-tila</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Käynnistä uudelleen (soft)</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Käynnistä uudelleen</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tabletti käynnistyy uudelleen.</string>
   <string name="reboot_confirm" product="default">Puhelin käynnistyy uudelleen.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Käynnistetään uudelleen\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Sovellus tapettu</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB verkon yli käytössä</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB verkon &amp; USB:n kautta käytössä</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Paina poistaaksesi vianetsinnän käytöstä.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; verkko</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Verkko</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">keskeytä sovelluksen käynnistys</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s ei ole asennettu</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioriteetti</string>
   <string name="silent_mode_none">Ei mitään</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wi-Fi-tukiasema poistettiin käytöstä SIMin vaihdon vuoksi</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Poista Wi-Fi käytöstä</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">ota yksityisyyden suojaus käyttöön tai poista se käytöstä</string>
   <string name="permdesc_changePrivacyGuardState">Sallii sovelluksen valita, milloin muut sovellukset käyttävät yksityisyyden suojausta. Kun sovellus käyttää yksityisyyden suojausta, sillä ei ole pääsyä henkilökohtaisiin tietoihin kuten yhteystietoihin, puhelulokeihin tai viesteihin.</string>
   <string name="privacy_guard_notification">Yksityisyyden suojaus käytössä</string>
   <string name="privacy_guard_notification_detail">Sovelluksella <xliff:g id="app">%1$s</xliff:g> ei ole pääsyä henkilökohtaisiin tietoihin</string>
   <string name="privacy_guard_dialog_title">Yksityisyyden suojaus</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> haluaa <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Muista valinta</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">käyttää kameraa</string>
   <string name="app_ops_access_location">käyttää sijaintia</string>
   <string name="app_ops_access_notifications">lukea ilmoituksiasi</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">lukea laitteen tilejä</string>
   <string name="app_ops_wifi_change">vaihtaa Wi-Fi:n tilaa</string>
   <string name="app_ops_su">pääkäyttäjän oikeudet</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Irrottaaksesi tämän näytön, paina ja pidä Takasin-näppäintä pohjassa.</string>
-  <string name="live_display_auto">Automaattinen</string>
-  <string name="live_display_auto_summary">Säädä näytön värilämpötilaa automaattisesti auringonlaskun ja -nousun jälkeen</string>
-  <string name="live_display_off">Pois käytöstä</string>
-  <string name="live_display_off_summary">Poista kaikki mukautukset</string>
-  <string name="live_display_day">Päivä</string>
-  <string name="live_display_day_summary">Käytä vain päiväasetusta</string>
-  <string name="live_display_night">Yö</string>
-  <string name="live_display_night_summary">Käytä vain yöasetusta</string>
-  <string name="live_display_outdoor">Ulkoilma (kirkas aurinko)</string>
-  <string name="live_display_outdoor_summary">Käytä vain ulkoilma-asetusta</string>
-  <string name="live_display_hint">LiveDisplay voi vähentää silmien rasitusta ja auttaa nukkumaan öisin. Kokeile sitä painamalla tästä!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ei kytkettyä laitetta</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> yhdistetty laite</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> yhdistettyä laitetta</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Toiminnan käynnistäminen estetty</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> on suojattu sovellus. Napauta todentaaksesi ja käynnistääksesi sovelluksen.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Akku täynnä</string>
   <string name="notify_battery_fully_charged_text">Irrota laite laturista pidentääksesi akun käyttöikää.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">nollaa akun tilastot</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Sallii sovelluksen nollata nykyiset alemman tason akun käytön tilastot.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM-kortit ovat muuttuneet</string>
+  <string name="uicc_hot_swapped_event_text">Napauta asettaaksesi SIM-kortin oletusasetukset</string>
 </resources>
diff --git a/core/res/res/values-fil-rPH/cm_strings.xml b/core/res/res/values-fil-rPH/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-fil-rPH/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-fr-rCA/cm_strings.xml b/core/res/res/values-fr-rCA/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-fr-rCA/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-fr/cm_strings.xml b/core/res/res/values-fr/cm_strings.xml
index c8af1ac..a4be3cf 100644
--- a/core/res/res/values-fr/cm_strings.xml
+++ b/core/res/res/values-fr/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Capture d\'écran</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">recevoir des SMS protégés</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Permet à l\'application de recevoir un SMS protégé.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modifier la liste des SMS protégés</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Permet à l\'application de modifier la liste des adresses des SMS protégés.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sécurité</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Autorisations relatives aux informations de sécurité de l\'appareil.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">lire la liste noire du téléphone</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Permet à l\'application de lire les informations sur les numéros de téléphone qui sont bloqués pour les appels ou les messages entrants.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">modifier la liste noire du téléphone</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Permet à l\'application de modifier les numéros de téléphone qui sont bloqués pour les appels ou les messages entrants.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Définir le fond d\'écran de verrouillage</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Permet à l\'application de changer le fond de l\'écran de verrouillage.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Redémarrer</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Actuel</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Redémarrer</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Récupération</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Redémarrage logiciel</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Redémarrer</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Votre tablette va redémarrer</string>
   <string name="reboot_confirm" product="default">Votre téléphone va redémarrer</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Redémarrage en cours\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Application arrêtée</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB sur réseau activé</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB sur USB et réseau activé</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Appuyez pour désactiver le débogage.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB et réseau</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Réseau</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">intercepter le lancement d\'application</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s n\'est pas installé</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Priorité</string>
   <string name="silent_mode_none">Aucun</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Point d\'accès Wi-Fi désactivé en raison d\'un changement d\'abonnement SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Désactiver le Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">activer ou désactiver la protection des données</string>
   <string name="permdesc_changePrivacyGuardState">Permet à l\'application d\'en exécuter une autre avec la protection des données. Lorsqu\'une application est exécutée avec la protection des données, elle n\'aura pas accès aux données personnelles telles que les contacts, les journaux d\'appels ou les messages.</string>
   <string name="privacy_guard_notification">Protection des données activée</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> ne sera pas en mesure d\'accéder aux données personnelles</string>
   <string name="privacy_guard_dialog_title">Protection des données</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> voudrait <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Se souvenir de mon choix</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">accéder à l\'appareil photo</string>
   <string name="app_ops_access_location">accéder à votre position</string>
   <string name="app_ops_access_notifications">lire vos notifications</string>
@@ -83,7 +121,7 @@
   <string name="app_ops_mute_unmute_microphone">activer/désactiver le microphone</string>
   <string name="app_ops_play_audio">lecture audio</string>
   <string name="app_ops_post_notification">afficher une notification</string>
-  <string name="app_ops_project_media">projet média</string>
+  <string name="app_ops_project_media">projeter média</string>
   <string name="app_ops_read_calendar">lire votre agenda</string>
   <string name="app_ops_read_call_log">lire le journal d\'appels</string>
   <string name="app_ops_read_clipboard">lire le presse-papiers</string>
@@ -94,11 +132,12 @@
   <string name="app_ops_record_audio">enregistrer un son</string>
   <string name="app_ops_send_mms">envoyer un MMS</string>
   <string name="app_ops_send_sms">envoyer un SMS</string>
-  <string name="app_ops_start_at_bootup">démarrer à la mise sous tension</string>
+  <string name="app_ops_start_at_bootup">démarrer avec le système</string>
   <string name="app_ops_toast_window">afficher les messages toast</string>
   <string name="app_ops_toggle_bluetooth">activer/désactiver le Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">activer/désactiver les données mobiles</string>
   <string name="app_ops_toggle_nfc">activer/désactiver le NFC</string>
-  <string name="app_ops_toggle_wifi">activer le Wi-Fi</string>
+  <string name="app_ops_toggle_wifi">activer/désactiver le Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">contrôler le volume des alarmes</string>
   <string name="app_ops_use_audio_focus">contrôler le focus audio</string>
   <string name="app_ops_use_bluetooth_volume">contrôler le volume du Bluetooth</string>
@@ -114,33 +153,41 @@
   <string name="app_ops_use_fingerprint">utiliser les empreintes digitales</string>
   <string name="app_ops_add_voicemail">ajouter un message vocal</string>
   <string name="app_ops_read_phone_state">accéder à l\'état du téléphone</string>
-  <string name="app_ops_scan_wifi">scanner les réseaux Wi-Fi</string>
+  <string name="app_ops_scan_wifi">rechercher les réseaux Wi-Fi</string>
   <string name="app_ops_change_wallpaper">changer le fond d\'écran</string>
   <string name="app_ops_assist_structure">utiliser l\'aide à la structure</string>
   <string name="app_ops_assist_screenshot">prendre une capture d\'écran</string>
   <string name="app_ops_use_body_sensors">utiliser les capteurs corporels</string>
   <string name="app_ops_read_cell_broadcasts">lire les diffusions cellulaires</string>
-  <string name="app_ops_mock_location">simuler votre localisation</string>
+  <string name="app_ops_mock_location">simuler votre position</string>
   <string name="app_ops_read_external_storage">lire le stockage externe</string>
   <string name="app_ops_write_external_storage">écrire sur le stockage externe</string>
   <string name="app_ops_turn_on_screen">allumer l\'écran</string>
   <string name="app_ops_get_accounts">obtenir les comptes de l\'appareil</string>
   <string name="app_ops_wifi_change">changer l\'état du Wi-Fi</string>
   <string name="app_ops_su">obtenir l\'accès root</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Pour déverrouiller l\'écran, appuyez et maintenez le bouton Retour.</string>
-  <string name="live_display_auto">Automatique</string>
-  <string name="live_display_auto_summary">Ajuster automatiquement la température des couleurs de l\'écran après le coucher et le lever du soleil</string>
-  <string name="live_display_off">Désactivé</string>
-  <string name="live_display_off_summary">Désactiver tous les réglages</string>
-  <string name="live_display_day">Jour</string>
-  <string name="live_display_day_summary">Utiliser uniquement les paramètres de jour</string>
-  <string name="live_display_night">Nuit</string>
-  <string name="live_display_night_summary">Utiliser uniquement les paramètres de nuit</string>
-  <string name="live_display_outdoor">Extérieur (plein soleil)</string>
-  <string name="live_display_outdoor_summary">Utiliser uniquement les paramètres extérieurs</string>
-  <string name="live_display_hint">LiveDisplay peut aider à réduire la fatigue oculaire et vous aider à dormir la nuit. Appuyez ici pour l\'essayer !</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Aucun appareil connecté</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> appareil connecté</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> appareils connectés</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Lancement d\'activité bloqué</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> est protégé contre tout lancement. Toucher pour s\'authentifier et lancer l\'application.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batterie entièrement chargée</string>
+  <string name="notify_battery_fully_charged_text">Débranchez votre chargeur afin d\'améliorer la durée de vie de la batterie.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">réinitialiser les statistiques de la batterie</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permet à une application de réinitialiser les données actuelles d\'utilisation de la batterie à faible niveau.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Les cartes SIM ont été modifiées</string>
+  <string name="uicc_hot_swapped_event_text">Appuyer pour définir les préférences par défaut de la carte SIM</string>
 </resources>
diff --git a/core/res/res/values-frp-rIT/cm_strings.xml b/core/res/res/values-frp-rIT/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-frp-rIT/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-frp-rIT/strings.xml b/core/res/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-frp-rIT/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-fy-rNL/cm_strings.xml b/core/res/res/values-fy-rNL/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-fy-rNL/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-fy-rNL/strings.xml b/core/res/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-fy-rNL/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-ga-rIE/cm_strings.xml b/core/res/res/values-ga-rIE/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-ga-rIE/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-ga-rIE/strings.xml b/core/res/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-ga-rIE/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-gd-rGB/cm_strings.xml b/core/res/res/values-gd-rGB/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-gd-rGB/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-gd-rGB/strings.xml b/core/res/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-gd-rGB/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-gl-rES/cm_strings.xml b/core/res/res/values-gl-rES/cm_strings.xml
index 13986eb..1f04320 100644
--- a/core/res/res/values-gl-rES/cm_strings.xml
+++ b/core/res/res/values-gl-rES/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Captura de pantalla</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">recibir SMS protexidas</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Permitir que a aplicación reciba unha SMS protexida.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modificar a lista de SMS protexidas</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Permitir que a aplicación modifique a lista de enderezos de SMS protexidas.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Seguridade</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Permisos relacionados coa información de seguridade do dispositivo.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">ler a lista de bloqueo do teléfono</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Permítelle a unha aplicación ler a información sobre os números de teléfono que están bloqueados, dos que non se recibirán nin chamadas nin mensaxes.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">cambiar a lista de bloqueo do teléfono</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Permítelle a unha aplicación cambiar os números de teléfono que están bloqueados, dos que nin se recibirán chamadas nin mensaxes.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">estabelecer fondo de pantalla de bloqueo</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Permitir que unha aplicación cambie o fondo da pantalla de bloqueo.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reiniciar</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Actual</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reiniciar</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recuperar</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Xestor de arranque</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Descargar</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Reinicio do sistema</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reiniciar</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Vaise reiniciar a súa tableta.</string>
   <string name="reboot_confirm" product="default">Vaise reiniciar o seu teléfono.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Reiniciando\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplicación terminada</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">Activouse a rede en ADB</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">Activada a ADB en USB e rede</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Toque para desactivar a depuración.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB e rede</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Rede</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Interromper o inicio de aplicacións</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s non está instalada</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioridade</string>
   <string name="silent_mode_none">Ningún</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Hotspot Wi-Fi desactivado debido ao cambio da subscrición da SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Apagar o Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">activar ou desactivar a Protección da privacidade</string>
   <string name="permdesc_changePrivacyGuardState">Permítelle á aplicación decidir sobre se outra aplicación debe executarse ou non con Protección da privacidade. De unha aplicación estarse a executar con Protección da privacidade, non poderá acceder a contactos, rexistros de chamadas nin mensaxes.</string>
   <string name="privacy_guard_notification">Protección da privacidade activada</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> non poderá acceder aos datos persoais</string>
   <string name="privacy_guard_dialog_title">Protección da privacidade</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> quere <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Lembrar a miña escolla</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">Acceder á cámara</string>
   <string name="app_ops_access_location">Acceder á súa localización</string>
   <string name="app_ops_access_notifications">Ler as súas notificacións</string>
@@ -97,7 +135,9 @@
   <string name="app_ops_start_at_bootup">iniciar ao arrancar</string>
   <string name="app_ops_toast_window">amosar notificacións emerxentes</string>
   <string name="app_ops_toggle_bluetooth">trocar o Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">mudar os datos móbeis</string>
   <string name="app_ops_toggle_nfc">trocar o NFC</string>
+  <string name="app_ops_toggle_wifi">trocar o Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">controlar o volume da alarma</string>
   <string name="app_ops_use_audio_focus">controlar o foco de son</string>
   <string name="app_ops_use_bluetooth_volume">controlar o volume do Bluetooth</string>
@@ -110,25 +150,44 @@
   <string name="app_ops_use_voice_volume">controlar o volume das chamadas de voz</string>
   <string name="app_ops_write_mms">escribir unha mensaxe MMS</string>
   <string name="app_ops_write_sms">escribir unha mensaxe SMS</string>
+  <string name="app_ops_use_fingerprint">empregar pegada dixital</string>
+  <string name="app_ops_add_voicemail">engadir ó correo de voz</string>
   <string name="app_ops_read_phone_state">acceder ao estado do móbil</string>
+  <string name="app_ops_scan_wifi">buscar redes Wi-Fi</string>
+  <string name="app_ops_change_wallpaper">mudar o fondo de pantalla</string>
   <string name="app_ops_assist_structure">usar a estrutura de asistencia</string>
   <string name="app_ops_assist_screenshot">realizar captura de pantalla</string>
+  <string name="app_ops_use_body_sensors">usar os sensores do corpo</string>
+  <string name="app_ops_read_cell_broadcasts">ler as transmisións de celulares</string>
+  <string name="app_ops_mock_location">simular a miña localización</string>
+  <string name="app_ops_read_external_storage">ler do almacenamento externo</string>
+  <string name="app_ops_write_external_storage">escribir no almacenamento externo</string>
   <string name="app_ops_turn_on_screen">acender a pantalla</string>
   <string name="app_ops_get_accounts">obter as contas do dispositivo</string>
+  <string name="app_ops_wifi_change">mudar o estado da Wi-Fi</string>
   <string name="app_ops_su">Obter acceso como superusuario</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Para deixar de fixar esta pantalla, mantén tocado o botón Atrás.</string>
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Axustar automaticamente os tons da pantalla ao amencer e o solpor</string>
-  <string name="live_display_off">Apagado</string>
-  <string name="live_display_off_summary">Desactivar todos os axustes</string>
-  <string name="live_display_day">Día</string>
-  <string name="live_display_day_summary">Utilizar tan só os axustes de día</string>
-  <string name="live_display_night">Noite</string>
-  <string name="live_display_night_summary">Utilizar tan só os axustes de noite</string>
-  <string name="live_display_outdoor">Exteriores (iluminado)</string>
-  <string name="live_display_outdoor_summary">Utilizar tan só os axustes de exteriores</string>
-  <string name="live_display_hint">O modo LiveDisplay pode axudar coa dor de ollos e a conciliar o sono. Toca aquí para probalo!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Dispositivo non conectado</string>
   <string name="tethered_notification_one_device_message">Dispositivo <xliff:g id="count">%1$s</xliff:g> conectado</string>
   <string name="tethered_notification_multi_device_message">Dispositivos <xliff:g id="count">%1$s</xliff:g> conectados</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Inicio da actividade bloqueado</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> esta protexido de ser lanzado.Toque para auntentificar e iniciar o aplicativo.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batería cargada</string>
+  <string name="notify_battery_fully_charged_text">Desconecta o teu dispositivo do cargador para mellorar a lonxevidade da batería.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">reiniciar estatísticas da bateria</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permite que un aplicativo poida reiniciar os datos de uso actual de batería a baixo nivel.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">As tarxetas SIM cambiaron</string>
+  <string name="uicc_hot_swapped_event_text">Tocar para definir as preferencias predefinidas da tarxeta SIM</string>
 </resources>
diff --git a/core/res/res/values-gu-rIN/cm_strings.xml b/core/res/res/values-gu-rIN/cm_strings.xml
new file mode 100644
index 0000000..62072a0
--- /dev/null
+++ b/core/res/res/values-gu-rIN/cm_strings.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">સ્ક્રિનશોટ</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_receiveProtectedSms">સુરક્ષિત SMS મેળવો</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">ઍપ ને ઇનકમિંગ સુરક્ષિત SMS મેળવવાની છૂટ આપે છે.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">સુરક્ષિત SMS સૂચીમાં ફેરફાર કરો</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">ઍપને સુરક્ષિત SMS સરનામાની સૂચીમાં ફેરફાર કરવાની છૂટ આપે છે.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_security">સુરક્ષા</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">ડિવાઇસ સુરક્ષા માહિતી સાથે સંબંધિત પરવાનગીઓ.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">ફોન બ્લેકલિસ્ટ વાંચો</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">ઇનકમિંગ કોલ અથવા સંદેશા માટે જે ફોન નંબરો અવરોધવામાં આવ્યા હોય તે વિશેની માહિતી વાંચવાની ઍપને છૂટ આપે છે.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">ફોન બ્લેકલિસ્ટ પરિવર્તન કરો</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">ઇનકમિંગ કોલ અથવા સંદેશા માટે જે ફોન નંબરો અવરોધવામાં આવ્યા હોય તે પરિવર્તન કરવા માટે ઍપને છૂટ આપે છે.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">કિગાર્ડ વોલપેપર સેટ કરો</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">લૉક સ્ક્રીન વૉલપેપરમાં પરિવર્તન કરવાની ઍપને છૂટ આપે છે.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">રીબૂટ કરો</string>
+  <!-- label for current user in phone options dialog -->
+  <string name="global_action_current_user">વર્તમાન</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">રીબૂટ કરો</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">રિકવરી</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">બૂટલોડર</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">ડાઉનલોડ કરો</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">સોફ્ટ રીબૂટ</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">રીબૂટ કરો</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">તમારું ટૅબ્લેટ રીબૂટ થશે.</string>
+  <string name="reboot_confirm" product="default">તમારો ફોન રીબૂટ થશે.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">રીબુટ થવું\u2026</string>
+  <!-- Long-press back kill application -->
+  <string name="app_killed_message">એપ્લિકેશન સંપૂર્ણ બંધ કરવામાં આવી</string>
+  <!-- ADB over network notification -->
+  <string name="adb_net_active_notification_title">નેટવર્ક પર ADB સક્ષમ કરવામાં આવ્યું</string>
+  <!-- ADB over USB and network notification -->
+  <string name="adb_both_active_notification_title">USB અને નેટવર્ક પર ADB સક્ષમ કરવામાં આવ્યું</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">ડીબગિંગ અક્ષમ કરવા ટચ કરો.</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB અને નેટવર્ક</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">નેટવર્ક</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">એપ્લિકેશન લોન્ચમાં ખલેલ પહોંચાડો</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s ઇન્સ્ટૉલ થયું નથી</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">પ્રાધાન્યતા</string>
+  <string name="silent_mode_none">કોઈ નહીં</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">SIM લવાજમ પરિવર્તનને કારણે Wi-Fi હોટસ્પોટ અક્ષમ કરવામાં આવ્યું</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Wi-Fi બંધ કરો</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">ગુપ્તતા ગાર્ડ સક્ષમ અથવા અક્ષમ કરો</string>
+  <string name="permdesc_changePrivacyGuardState">અન્ય એપ્લિકેશન ગુપ્તતા ગાર્ડ સાથે ચાલી શકે કે કેમ તેમાં એપ્લિકેશનને પરિવર્તન કરવાની છૂટ આપે છે. ગુપ્તતા ગાર્ડ સાથે જ્યારે એપ્લિકેશન ચાલતી હોય ત્યારે તે સંપર્કો, કોલ લૉગ્સ અથવા સંદેશાઓ જેવી અંગત માહિતીની ઍક્સેસ ધરાવશે નહીં.</string>
+  <string name="privacy_guard_notification">ગુપ્તતા ગાર્ડ સક્રિય</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> અંગત ડેટા એકસેસ કરી શકશે નહીં</string>
+  <string name="privacy_guard_dialog_title">ગુપ્તતા ગાર્ડ</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> ને <xliff:g id="op">%2$s</xliff:g>કરવું ગમશે.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">મારી પસંદગી યાદ રાખો</string>
+  <!-- App ops requests -->
+  <string name="app_ops_access_camera">કૅમેરા ઍક્સેસ કરો</string>
+  <string name="app_ops_access_location">તમારું સ્થાન ઍક્સેસ કરો</string>
+  <string name="app_ops_access_notifications">તમારી સૂચનાઓ વાંચો</string>
+  <string name="app_ops_activate_vpn">VPN સક્રિય કરો</string>
+  <string name="app_ops_auto_start">પાવર અપ થતા શરૂઆત કરો</string>
+  <string name="app_ops_delete_call_log">તમારો કોલ લોગ રદ કરો</string>
+  <string name="app_ops_delete_contacts">તમારા સંપર્કો રદ કરો</string>
+  <string name="app_ops_delete_mms">તમારા MMS સંદેશાઓ રદ કરો</string>
+  <string name="app_ops_delete_sms">તમારા SMS સંદેશાઓ રદ કરો</string>
+  <string name="app_ops_draw_on_top">વિન્ડોઝને ટોચ પર ખેંચો</string>
+  <string name="app_ops_get_usage_stats">એપ્લિકેશન વપરાશ અંકો મેળવો</string>
+  <string name="app_ops_keep_device_awake">તમારી ડિવાઇસને સજાગ રાખો</string>
+  <string name="app_ops_make_phone_call">ફોન કૉલ કરો</string>
+  <string name="app_ops_modify_calendar">તમારું કૅલેન્ડર અપડેટ કરો</string>
+  <string name="app_ops_modify_call_log">કૉલ લોગ અપડેટ કરો</string>
+  <string name="app_ops_modify_clipboard">ક્લિપબૉર્ડમાં ફેરફાર કરો</string>
+  <string name="app_ops_modify_contacts">તમારા સંપર્કો અપડેટ કરો</string>
+  <string name="app_ops_modify_settings">સિસ્ટમ સેટિંગ્સ અપડેટ કરો</string>
+  <string name="app_ops_mute_unmute_microphone">માઇક્રોફોન મ્યુટ/અનમ્યુટ કરો</string>
+  <string name="app_ops_play_audio">ઓડિયો પ્લે કરો</string>
+  <string name="app_ops_post_notification">સૂચનાઓ પોસ્ટ કરો</string>
+  <string name="app_ops_project_media">પ્રોજેક્ટ મીડિયા</string>
+  <string name="app_ops_read_calendar">તમારું કૅલેન્ડર વાંચો</string>
+  <string name="app_ops_read_call_log">કૉલ લોગ વાંચો</string>
+  <string name="app_ops_read_clipboard">ક્લિપબૉર્ડ વાંચો</string>
+  <string name="app_ops_read_contacts">તમારા સંપર્કો વાંચો</string>
+  <string name="app_ops_read_mms">તમારા MMS સંદેશાઓ વાંચો</string>
+  <string name="app_ops_read_sms">તમારા SMS સંદેશાઓ વાંચો</string>
+  <string name="app_ops_receive_sms">SMS સંદેશાઓ મેળવો</string>
+  <string name="app_ops_record_audio">ઑડિઓ રેકોર્ડ કરો</string>
+  <string name="app_ops_send_mms">MMS સંદેશ મોકલો</string>
+  <string name="app_ops_send_sms">SMS સંદેશ મોકલો</string>
+  <string name="app_ops_start_at_bootup">પાવર અપ થતા શરૂઆત કરો</string>
+  <string name="app_ops_toast_window">ટોસ્ટ સંદેશાઓ દર્શાવો</string>
+  <string name="app_ops_toggle_bluetooth">Bluetooth ટૉગલ કરો</string>
+  <string name="app_ops_toggle_mobile_data">મોબાઇલ ડેટા ટૉગલ કરો</string>
+  <string name="app_ops_toggle_nfc">NFC ટૉગલ કરો</string>
+  <string name="app_ops_toggle_wifi">Wi-Fi ટૉગલ કરો</string>
+  <string name="app_ops_use_alarm_volume">અલાર્મ વોલ્યુમ નિયંત્રિત કરો</string>
+  <string name="app_ops_use_audio_focus">ઓડિયો ફોકસ નિયંત્રિત કરો</string>
+  <string name="app_ops_use_bluetooth_volume">Bluetooth વોલ્યુમ નિયંત્રિત કરો</string>
+  <string name="app_ops_use_master_volume">માસ્ટર વોલ્યુમ નિયંત્રિત કરો</string>
+  <string name="app_ops_use_media_buttons">મીડિયા બટનોનો ઉપયોગ કરો</string>
+  <string name="app_ops_use_media_volume">મીડિયા વોલ્યુમ નિયંત્રિત કરો</string>
+  <string name="app_ops_use_notification_volume">સૂચના વોલ્યુમ નિયંત્રિત કરો</string>
+  <string name="app_ops_use_ring_volume">રિંગટોન વોલ્યુમ નિયંત્રિત કરો</string>
+  <string name="app_ops_use_vibrate">હેપ્ટિક સૂચનોનો ઉપયોગ કરો</string>
+  <string name="app_ops_use_voice_volume">વૉઇસ કૉલ વોલ્યુમ નિયંત્રિત કરો</string>
+  <string name="app_ops_write_mms">MMS સંદેશ લખો</string>
+  <string name="app_ops_write_sms">SMS સંદેશ લખો</string>
+  <string name="app_ops_use_fingerprint">ફિંગરપ્રિન્ટ વાપરો</string>
+  <string name="app_ops_add_voicemail">વૉઇસમેઇલ ઍડ કરો</string>
+  <string name="app_ops_read_phone_state">ફોન આંકડા ઍક્સેસ કરો</string>
+  <string name="app_ops_scan_wifi">Wi-Fi નેટવર્ક સ્કૅન કરો</string>
+  <string name="app_ops_change_wallpaper">વૉલપેપર પરિવર્તન કરો</string>
+  <string name="app_ops_assist_structure">અસિસ્ટ માળખું વાપરો</string>
+  <string name="app_ops_assist_screenshot">સ્ક્રીનશૉટ લો</string>
+  <string name="app_ops_use_body_sensors">બૉડિ સેન્સર્સ વાપરો</string>
+  <string name="app_ops_read_cell_broadcasts">સેલ પ્રસારણો વાંચો</string>
+  <string name="app_ops_mock_location">તમારું કૃત્રિમ સ્થાન મૂકો</string>
+  <string name="app_ops_read_external_storage">બાહ્ય સંગ્રહ વાંચો</string>
+  <string name="app_ops_write_external_storage">બાહ્ય સંગ્રહ લખો</string>
+  <string name="app_ops_turn_on_screen">સ્ક્રીન ચાલુ કરો</string>
+  <string name="app_ops_get_accounts">ડિવાઇસ ખાતા મેળવો</string>
+  <string name="app_ops_wifi_change">Wi-Fi સ્થિતિ પરિવર્તન કરો</string>
+  <string name="app_ops_su">રૂટ ઍક્સેસ મેળવી</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">આ સ્ક્રીન અનપિન કરવા માટે બૅક બટન પર ટચ કરી પકડી રાખો.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">કોઇ ડિવાઇસ કનેક્ટ થયેલ નથી</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ડિવાઇસ કનેક્ટ થયેલ છે</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> ડિવાઇસેસ કનેક્ટ થયેલ છે</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">પ્રવૃત્તિ લોન્ચ બ્લૉક થયું</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> લોન્ચ થવા સામે સંરક્ષિત છે. ઍપ્લિકેશન લોન્ચ અને અધિકૃત કરવા ટૅપ કરો.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">બેટરી સંપૂર્ણપણે ચાર્જ થઇ ગઈ</string>
+  <string name="notify_battery_fully_charged_text">ચાર્જર સાથે તમારા ઉપકરણ જોડે નુ જોડાણ કાઢી નાખો બેટરી નુ આયુષ્ય સુધારવા માટે.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">બેટરી અંકો રિસેટ કરો</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">ઍપ્લિકેશનને હાલનો નિમ્ન-સ્તરીય બેટરી વપરાશ ડેટા રિસેટ કરવાની છૂટ આપે છે.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">સિમ કાર્ડ બદલાઈ ગયેલ છે</string>
+  <string name="uicc_hot_swapped_event_text">સિમ કાર્ડ મૂળભૂત પસંદગીઓ સુયોજિત કરવા માટે ટેપ કરો</string>
+</resources>
diff --git a/core/res/res/values-hi/cm_strings.xml b/core/res/res/values-hi/cm_strings.xml
index 8fbbcbc..65e20c4 100644
--- a/core/res/res/values-hi/cm_strings.xml
+++ b/core/res/res/values-hi/cm_strings.xml
@@ -17,49 +17,87 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">स्क्रीनशॉट</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">रक्षित एसएमएस प्राप्त करें</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">ऐप को आवक रक्षित एसएमएस प्राप्त करने देता है।</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">रक्षित एसएमएस सूची को संशोधित करें</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">ऐप को रक्षित एसएमएस पता सूची को संशोधित करने देता है।</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">सुरक्षा</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">उपकरण सुरक्षा जानकारी से संबंधित अनुमतियाँ।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">फ़ोन काली सूची पढ़ें</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">ऐप को आवक कॉलों या संदेशों के लिए जिन फ़ोन नंबरों को अवरुद्ध किया गया है, उनसे संबंधित जानकारी पढ़ने देता है।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">फ़ोन काली सूची को परिवर्तित करें</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">ऐप को आवक कॉलों या संदेशों के लिए जिन फ़ोन नंबरों को अवरुद्ध किया गया है, उन्हें परिवर्तित करने देता है।</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">कुंजीकवच वॉलपेपर सेट करें</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">ऐप को स्क्रीन वॉलपेपर लॉक को बदलने देता है।</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">रीबूट करें</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">वर्तमान</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">रीबूट करें</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">रिकवरी</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">बूटलोडर</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">डाउनलोड करें</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">नरम रीबूट</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">रीबूट करें</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">आपका टैब्लेट रीबूट करेगा।</string>
   <string name="reboot_confirm" product="default">आपका फ़ोन रीबूट करेगा।</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">रीबूट कर रहे हैं\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">ऐप को मार दिया गया</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">नेटवर्क पर एडीबी को सक्षम कर दिया गया</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">यूएसबी और नेटवर्क पर एडीबी को सक्षम कर दिया गया</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">डीबगिंग को अक्षम करने के लिए छुएँ।</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">एडीबी - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">यूएसबी और नेटवर्क</string>
   <string name="adb_active_custom_tile_usb">यूएसबी</string>
   <string name="adb_active_custom_tile_net">नेटवर्क</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">ऐप लॉन्च का अंतररोधन करें</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s स्थापित नहीं है</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">वरीयता</string>
   <string name="silent_mode_none">कुछ नहीं</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">गोपनीयता रक्षक को सक्षम या अक्षम करें</string>
   <string name="permdesc_changePrivacyGuardState">ऐप को इसे बदलने देता है कि कोई दूसरा ऐप गोपनीयता रक्षक के साथ चलेगा अथवा नहीं। जब ऐप गोपनीयता रक्षक के साथ चलता है, उसे संपर्क, कॉल लॉग, या संदेश जैसे निजी डेटा तक पहुँचने की अनुमति नहीं होगी।</string>
   <string name="privacy_guard_notification">गोपनीयता रक्षक सक्रिय है</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> निजी डेटा में पहुँच नहीं सकेगा</string>
   <string name="privacy_guard_dialog_title">गोपनीयता रक्षक</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> क्या आप <xliff:g id="op">%2$s</xliff:g> करना चाहते हैं।</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">मेरी पसंद को याद रखें</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">कैमरे में पहुँचें</string>
   <string name="app_ops_access_location">अपने स्थान का उपयोग करें</string>
   <string name="app_ops_access_notifications">अपनी अधिसूचनाओं को पढ़ें</string>
@@ -109,19 +147,22 @@
   <string name="app_ops_write_mms">एक एमएमएस संदेश लिखें</string>
   <string name="app_ops_write_sms">एक एसएमएस संदेश लिखें</string>
   <string name="app_ops_su">मूल तक पहुँच प्राप्त करें</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">इस स्क्रीन को अनपिन करने के लिए पीछे के बटन को कुछ देर के लिए छुएँ।</string>
-  <string name="live_display_auto">स्वचालित</string>
-  <string name="live_display_auto_summary">सूर्यास्त और सूर्योदय के बाद अपने आप ही स्क्रीन के रंग तापमान को समायोजित करें</string>
-  <string name="live_display_off">बंद</string>
-  <string name="live_display_off_summary">सभी समायोजनों को अक्षम करें</string>
-  <string name="live_display_day">दिन</string>
-  <string name="live_display_day_summary">केवल दिन की सेटिंग का उपयोग करें</string>
-  <string name="live_display_night">रात</string>
-  <string name="live_display_night_summary">केवल रात की सेटिंग का उपयोग करें</string>
-  <string name="live_display_outdoor">बाहर (तेज़ धूप)</string>
-  <string name="live_display_outdoor_summary">केवल बाहर की सेटिंग का उपयोग करें</string>
-  <string name="live_display_hint">लाइवडिस्प्ले आँखों पर पड़नेवाले दबाव को घटा सकता है और आपको रात को अच्छी तरह से सोने में मदद कर सकता है। इसे आज़माने के लिए यहाँ क्लिक करें।</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">कोई जुड़ा हुआ उपकरण नहीं है</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> जुड़ा हुआ उपकरण</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> जुड़े हुए उपकरण</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">बैटरी के आँकड़ों को रीसेट करें</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">अनुप्रयोग को वर्तमान निम्न-स्तर के बैटरी उपयोग डेटा को रीसेट करने देता है।</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-hr/cm_strings.xml b/core/res/res/values-hr/cm_strings.xml
index 8c04191..75abf47 100644
--- a/core/res/res/values-hr/cm_strings.xml
+++ b/core/res/res/values-hr/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Snimak zaslona</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">primaj zaštićeni SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Dopušta aplikaciji da prima dolazeći zaštićeni SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">Izmjena popisa zaštićenih SMS poruka</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Dozvoljava aplikaciji izmjenu popisa adresa zaštićenih SMS poruka.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sigurnost</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Dopuštenja vezana za sigurnosne informacije uređaja.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">čitati listu blokiranih poziva</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Dopušta aplikaciji čitanje informacija o telefonskim brojevima čije su dolazne poruke ili pozivi blokirani.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">promjeniti popis blokiranih poziva</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Dopušta aplikaciji promjenu telefonskih brojeva čije su dolazne poruke ili pozivi blokirani.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">postaviti pozadinu zaslona zaključavanja</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Dozvoljava aplikaciji promjenu pozadine zaslona zaključavanja.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Ponovno pokreni</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Trenutna</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Ponovno pokreni</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Način oporavka</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Brzo ponovno pokretanje</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Ponovno pokretanje</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tablet će ponovno biti pokrenut.</string>
   <string name="reboot_confirm" product="default">Telefon će ponovno biti pokrenut.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Ponovno pokretanje\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplikacija prisilno zaustavljena</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">Mrežni ADB omogućen</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB preko USB &amp; mreže omogućen</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Dodirnite za onemogućavanje ispravljanja pogrešaka.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s </xliff:g></string>
   <string name="adb_active_custom_tile_both">USB i mrežni</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Mreža</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Presresti pokretanje aplikacija</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s nije instalirano</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritet</string>
   <string name="silent_mode_none">Ništa</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wi- Fi Hotspot onemogućen zbog SIM promjene</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Isključite Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">omogućiti ili onemogućiti Zaštitu privatnosti</string>
   <string name="permdesc_changePrivacyGuardState">Dopušta aplikaciji odrediti hoće li druga aplikacija biti pokrenuta pod Nadzorom Privatnosti. Kada ja aplikacija pod Nadzorom Privatnosti, neće imati pristup osobnim podacima kao što su kontakti, zapisi poziva ili poruke.</string>
   <string name="privacy_guard_notification">Nadzor privatnosti aktivan</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> neće moći pristupiti osobnim podacima</string>
   <string name="privacy_guard_dialog_title">Nadzor privatnosti</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> želi <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Zapamti moj odabir</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">pristupiti kameri</string>
   <string name="app_ops_access_location">pristupiti vašoj lokaciji</string>
   <string name="app_ops_access_notifications">čitati vaše obavijesti</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">dobavi račune uređaja</string>
   <string name="app_ops_wifi_change">promjeni Wi-Fi stanje</string>
   <string name="app_ops_su">Zatraži root pristup</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Za otkvačiti ovaj zaslon dodirnite i držite tipku za natrag</string>
-  <string name="live_display_auto">Automatski</string>
-  <string name="live_display_auto_summary">Automatski prilagodi temperaturu boje zaslona nakon zalaska i izlaska sunca</string>
-  <string name="live_display_off">Isključeno</string>
-  <string name="live_display_off_summary">Onemogući sva prilagođavanja</string>
-  <string name="live_display_day">Dan</string>
-  <string name="live_display_day_summary">Koristi samo postavke za dan</string>
-  <string name="live_display_night">Noć</string>
-  <string name="live_display_night_summary">Koristi samo postavke za noć</string>
-  <string name="live_display_outdoor">Vani (jako sunce)</string>
-  <string name="live_display_outdoor_summary">Koristi samo postavke za van</string>
-  <string name="live_display_hint">LiveDisplay može smanjiti naprezanje očiju i poboljšati san. Dodirnite ovdje ako ga želite isprobati!</string>
-  <string name="tethered_notification_no_device_message">Uređaj nije spojen</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">Nema spojenih uređaja</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> povezani uređaj</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> povezanih uređaja</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Blokirana aktivnost pokretanja</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> je zaštićena od pokretanja. Dodirnite za potvrdu i pokrenite aplikaciju.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Baterija puna</string>
   <string name="notify_battery_fully_charged_text">Odspojite punjač s uređaja da bi poboljšali trajnost baterije.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">Resetirati statistike baterije</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Dopušta aplikaciji resetiranje trenutnog korištenja podataka uz štednju energije.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM kartice su se promijenile</string>
+  <string name="uicc_hot_swapped_event_text">Dodirnite za postavljanje SIM kartice zadane postavke</string>
 </resources>
diff --git a/core/res/res/values-hu/cm_strings.xml b/core/res/res/values-hu/cm_strings.xml
index 99e1062..5deb89c 100644
--- a/core/res/res/values-hu/cm_strings.xml
+++ b/core/res/res/values-hu/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Képernyőmentés</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">védett SMS fogadása</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Lehetővé teszi az alkalmazás számára, hogy védett SMS-t fogadjon.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">védett SMS lista módosítása</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Lehetővé teszi az alkalmazás számára, hogy módosítsa a védett SMS címlistát.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Biztonság</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Engedélyek az eszköz biztonsági információira vonatkozóan.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">tiltólista olvasása</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Lehetővé teszi az alkalmazás számára, hogy olvassa azokat a számokat, melyek blokkolva vannak bejövő hívásnál vagy üzenetnél.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">tiltólista módosítása</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Lehetővé teszi az alkalmazás számára, hogy szerkessze azokat a telefonszámokat melyek blokkolva vannak bejövő hívásnál vagy üzenetnél.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">billentyűzár háttérképének beállítása</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Lehetővé teszi az alkalmazás számára, hogy módosítsa a képernyőzár hátterét.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Újraindítás</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Jelenlegi</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Újraindítás</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Lágy újraindítás</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Újraindítás</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">A táblagép újraindul.</string>
   <string name="reboot_confirm" product="default">A telefon újraindul.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Újraindítás\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Alkalmazás leállítva</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB hálózaton keresztül engedélyezve</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB USB-n &amp; hálózaton keresztül engedélyezve</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Érintse meg a hibakeresés letiltásához.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
-  <string name="adb_active_custom_tile_both">USB &amp; hálózat</string>
+  <string name="adb_active_custom_tile_both">USB és hálózat</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Hálózat</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">alkalmazás indításának feltartóztatása</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s nincs telepítve</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritás</string>
   <string name="silent_mode_none">Nincs</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wi\u2011Fi hotspot kikapcsolva a SIM előfizetés módosítása miatt</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Wi\u2011Fi kikapcsolása</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">adatvédelem engedélyezése vagy tiltása</string>
   <string name="permdesc_changePrivacyGuardState">Lehetővé teszi, hogy más alkalmazások számára engedélyezze, vagy letiltsa az adatvédelmet. Amikor az alkalmazás adatvédelmi módban fut, nem fog hozzáférni az Ön személyes adataihoz, mint a névjegyzékéhez, üzeneteihez, vagy a hívásnaplójához.</string>
   <string name="privacy_guard_notification">Adatvédelem aktív</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> nem fog hozzáférni a személyes adataihoz</string>
   <string name="privacy_guard_dialog_title">Adatvédelmi beállítások</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> a következő műveletet szeretné végrehajtani: <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Jegyezze meg a választást</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">hozzáférés a kamerához</string>
   <string name="app_ops_access_location">hozzáférés a helyadataihoz</string>
   <string name="app_ops_access_notifications">értesítések olvasása</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">eszköz fiókok lekérése</string>
   <string name="app_ops_wifi_change">Wi-Fi állapot módosítása</string>
   <string name="app_ops_su">rendszergazdai jogosultság szerzése</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Képernyő rögzítésének feloldásához érintse meg és tartsa nyomva a Vissza gombot.</string>
-  <string name="live_display_auto">Automatikus</string>
-  <string name="live_display_auto_summary">Automatikusan beállítja a képernyő színhőmérsékletét napnyugta és napkelte után</string>
-  <string name="live_display_off">Ki</string>
-  <string name="live_display_off_summary">Az összes beállítás kikapcsolása</string>
-  <string name="live_display_day">Nappal</string>
-  <string name="live_display_day_summary">Csak a nappali beállítások használata</string>
-  <string name="live_display_night">Éjszaka</string>
-  <string name="live_display_night_summary">Csak az éjszakai béállítások használata</string>
-  <string name="live_display_outdoor">Kültéri (erős napfény)</string>
-  <string name="live_display_outdoor_summary">Csak a kültéri beállítások használata</string>
-  <string name="live_display_hint">A LiveDisplay segíthet a szemek terhelésének csökkentésében és a jobb éjszakai alvásban. Kattintson ide, hogy kipróbálja!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nincs csatlakoztatott készülék</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> csatlakoztatott eszköz</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> csatlakoztatott eszköz</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Tevékenység elindítás blokkolva</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> védve van az indításra. Kattintson a hitelesítésére és indítsa el az alkalmazást.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Akkumulátor teljesen feltöltve</string>
   <string name="notify_battery_fully_charged_text">A készüléket vegye le a töltőről, hogy javítsa az akkumulátor élettartamát.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">akkumulátor használati statisztika törlése</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Lehetővé teszi az alkalmazás számára, hogy törölhesse alacsony szintű akkumulátor használatára vonatkozó adatokat.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Megváltoztak a SIM-kártyák</string>
+  <string name="uicc_hot_swapped_event_text">Koppintson a SIM-kártya alapértelmezett beállításainak megadásához</string>
 </resources>
diff --git a/core/res/res/values-hy-rAM/cm_strings.xml b/core/res/res/values-hy-rAM/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-hy-rAM/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-in/cm_strings.xml b/core/res/res/values-in/cm_strings.xml
index 0b540da..bfe62e4 100644
--- a/core/res/res/values-in/cm_strings.xml
+++ b/core/res/res/values-in/cm_strings.xml
@@ -17,52 +17,92 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="global_action_screenshot">Tangkapan Layar</string>
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">Tangkap layar</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">terima SMS yang dilindungi</string>
-  <string name="permdesc_receiveProtectedSms">Izinkan aplikasi untuk menerima SMS masuk yang dilindungi.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">Izinkan aplikasi untuk menerima SMS yang dilindungi.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modifikasi daftar SMS yang dilindungi</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Izinkan aplikasi untuk mengubah daftar alamat SMS yang dilindungi.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Keamanan</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Izin terkait dengan informasi keamanan perangkat.</string>
-  <string name="permlab_readPhoneBlacklist">baca blacklist telepon</string>
-  <string name="permdesc_readPhoneBlacklist">Memungkinkan aplikasi untuk membaca informasi tentang nomor telepon yang diblokir untuk panggilan atau pesan.</string>
-  <string name="permlab_changePhoneBlacklist">ubah blacklist telepon</string>
-  <string name="permdesc_changePhoneBlacklist">Memungkinkan aplikasi untuk mengubah nomor telepon yang diblokir untuk panggilan atau pesan.</string>
-  <string name="permlab_setKeyguardWallpaper">set keyguard wallpaper</string>
-  <string name="permdesc_setKeyguardWallpaper">Izinkan aplikasi untuk mengubah wallpaper layar kunci.</string>
-  <string name="global_action_reboot">Reboot</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">baca daftar hitam telepon</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">Izinkan aplikasi untuk membaca informasi tentang nomor telepon yang diblokir untuk panggilan atau pesan.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">ubah daftar hitam telepon</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">Izinkan aplikasi untuk mengubah nomor telepon yang diblokir untuk panggilan masuk atau pesan.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">atur gambar latar pengaman tombol</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">Izinkan aplikasi untuk mengubah gambar latar layar kunci.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">Mulai ulang</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Saat ini</string>
-  <string name="reboot_reboot">Reboot</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">Mulai ulang</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
-  <string name="reboot_soft">Soft reboot</string>
-  <string name="reboot_title">Reboot</string>
-  <string name="reboot_confirm" product="tablet">Tablet Anda akan direboot.</string>
-  <string name="reboot_confirm" product="default">Ponsel Anda akan direboot.</string>
-  <string name="reboot_progress">Rebooting\u2026</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">Mulai ulang cepat</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">Mulai ulang</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">Tablet anda akan dimulai ulang.</string>
+  <string name="reboot_confirm" product="default">Ponsel anda akan mulai ulang.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">Memulai ulang\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplikasi dimatikan</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB melalui jaringan diaktifkan</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB melalui USB &amp; jaringan diaktifkan</string>
-  <string name="adb_active_generic_notification_message">Sentuh untuk menonaktifkan debug.</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">Sentuh untuk menonaktifkan debugging.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">Jaringan &amp; USB</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Jaringan</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Mencegah memulai aplikasi</string>
-  <string name="stylus_app_not_installed">%s tidak terpasang</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s tidak terinstal</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritas</string>
-  <string name="silent_mode_none">Tidak Ada</string>
+  <string name="silent_mode_none">Tidak ada</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">Wi-Fi hotspot dinonatifkan karena perubahan langganan SIM</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Nonaktifkan Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Aktifkan atau nonaktifkan Penjaga Privasi</string>
-  <string name="permdesc_changePrivacyGuardState">Perbolehkan aplikasi untuk mengubah apakah applikasi lain berjalan dengan Penjaga Privasi. Ketika aplikasi berjalan dengan Penjaga Privasi, aplikasi tidak akan memiliki akses ke data pribadi seperti kontak, daftar panggilan atau pesan.</string>
+  <string name="permdesc_changePrivacyGuardState">Izinkan aplikasi untuk mengubah apakah applikasi lain berjalan dengan Penjaga Privasi. Ketika aplikasi sedang berjalan dengan Penjaga Privasi, aplikasi tidak akan memiliki akses untuk data pribadi seperti kontak, daftar panggilan atau pesan.</string>
   <string name="privacy_guard_notification">Penjaga Privasi aktif</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> tidak akan dapat mengakses data pribadi</string>
   <string name="privacy_guard_dialog_title">Penjaga Privasi</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> ingin <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Ingat pilihan saya</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">mengakses kamera</string>
-  <string name="app_ops_access_location">mengakses lokasi anda</string>
-  <string name="app_ops_access_notifications">membaca notifikasi anda</string>
+  <string name="app_ops_access_location">mengakses lokasi Anda</string>
+  <string name="app_ops_access_notifications">membaca notifikasi Anda</string>
   <string name="app_ops_activate_vpn">Aktifkan VPN</string>
   <string name="app_ops_auto_start">mulai pada saat dinyalakan</string>
   <string name="app_ops_delete_call_log">hapus log panggilan Anda</string>
@@ -71,31 +111,33 @@
   <string name="app_ops_delete_sms">hapus pesan SMS Anda</string>
   <string name="app_ops_draw_on_top">menarik jendela di atas</string>
   <string name="app_ops_get_usage_stats">dapatkan statistik penggunaan aplikasi</string>
-  <string name="app_ops_keep_device_awake">jaga perangkat anda tetap bangun</string>
+  <string name="app_ops_keep_device_awake">jaga perangkat Anda tetap bangun</string>
   <string name="app_ops_make_phone_call">membuat panggilan telepon</string>
-  <string name="app_ops_modify_calendar">memperbarui kalender anda</string>
+  <string name="app_ops_modify_calendar">memperbarui kalender Anda</string>
   <string name="app_ops_modify_call_log">memperbarui daftar panggilan</string>
   <string name="app_ops_modify_clipboard">memodifikasi clipboard</string>
-  <string name="app_ops_modify_contacts">memperbarui kontak anda</string>
+  <string name="app_ops_modify_contacts">memperbarui kontak Anda</string>
   <string name="app_ops_modify_settings">memperbarui pengaturan sistem</string>
   <string name="app_ops_mute_unmute_microphone">diam/mengaktifkan suara mikrofon</string>
-  <string name="app_ops_play_audio">putar audio</string>
+  <string name="app_ops_play_audio">mainkan audio</string>
   <string name="app_ops_post_notification">mengirim pemberitahuan</string>
   <string name="app_ops_project_media">proyek media</string>
-  <string name="app_ops_read_calendar">membaca kalender anda</string>
-  <string name="app_ops_read_call_log">membaca daftar panggilan</string>
+  <string name="app_ops_read_calendar">membaca kalender Anda</string>
+  <string name="app_ops_read_call_log">membaca log panggilan</string>
   <string name="app_ops_read_clipboard">membaca clipboard</string>
-  <string name="app_ops_read_contacts">membaca kontak anda</string>
-  <string name="app_ops_read_mms">membaca pesan MMS anda</string>
-  <string name="app_ops_read_sms">membaca pesan SMS anda</string>
+  <string name="app_ops_read_contacts">membaca kontak Anda</string>
+  <string name="app_ops_read_mms">membaca pesan MMS Anda</string>
+  <string name="app_ops_read_sms">membaca pesan SMS Anda</string>
   <string name="app_ops_receive_sms">menerima pesan SMS</string>
   <string name="app_ops_record_audio">merekam audio</string>
   <string name="app_ops_send_mms">mengirim pesan MMS</string>
   <string name="app_ops_send_sms">mengirim pesan SMS</string>
   <string name="app_ops_start_at_bootup">mulai pada saat dinyalakan</string>
   <string name="app_ops_toast_window">tampilkan pesan toast</string>
-  <string name="app_ops_toggle_bluetooth">toggle Bluetooth</string>
-  <string name="app_ops_toggle_nfc">toggle NFC</string>
+  <string name="app_ops_toggle_bluetooth">hidup/matikan Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">hidup/matikan data seluler</string>
+  <string name="app_ops_toggle_nfc">hidup/matikan NFC</string>
+  <string name="app_ops_toggle_wifi">hidup/matikan Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">mengatur volume alarm</string>
   <string name="app_ops_use_audio_focus">mengatur fokus audio</string>
   <string name="app_ops_use_bluetooth_volume">mengatur volume Bluetooth</string>
@@ -104,24 +146,48 @@
   <string name="app_ops_use_media_volume">mengatur volume media</string>
   <string name="app_ops_use_notification_volume">mengatur volume pemberitahuan</string>
   <string name="app_ops_use_ring_volume">mengatur volume nada dering</string>
-  <string name="app_ops_use_vibrate">menggunakan umpan balik haptic</string>
+  <string name="app_ops_use_vibrate">gunakan tanggapan sentuhan</string>
   <string name="app_ops_use_voice_volume">mengatur volume panggilan suara</string>
   <string name="app_ops_write_mms">tulis pesan MMS</string>
   <string name="app_ops_write_sms">tulis pesan SMS</string>
+  <string name="app_ops_use_fingerprint">gunakan sidik jari</string>
+  <string name="app_ops_add_voicemail">menambahkan pesan suara</string>
+  <string name="app_ops_read_phone_state">akses status ponsel</string>
+  <string name="app_ops_scan_wifi">memindai jaringan Wi-Fi</string>
+  <string name="app_ops_change_wallpaper">mengubah wallpaper</string>
+  <string name="app_ops_assist_structure">gunakan struktur bantuan</string>
+  <string name="app_ops_assist_screenshot">ambil tangkapan layar</string>
+  <string name="app_ops_use_body_sensors">menggunakan sensor badan</string>
+  <string name="app_ops_read_cell_broadcasts">baca siaran seluler</string>
+  <string name="app_ops_mock_location">memalsukan lokasi Anda</string>
+  <string name="app_ops_read_external_storage">membaca penyimpanan eksternal</string>
+  <string name="app_ops_write_external_storage">menulis penyimpanan eksternal</string>
+  <string name="app_ops_turn_on_screen">aktifkan layar</string>
+  <string name="app_ops_get_accounts">dapatkan akun perangkat</string>
+  <string name="app_ops_wifi_change">ubah status Wi-Fi</string>
   <string name="app_ops_su">dapatkan akses root</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Untuk melepas sematan layar ini, sentuh dan tahan tombol Kembali.</string>
-  <string name="live_display_auto">Otomatis</string>
-  <string name="live_display_auto_summary">Secara otomatis menyesuaikan suhu warna layar setelah matahari terbenam dan terbit</string>
-  <string name="live_display_off">Nonaktif</string>
-  <string name="live_display_off_summary">Menonaktifkan semua penyesuaian</string>
-  <string name="live_display_day">Hari</string>
-  <string name="live_display_day_summary">Menggunakan pengaturan hari hanya</string>
-  <string name="live_display_night">Malam</string>
-  <string name="live_display_night_summary">Menggunakan pengaturan malam saja</string>
-  <string name="live_display_outdoor">Luar ruangan (matahari terang)</string>
-  <string name="live_display_outdoor_summary">Gunakan pengaturan luar ruangan saja</string>
-  <string name="live_display_hint">LiveDisplay dapat membantu mengurangi kelelahan mata dan membantu Anda tidur di malam hari. Klik di sini untuk mencobanya!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Tidak ada perangkat yang terhubung</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> perangkat yang terhubung</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> perangkat yang terhubung</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Aktivitas peluncuran diblokir</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> dilindungi dari peluncuran. Ketuk untuk mengautentikasi dan meluncurkan aplikasi.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Baterai telah terisi penuh</string>
+  <string name="notify_battery_fully_charged_text">Lepaskan perangkat dari pengisi daya agar meningkatkan umur baterai.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">set ulang statistik baterai</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Mengizinkan aplikasi untuk set ulang data penggunaan baterai rendah yang sekarang.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Kartu SIM telah diganti</string>
+  <string name="uicc_hot_swapped_event_text">Ketuk untuk mengatur preferensi standar kartu SIM</string>
 </resources>
diff --git a/core/res/res/values-is-rIS/cm_strings.xml b/core/res/res/values-is-rIS/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-is-rIS/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-it/cm_strings.xml b/core/res/res/values-it/cm_strings.xml
index 0c418b7..6adba65 100644
--- a/core/res/res/values-it/cm_strings.xml
+++ b/core/res/res/values-it/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Cattura schermata</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">ricevere SMS protetti</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Consenti all\'app di ricevere SMS protetti.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modifica la lista di SMS protetti</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Consente all\'app di modificare la lista indirizzi SMS protetta.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sicurezza</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Autorizzazioni relative alle informazioni sulla sicurezza del dispositivo.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">legge la blacklist del telefono</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Consente all\'app di leggere le informazioni sui numeri di telefono che vengono bloccati per messaggi o chiamate in arrivo.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">modifica la blacklist del telefono</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Consente all\'app di modificare i numeri di telefono che vengono bloccati per messaggi o chiamate in arrivo.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">imposta sfondo sblocco schermo</string>
-  <string name="permdesc_setKeyguardWallpaper">Consente all\'app di cambiare lo sfondo della schermata di sblocco.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">Consente all\'app di cambiare lo sfondo del blocco schermo.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Riavvia</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Corrente</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Riavvia</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Riavvio veloce</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Riavvia</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Il dispositivo verrà riavviato.</string>
   <string name="reboot_confirm" product="default">Il telefono verrà riavviato.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Riavvio\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">App terminata</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB attraverso la rete attivato</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB attraverso USB &amp; rete attivato</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Tocca per disattivare il debug.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; rete</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Rete</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Intercetta lancio app</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s non è installato</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Priorità</string>
   <string name="silent_mode_none">Nessuno</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Hotspot WiFi disattivato in seguito al cambio di SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Spegni Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">attiva o disattiva Privacy Guard</string>
   <string name="permdesc_changePrivacyGuardState">Consente all\'app di decidere se un\'altra app viene eseguita con Privacy Guard. Quando un\'app viene eseguita con Privacy Guard, non ha accesso a dati personali come contatti, lista chiamate o messaggi.</string>
   <string name="privacy_guard_notification">Privacy Guard attiva</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> non sarà in grado di accedere ai dati personali</string>
   <string name="privacy_guard_dialog_title">Privacy Guard</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> vorrebbe <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Ricorda la mia scelta</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">accedere alla fotocamera</string>
   <string name="app_ops_access_location">accedere alla posizione</string>
   <string name="app_ops_access_notifications">leggere le tue notifiche</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">ottieni account dispositivo</string>
   <string name="app_ops_wifi_change">cambia stato Wi-Fi</string>
   <string name="app_ops_su">Ottieni accesso root</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Per sbloccare questo schermo, tocca e tieni premuto il pulsante indietro.</string>
-  <string name="live_display_auto">Automatico</string>
-  <string name="live_display_auto_summary">Regola automaticamente la temperatura del colore dello schermo dopo il tramonto e l\'alba</string>
-  <string name="live_display_off">Disattivato</string>
-  <string name="live_display_off_summary">Disattiva tutte le regolazioni</string>
-  <string name="live_display_day">Giorno</string>
-  <string name="live_display_day_summary">Usa solo impostazioni giorno</string>
-  <string name="live_display_night">Notte</string>
-  <string name="live_display_night_summary">Utilizza solo impostazioni notte</string>
-  <string name="live_display_outdoor">All\'aperto (sole)</string>
-  <string name="live_display_outdoor_summary">Utilizza solo impostazioni all\'aperto</string>
-  <string name="live_display_hint">LiveDisplay aiuta a ridurre l\'affaticamento degli occhi e aiuta a dormire di notte. Clicca per provarlo!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nessun dispositivo connesso</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo connesso</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivi connessi</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Lancio dell\'app bloccato</string>
   <string name="notify_package_component_protected_text">L\'app <xliff:g id="app_name">%1$s</xliff:g> è protetta. Tocca qui per autenticarti e aprire l\'app.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Batteria completamente carica</string>
   <string name="notify_battery_fully_charged_text">Disconnetti il dispositivo dal caricatore per preservare la longevità della batteria.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">reimposta statistiche batteria</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Consente all\'applicazione di reimpostare gli attuali dati di utilizzo della batteria a basso livello.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Le SIM sono cambiate</string>
+  <string name="uicc_hot_swapped_event_text">Toccare per impostare le preferenze predefinite della SIM</string>
 </resources>
diff --git a/core/res/res/values-iw/cm_strings.xml b/core/res/res/values-iw/cm_strings.xml
index 42da952..291bacc 100644
--- a/core/res/res/values-iw/cm_strings.xml
+++ b/core/res/res/values-iw/cm_strings.xml
@@ -17,56 +17,94 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">צילום מסך</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">קבלת הודעות SMS מוגנות</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">מאפשר ליישום לקבל הודעות SMS מוגנות.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">שינוי רשימת הודעות SMS מוגנות</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">מאפשר ליישום לשנות את רשימת הכתובות של הודעות SMS מוגנות.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">אבטחה</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">הרשאות הקשורות לאבטחת המידע במכשיר.</string>
-  <string name="permlab_readPhoneBlacklist">קריאת הרשימה השחורה של המכשיר</string>
-  <string name="permdesc_readPhoneBlacklist">מאפשר ליישום לגשת למידע אודות מספרי הטלפון שנחסמו לקבלת שיחות והודעות נכנסות.</string>
-  <string name="permlab_changePhoneBlacklist">שינוי הרשימה השחורה</string>
-  <string name="permdesc_changePhoneBlacklist">מאפשר ליישום לשנות את המספרים המופיעים ברשימה השחורה, אשר נחסמו לקבלת שיחות והודעות נכנסות.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">קריאת הרשימה השחורה של הטלפון</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">מאפשר ליישום לקרוא מידע אודות מספרי הטלפון שנחסמו עבור קבלת שיחות או הודעות נכנסות.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">שנה רשימה שחורה של הטלפון</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">מאפשר ליישום לשנות את המספרים שנחסמו עבור קבלת שיחות או הודעות נכנסות.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">הגדרת טפט למסך הנעילה</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">מאפשר ליישום לשנות את הטפט של מסך הנעילה.</string>
-  <string name="global_action_reboot">הפעלה מחדש</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">אתחול מחדש</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">נוכחי</string>
-  <string name="reboot_reboot">הפעלה מחדש</string>
-  <string name="reboot_recovery">Recovery</string>
-  <string name="reboot_bootloader">Bootloader</string>
-  <string name="reboot_download">מצב הורדה</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">אתחול מחדש</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">שחזור</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">תוכנת טעינה ראשונית</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">הורדה</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">אתחול מהיר</string>
-  <string name="reboot_title">הפעלה מחדש</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">אתחול מחדש</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">הטאבלט יופעל מחדש.</string>
-  <string name="reboot_confirm" product="default">המכשיר יופעל מחדש.</string>
+  <string name="reboot_confirm" product="default">הטלפון יאותחל מחדש.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">מאתחל\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">היישום נסגר</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB דרך רשת מופעל</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB דרך USB ורשת מופעל</string>
-  <string name="adb_active_generic_notification_message">לחץ לעצירת איתור באגים.</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">גע להשבתת איתור באגים.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB ורשת</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">רשת</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">יירוט הפעלת יישום</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s לא מותקן</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">עדיפות</string>
   <string name="silent_mode_none">ללא</string>
-  <string name="subscription_change_disabled_wifi_ap">נקודת Wi-Fi חמה הושבתה עקב שינוי מנוי SIM</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">נקודת רשת ציבורית Wi-Fi הושבתה עקב שינוי מנוי SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">כיבוי Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">הפעלה או השבתה של שומר הפרטיות</string>
-  <string name="permdesc_changePrivacyGuardState">מאפשר ליישום לקבוע האם יישום אחר יפעל תחת שומר הפרטיות. כאשר יישום פועל תחת שומר הפרטיות, לא תהיה לו גישה למידע פרטי כמו אנשי קשר, יומן שיחות והודעות.</string>
+  <string name="permdesc_changePrivacyGuardState">מאפשר ליישום לשנות הרשאות של יישום אחר כדי שיפעל תחת שומר הפרטיות. כאשר יישום פועל תחת שומר הפרטיות, לא תהיה לו גישה למידע פרטי כמו אנשי קשר, יומן שיחות והודעות.</string>
   <string name="privacy_guard_notification">שומר הפרטיות פעיל</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> לא יוכל לגשת למידע אישי</string>
   <string name="privacy_guard_dialog_title">שומר הפרטיות</string>
-  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> מבקש <xliff:g id="op">%2$s</xliff:g>.</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> מבקש/ת <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">זכור את הבחירה שלי</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">גישה למצלמה</string>
   <string name="app_ops_access_location">גישה למיקום שלך</string>
   <string name="app_ops_access_notifications">קריאת ההתראות שלך</string>
   <string name="app_ops_activate_vpn">הפעלת VPN</string>
-  <string name="app_ops_auto_start">התחלת פעילות בהדלקת המכשיר</string>
+  <string name="app_ops_auto_start">התחל פעילות בהדלקת המכשיר</string>
   <string name="app_ops_delete_call_log">מחיקת יומן השיחות שלך</string>
   <string name="app_ops_delete_contacts">מחיקת אנשי הקשר שלך</string>
   <string name="app_ops_delete_mms">מחיקת הודעות ה-MMS שלך</string>
@@ -101,50 +139,55 @@
   <string name="app_ops_toggle_nfc">שינוי מצב ה-NFC</string>
   <string name="app_ops_toggle_wifi">הפעלת/כיבוי Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">שליטה בעוצמת השעון המעורר</string>
-  <string name="app_ops_use_audio_focus">שליטה במיקוד הקול</string>
-  <string name="app_ops_use_bluetooth_volume">שליטה על עוצמת השמע ב-Bluetooth</string>
-  <string name="app_ops_use_master_volume">שליטה על עוצמת השמע הראשית</string>
-  <string name="app_ops_use_media_buttons">שימוש בכפתורי המדיה</string>
-  <string name="app_ops_use_media_volume">שליטה על עוצמת השמעת מדיה</string>
-  <string name="app_ops_use_notification_volume">שליטה על עוצמת צליל ההתראות</string>
-  <string name="app_ops_use_ring_volume">שליטה על עוצמת הצלצול</string>
-  <string name="app_ops_use_vibrate">שימוש ברטט</string>
+  <string name="app_ops_use_audio_focus">שליטה במיקוד השמע</string>
+  <string name="app_ops_use_bluetooth_volume">שליטה בעוצמת קול ב-Bluetooth</string>
+  <string name="app_ops_use_master_volume">שליטה בעוצמת הקול הראשית</string>
+  <string name="app_ops_use_media_buttons">שימוש בלחצני המדיה</string>
+  <string name="app_ops_use_media_volume">שליטה בעוצמת קול למדיה</string>
+  <string name="app_ops_use_notification_volume">שליטה בעוצמת קול ההתראות</string>
+  <string name="app_ops_use_ring_volume">שליטה בעוצמת קול לרינגטון</string>
+  <string name="app_ops_use_vibrate">שימוש במשוב רטט</string>
   <string name="app_ops_use_voice_volume">שליטה על עוצמת הקול בשיחה</string>
   <string name="app_ops_write_mms">כתיבת הודעת MMS</string>
   <string name="app_ops_write_sms">כתיבת הודעת SMS</string>
   <string name="app_ops_use_fingerprint">שימוש בטביעת אצבע</string>
-  <string name="app_ops_add_voicemail">הוספת תא קולי</string>
-  <string name="app_ops_read_phone_state">גישה למצב המכשיר</string>
-  <string name="app_ops_scan_wifi">סריקת רשתות Wi-Fi</string>
-  <string name="app_ops_change_wallpaper">החלפת טפט</string>
-  <string name="app_ops_assist_structure">שימוש במבנה סיוע</string>
-  <string name="app_ops_assist_screenshot">צילום המסך</string>
-  <string name="app_ops_use_body_sensors">שימוש בחיישני גוף</string>
-  <string name="app_ops_read_cell_broadcasts">קריאת שידורי סלולר</string>
-  <string name="app_ops_mock_location">הסוואת מיקום</string>
-  <string name="app_ops_read_external_storage">קריאת אחסון חיצוני</string>
-  <string name="app_ops_write_external_storage">כתיבה לאחסון חיצוני</string>
-  <string name="app_ops_turn_on_screen">הפעלת המסך</string>
-  <string name="app_ops_get_accounts">קבלת חשבונות המכשיר</string>
-  <string name="app_ops_wifi_change">שינוי מצב Wi-Fi</string>
+  <string name="app_ops_add_voicemail">הוסף תא קולי</string>
+  <string name="app_ops_read_phone_state">גש למצב הטלפון</string>
+  <string name="app_ops_scan_wifi">סרוק רשתות Wi-Fi</string>
+  <string name="app_ops_change_wallpaper">החלף טפט</string>
+  <string name="app_ops_assist_structure">שימוש בתבנית המידע ליישום הסיוע</string>
+  <string name="app_ops_assist_screenshot">צלם מסך</string>
+  <string name="app_ops_use_body_sensors">השתמש בחיישני גוף</string>
+  <string name="app_ops_read_cell_broadcasts">קרא שידורי סלולר</string>
+  <string name="app_ops_mock_location">הסווה את מיקומך</string>
+  <string name="app_ops_read_external_storage">קרא אחסון חיצוני</string>
+  <string name="app_ops_write_external_storage">כתוב לאחסון חיצוני</string>
+  <string name="app_ops_turn_on_screen">הפעל המסך</string>
+  <string name="app_ops_get_accounts">קבל חשבונות מכשיר</string>
+  <string name="app_ops_wifi_change">שנה מצב Wi-Fi</string>
   <string name="app_ops_su">קבלת גישת שורש (Root)</string>
-  <string name="lock_to_app_toast_no_navbar">כדי לבטל נעיצת מסך זה, לחץ על כפתור \"חזור\" והחזק אותו.</string>
-  <string name="live_display_auto">אוטומטי</string>
-  <string name="live_display_auto_summary">התאם אוטומטית את טמפרטורת הצבע של המסך לאחר הזריחה והשקיעה</string>
-  <string name="live_display_off">כבוי</string>
-  <string name="live_display_off_summary">בטל את כל ההתאמות</string>
-  <string name="live_display_day">יום</string>
-  <string name="live_display_day_summary">השתמש בהגדרות יום בלבד</string>
-  <string name="live_display_night">לילה</string>
-  <string name="live_display_night_summary">השתמש בהגדרות לילה בלבד</string>
-  <string name="live_display_outdoor">בחוץ (שמש בהירה)</string>
-  <string name="live_display_outdoor_summary">השתמש בהגדרות חוץ בלבד</string>
-  <string name="live_display_hint">LiveDisplay יכולה למזער את עייפות העין ולעזור לך לישון בלילה. לחץ כאן כדי לנסות!</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">כדי לבטל נעיצת מסך זה, גע והחזק בלחצן \"הקודם\".</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">אין מכשירים מחוברים</string>
   <string name="tethered_notification_one_device_message">מכשיר <xliff:g id="count">%1$s</xliff:g> מחובר</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> מכשירים מחוברים</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">הפעלת הפעולה נחסמה</string>
-  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> מוגן מפני הפעלה. לחץ כדי להזדהות ולהפעיל את היישום.</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> מוגן מפני הפעלה. הקש כדי להזדהות ולהפעיל את היישום.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">סוללה טעונה במלואה</string>
   <string name="notify_battery_fully_charged_text">נתק את מכשירך מהמטען כדי לשפר את אורך חיי סוללה.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">איפוס סטטיסטיקות סוללה</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">מאפשר ליישום לאפס נתוני רמה-נמוכה נוכחיים של השימוש בסוללה.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">כרטיסי SIM הוחלפו</string>
+  <string name="uicc_hot_swapped_event_text">הקש כדי להגדיר את העדפות ברירת המחדל של כרטיס ה-SIM</string>
 </resources>
diff --git a/core/res/res/values-ja/cm_strings.xml b/core/res/res/values-ja/cm_strings.xml
index bc6636a..7157ab2 100644
--- a/core/res/res/values-ja/cm_strings.xml
+++ b/core/res/res/values-ja/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">スクリーンショット</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">保護されたSMSの受信</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">保護されたSMSの受信をアプリに許可します。</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">保護されたSMSリストの変更</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">保護されたSMSアドレスリストの変更をアプリに許可します。</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">セキュリティ</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">端末のセキュリティ情報に関連する権限です。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">携帯電話の着信拒否リストの読み取り</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">着信やメッセージを拒否している電話番号に関する情報の読み取りをアプリに許可します。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">携帯電話の着信拒否リストの変更</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">着信やメッセージを拒否している電話番号の変更をアプリに許可します。</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">キーガードの壁紙の設定</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">ロック画面の壁紙の変更をアプリに許可します。</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">再起動</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">現在</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">再起動</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">リカバリー</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">ブートローダ</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">ダウンロード</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">ソフトリブート</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">再起動</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">タブレットは再起動します。</string>
   <string name="reboot_confirm" product="default">携帯電話は再起動します。</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">再起動中\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">アプリを終了しました。</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ネットワーク経由のADBが有効です</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USBとネットワーク経由のADBが有効です</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">タップしてデバッグを無効にします。</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USBとネットワーク</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">ネットワーク</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">アプリの起動の監視</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%sはインストールされていません</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">優先順位</string>
   <string name="silent_mode_none">なし</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">SIMサブスクリプションの変更によってWi-Fiアクセスポイントが無効になりました</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Wi-FiをOFFにする</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">プライバシーガードを有効/無効にする</string>
   <string name="permdesc_changePrivacyGuardState">他のアプリでプライバシーガードを有効にするかどうかの変更をアプリに許可します。プライバシーガードを有効にしてアプリを実行すると、そのアプリは連絡先、通話履歴、メッセージなどの個人データにアクセスできなくなります。</string>
   <string name="privacy_guard_notification">プライバシーガードが有効です</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g>は個人データにアクセスできません</string>
   <string name="privacy_guard_dialog_title">プライバシーガード</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g>が<xliff:g id="op">%2$s</xliff:g>をしようとしています。</string>
-  <string name="permission_remember_choice">選択を記憶</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">選択を保存</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">カメラへのアクセス</string>
   <string name="app_ops_access_location">位置情報へのアクセス</string>
   <string name="app_ops_access_notifications">通知の読み取り</string>
@@ -97,7 +135,7 @@
   <string name="app_ops_start_at_bootup">起動時の実行</string>
   <string name="app_ops_toast_window">トーストメッセージの表示</string>
   <string name="app_ops_toggle_bluetooth">Bluetoothの切り替え</string>
-  <string name="app_ops_toggle_mobile_data">データ通信の切り替え</string>
+  <string name="app_ops_toggle_mobile_data">モバイルデータの切り替え</string>
   <string name="app_ops_toggle_nfc">NFCの切り替え</string>
   <string name="app_ops_toggle_wifi">Wi-Fiの切り替え</string>
   <string name="app_ops_use_alarm_volume">アラームの音量の制御</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">端末のアカウントの取得</string>
   <string name="app_ops_wifi_change">Wi-Fiの状態の変更</string>
   <string name="app_ops_su">ルートアクセスの取得</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">この画面の固定を解除するには、戻るボタンを長押しします。</string>
-  <string name="live_display_auto">自動</string>
-  <string name="live_display_auto_summary">太陽の動きに合わせて画面の色温度を自動的に調整する</string>
-  <string name="live_display_off">OFF</string>
-  <string name="live_display_off_summary">すべての調整を無効にする</string>
-  <string name="live_display_day">昼</string>
-  <string name="live_display_day_summary">昼の設定のみを使用する</string>
-  <string name="live_display_night">夜</string>
-  <string name="live_display_night_summary">夜の設定のみを使用する</string>
-  <string name="live_display_outdoor">屋外（日光）</string>
-  <string name="live_display_outdoor_summary">屋外の設定のみを使用する</string>
-  <string name="live_display_hint">LiveDisplayは目を疲れにくくし、夜の睡眠を邪魔しません。ここをタップして試してみてください。</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">接続しているデバイスはありません</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g>台のデバイスが接続しています</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g>台のデバイスが接続しています</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">アクティビティの起動がブロックされました</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g>は起動できないように保護されています。タップして認証後にアプリケーションを起動してください。</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">電池の充電が完了しました</string>
   <string name="notify_battery_fully_charged_text">電池寿命を延ばすために端末を充電器から取り外してください。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">電池統計情報のリセット</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">現在の電池消費量の低レベルデータをリセットすることをアプリに許可します。</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIMカードが変更されました</string>
+  <string name="uicc_hot_swapped_event_text">タップしてSIMカードのデフォルトの設定をする</string>
 </resources>
diff --git a/core/res/res/values-ka-rGE/cm_strings.xml b/core/res/res/values-ka-rGE/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-ka-rGE/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-kk-rKZ/cm_strings.xml b/core/res/res/values-kk-rKZ/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-kk-rKZ/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-km-rKH/cm_strings.xml b/core/res/res/values-km-rKH/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-km-rKH/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-kn-rIN/cm_strings.xml b/core/res/res/values-kn-rIN/cm_strings.xml
index fcb9e94..8497c98 100644
--- a/core/res/res/values-kn-rIN/cm_strings.xml
+++ b/core/res/res/values-kn-rIN/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">ಸ್ಕ್ರೀನ್‍ಶಾಟ್</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">ಸಂರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಸ್ವೀಕರಿಸಿ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">ಆಪ್‍ಗೆ ಒಳಬರುವ ಸಂರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಸ್ವೀಕರಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">ಸಂರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಪಟ್ಟಿ ಮಾರ್ಪಡನೆ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">ಆಪ್‍ಗೆ ಸಂರಕ್ಷಿತ ಎಸ್‍ಎಂಎಸ್ ವಿಳಾಸ ಪಟ್ಟಿಯನ್ನು ಮಾರ್ಪಡಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">ಭದ್ರತೆ</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">ಸಾಧನ ಭದ್ರತೆ ಮಾಹಿತಿಗೆ ಸಂಬಂಧಿಸಿದ ಅನುಮತಿಗಳು.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">ಫೋನ್ ಬ್ಲಾಕ್‍ಪಟ್ಟಿಯನ್ನು ಓದು</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">ಆಪ್‍ಗೆ ಒಳಬರುವ ಕರೆಗಳನ್ನು ಅಥವಾ ಸಂದೇಶಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾದ ದೂರವಾಣಿ ಸಂಖ್ಯೆಗಳ ಬಗ್ಗೆ ಮಾಹಿತಿಯನ್ನು ಓದಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">ಫೋನ್ ಬ್ಲಾಕ್‍ಪಟ್ಟಿ ಬದಲಾವಣೆ</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">ಆಪ್‍ಗೆ ಒಳಬರುವ ಕರೆ ಮತ್ತು ಸಂದೇಶಗಳನ್ನು ನಿರ್ಬಂಧಿಸಲಾದ ಸಂಖ್ಯೆಗಳನ್ನು ಬದಲಾಯಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">ಕೀಗಾರ್ಡ್ ವಾಲ್‍ಪೇಪರ್ ಹೊಂದಿಕೆ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">ಒಂದು ಆಪ್‍ಗೆ ಲಾಕ್ ಪರದೆಯ ವಾಲ್‍ಪೇಪರ್ ಬದಲಾಯಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">ರಿಬೂಟ್</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">ಪ್ರಸ್ತುತ</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">ರಿಬೂಟ್</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">ರಿಕವರಿ</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">ಬೂಟ್‍ಲೋಡರ್</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">ಡೌನ್‍ಲೋಡ್</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">ಸಾಫ್ಟ್ ರಿಬೂಟ್</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">ರಿಬೂಟ್</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ರಿಬೂಟ್ ಆಗುವುದು.</string>
   <string name="reboot_confirm" product="default">ನಿಮ್ಮ ಫೋನ್ ರಿಬೂಟ್ ಆಗುವುದು.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">ರಿಬೂಟ್ ಆಗುತ್ತಿದೆ\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">ಆಪ್ ಕೊಲ್ಲಲಾಗಿದೆ</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ನೆಟ್‍ವರ್ಕ್‍ನಿಂದ ಎಡಿಬಿ ಸಕ್ರಿಯಗೊಂಡಿದೆ</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ಯುಎಸ್‍ಬಿಯಿಂದ ಎಡಿಬಿ &amp; ನೆಟ್‍ವರ್ಕ್ ಸಕ್ರಿಯಗೊಂಡಿದೆ</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">ಡೀಬಗ್ಗಿಂಗ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಸ್ಪರ್ಶಿಸಿ.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ಎಡಿಬಿ - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">ಯುಎಸ್‍ಬಿ &amp; ನೆಟ್‍ವರ್ಕ್</string>
   <string name="adb_active_custom_tile_usb">ಯುಎಸ್‍ಬಿ</string>
   <string name="adb_active_custom_tile_net">ನೆಟ್‍ವರ್ಕ್</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">ಆಪ್ ಆರಂಭ ಪ್ರತಿಬಂಧ</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s ಸ್ಥಾಪಿತವಾಗಿಲ್ಲ</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">ಆದ್ಯತೆ</string>
   <string name="silent_mode_none">ಶೂನ್ಯ</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">ಸಿಮ್ ಚಂದಾದಾರಿಕೆ ಬದಲಾದ ಕಾರಣ ವೈ-ಫೈ ಹಾಟ್‍ಸ್ಪಾಟನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">ವೈ-ಫೈ ಆಫ್ ಮಾಡಿ</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">ಗೌಪ್ಯತಾ ರಕ್ಷಕವನ್ನು ಸಕ್ರಿಯ ಅಥವ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವಿಕೆ</string>
   <string name="permdesc_changePrivacyGuardState">ಆಪ್‍ಗೆ ಇತರೆ ಆಪ್ ಗೌಪ್ಯತಾ ರಕ್ಷಕದ ಜೊತೆ  ಚಲಿಸಲು ಅಗುತ್ತದೆಯೆ ಅಥವ ಇಲ್ಲವೇ ಎಂಬುದನ್ನು ಬದಲಾಯಿಸಲು ಅನುಮತಿಸುತ್ತದೆ. ಒಂದು ಆಪ್ Privacy Guard ಜೊತೆ ಚಲಿಸುತ್ತಿದ್ದಲ್ಲಿ, ಅದಕ್ಕೆ ವಯಕ್ತಿಕ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಾಗುವಿದಿಲ್ಲ, ಉದಾಹರಣೆಗೆ ಸಂಪರ್ಕಗಳು, ಕರೆ ಲಾಗ್ಸ್, ಅಥವ ಸಂದೇಶಗಳು.</string>
   <string name="privacy_guard_notification">ಗೌಪ್ಯತಾ ರಕ್ಷಕ ಸಕ್ರಿಯ</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g>ಗೆ ಖಾಸಗಿ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ</string>
   <string name="privacy_guard_dialog_title">ಗೌಪ್ಯತಾ ರಕ್ಷಕ</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> ನೀವು ಹೀಗೆ <xliff:g id="op">%2$s</xliff:g> ಬಯಸುವಿರಾ.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">ನನ್ನ ಆಯ್ಕೆಯನ್ನು ನೆನಪಿಡು</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">ಕ್ಯಾಮೆರಾ ಪ್ರವೇಶ</string>
   <string name="app_ops_access_location">ನಿಮ್ಮ  ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸುವಿಕೆ</string>
   <string name="app_ops_access_notifications">ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಓದು</string>
@@ -97,7 +135,9 @@
   <string name="app_ops_start_at_bootup">ಪವರ್ ಅಪ್ ವೇಳೆ ಆರಂಭವಾಗು</string>
   <string name="app_ops_toast_window">ಟೋಸ್ಟ್ ಸಂದೇಶಗಳನ್ನು ಪ್ರದರ್ಶಿಸು</string>
   <string name="app_ops_toggle_bluetooth">ಟಾಗಲ್ ಬ್ಲೂಟೂತ್</string>
+  <string name="app_ops_toggle_mobile_data">ಮೊಬೈಲ್ ಡಾಟಾ ಟಾಗಲ್ ಮಾಡು</string>
   <string name="app_ops_toggle_nfc">ಟಾಗಲ್ NFC</string>
+  <string name="app_ops_toggle_wifi">Wi-Fi ಟಾಗಲ್ ಮಾಡು</string>
   <string name="app_ops_use_alarm_volume">ಅಲಾರಂ ವಾಲ್ಯೂಂ ನಿಯಂತ್ರಿಸು</string>
   <string name="app_ops_use_audio_focus">ಆಡಿಯೋ ಫೋಕಸ್ ನಿಯಂತ್ರಿಸು</string>
   <string name="app_ops_use_bluetooth_volume">ಬ್ಲೂಟೂತ್ ವಾಲ್ಯೂಂ ನಿಯಂತ್ರಿಸು</string>
@@ -110,20 +150,42 @@
   <string name="app_ops_use_voice_volume">ಧ್ವನಿ ಕರೆ ವಾಲ್ಯೂಂನ್ನು ನಿಯಂತ್ರಿಸು</string>
   <string name="app_ops_write_mms">ಎಂಎಂಎಸ್ ಸಂದೇಶ ಬರೆ</string>
   <string name="app_ops_write_sms">ಎಸ್ಎಂಎಸ್ ಸಂದೇಶ ಬರೆ</string>
+  <string name="app_ops_use_fingerprint">ಬೆರಳಚ್ಚು ಉಪಯೋಗಿಸು</string>
+  <string name="app_ops_add_voicemail">ಒಂದು ವಾಯ್ಸ್‌ಮೇಲ್‌ ಸೇರಿಸಿ</string>
+  <string name="app_ops_read_phone_state">ಫೋನ್‌ ಸ್ಥಿತಿ ಅಕ್ಸೆಸ್‌ ಮಾಡಿ</string>
+  <string name="app_ops_scan_wifi">Wi-Fi ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
+  <string name="app_ops_change_wallpaper">ವಾಲ್‌ಪೇಪರ್‌ ಬದಲಿಸಿ</string>
+  <string name="app_ops_assist_structure">ಅಸಿಸ್ಟ್‌ ರಚನೆ ಬಳಸಿ</string>
+  <string name="app_ops_assist_screenshot">ಸ್ಕ್ರೀನ್‌ಶಾಟ್‌ ತೆಗೆದುಕೊಳ್ಳಿ</string>
+  <string name="app_ops_use_body_sensors">ಬಾಡಿ ಸೆನ್ಸರ್ ಗಳನ್ನು ಉಪಯೋಗಿಸು</string>
+  <string name="app_ops_read_cell_broadcasts">ಸೆಲ್ ಬ್ರಾಡ್ ಕ್ಯಾಸ್ಟ್ ಗಳನ್ನು ಓದು</string>
+  <string name="app_ops_mock_location">ನಿಮ್ಮ ಸ್ಥಳ ಅಣಕು ಮಾಡಿ</string>
+  <string name="app_ops_read_external_storage">ಬಾಹ್ಯ ಸಂಗ್ರಹ ಓದು</string>
+  <string name="app_ops_write_external_storage">ಬಾಹ್ಯ ಸಂಗ್ರಹವನ್ನು ಬರೆಯಿರಿ</string>
+  <string name="app_ops_turn_on_screen">ಸ್ಕ್ರೀನ್ ಆನ್ ಮಾಡಿ</string>
+  <string name="app_ops_get_accounts">ಸಾಧನ ಖಾತೆಗಳನ್ನು ಪಡೆಯಿರಿ</string>
+  <string name="app_ops_wifi_change">ವೈಫೈ ಸ್ಥಿತಿ ಬದಲಿಸಿ</string>
   <string name="app_ops_su">ರೂಟ್ ಪ್ರವೇಶ ಪಡೆ</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">ಪರದೆಯನ್ನು ಅನ್‍ಪಿನ್‍ಮಾಡಲು, ಹಿಂದೆ ಬಟನ್‍ ಸ್ಪರ್ಶಿಸಿ ಹಿಡಿಯಿರಿ.</string>
-  <string name="live_display_auto">ಸ್ವಯಂಚಾಲಿತ</string>
-  <string name="live_display_auto_summary">ಸೂರ್ಯಾಸ್ತ ಅಥವ ಸೂರ್ಯೋದಯದ ನಂತರ ಪರದೆಯ ಬಣ್ಣ ಉಷ್ಣಾಂಶವನ್ನು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಸರಿಹೊಂದಿಸು</string>
-  <string name="live_display_off">ಆಫ್</string>
-  <string name="live_display_off_summary">ಎಲ್ಲಾ ಹೊಂದಾಣಿಕೆಗಳನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
-  <string name="live_display_day">ದಿನ</string>
-  <string name="live_display_day_summary">ದಿನ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು</string>
-  <string name="live_display_night">ರಾತ್ರಿ</string>
-  <string name="live_display_night_summary">ರಾತ್ರಿ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು</string>
-  <string name="live_display_outdoor">ಹೊರಾಂಗಣ (ಪ್ರಕಾಶಮಾನ ಸೂರ್ಯ)</string>
-  <string name="live_display_outdoor_summary">ಹೊರಾಂಗಣ ಸೆಟ್ಟಿಂಗ್ಸನ್ನು ಮಾತ್ರ ಉಪಯೋಗಿಸು</string>
-  <string name="live_display_hint">ಲೈವ್ ಡಿಸ್ಪ್ಲೆ ನಿಮ್ಮ ಕಣ್ಣಿನ ಆಯಾಸವನ್ನು ಕಡಿಮೆಮಾಡಿ ರಾತ್ರಿ ಮಲಗಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ. ಇದನ್ನು ಪ್ರಯತ್ನಿಸಲು ಇಲ್ಲಿ ಒತ್ತಿ!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ಯಾವುದೇ ಸಂಪರ್ಕಗೊಂಡ ಸಾಧನವಿಲ್ಲ</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ಸಂಪರ್ಕಗೊಳಿಸಿದ ಸಾಧನ</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> ಸಂಪರ್ಕಗೊಳಿಸಿದ ಸಾಧನಗಳು</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">ಆಕ್ಟಿವಿಟಿ ಲಾಂಚ್‌ ಬ್ಲಾಕ್‌ ಆಗಿದೆ</string>
+  <string name="notify_package_component_protected_text">ಲಾಂಚ್‌ ಆಗುವುದರಿಂದ <xliff:g id="app_name">%1$s</xliff:g> ಸಂರಕ್ಷಿಸಲ್ಪಟ್ಟಿದೆ ದೃಢೀಕರಿಸಲು ತಟ್ಟಿ ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ ಲಾಂಚ್‌ ಮಾಡಿ.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">ಬ್ಯಾಟರಿ ಸಂಪೂರ್ಣವಾಗಿ ಚಾರ್ಜಾಗಿದೆ</string>
+  <string name="notify_battery_fully_charged_text">ಬ್ಯಾಟರಿ ದೀರ್ಘಾಯುಷ್ಯ ಸುಧಾರಿಸಲು ಚಾರ್ಜರ್ ನಿಂದ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಕಡಿತಗೊಳಿಸಿ.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">ಬ್ಯಾಟರಿ ಅಂಕಿಅಂಶಗಳನ್ನು ಮರುಹೊಂದಿಸು</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">ಒಂದು ಅಪ್ಲಿಕೇಶನ್‍ಗೆ ಪ್ರಸ್ತುತ ಕಡಿಮೆ-ಮಟ್ಟದ ಬ್ಯಾಟರಿ ಬಳಕೆ ಡೇಟಾವನ್ನು ಮರುಹೊಂದಿಸಲು ಅನುಮತಿಸುತ್ತದೆ.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-ko/cm_strings.xml b/core/res/res/values-ko/cm_strings.xml
index f0b963e..5554d77 100644
--- a/core/res/res/values-ko/cm_strings.xml
+++ b/core/res/res/values-ko/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">스크린샷</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">보안 SMS 수신</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">앱이 들어오는 보안 SMS를 수신할 수 있도록 허용합니다.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">보안 SMS 목록 수정</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">앱이 보안 SMS 주소 목록을 수정할 수 있도록 허용합니다.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">보안</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">장치의 보안 정보에 관련된 권한입니다.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">전화 블랙리스트 읽기</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">앱이 전화 또는 메시지 수신이 차단된 전화번호들의 정보를 읽을 수 있도록 허용합니다.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">전화 블랙리스트 수정</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">앱이 어떤 전화번호들의 전화 또는 메시지를 차단할 것인지를 변경할 수 있도록 허용합니다.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">잠금화면 배경 설정</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">앱이 잠금화면 배경을 바꿀 수 있도록 허용합니다.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">다시 시작</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">현재</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">다시 시작</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">복구 모드</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">부트로더</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">다운로드</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">빠른 다시 시작</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">다시 시작</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">태블릿이 다시 시작됩니다.</string>
   <string name="reboot_confirm" product="default">휴대전화가 다시 시작됩니다.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">다시 시작하는 중\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">앱이 종료되었습니다</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">네트워크 ADB 활성화됨</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USB 및 네트워크 ADB 활성화됨</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">디버깅을 사용하지 않으려면 터치하세요.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="Usb">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB 및 네트워크</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">네트워크</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">앱 실행 차단</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s이(가) 설치되지 않음</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">우선순위</string>
   <string name="silent_mode_none">없음</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">SIM 구독 변경으로 인해 Wi-Fi 핫스팟 비활성화함</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Wi-Fi 끄기</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">프라이버시 가드 활성화 또는 비활성화</string>
   <string name="permdesc_changePrivacyGuardState">다른 앱이 프라이버시 가드와 함께 실행될 것인지 변경할 수 있도록  앱을 허용합니다. 앱이 프라이버시 가드와 함께 실행중일 땐 연락처, 통화 기록, 메시지 등의 개인 정보에 접근할 수 없게 됩니다.</string>
   <string name="privacy_guard_notification">프라이버시 가드 활성화</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g>은(는) 개인 데이터에 접근할 수 없습니다.</string>
   <string name="privacy_guard_dialog_title">프라이버시 가드</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g>이(가) <xliff:g id="op">%2$s</xliff:g>을(를) 원합니다.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">선택 사항 기억하기</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">카메라에 액세스</string>
   <string name="app_ops_access_location">위치 정보에 액세스</string>
   <string name="app_ops_access_notifications">알림 읽기</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">기기 계정 읽기</string>
   <string name="app_ops_wifi_change">Wi-Fi 상태 변경</string>
   <string name="app_ops_su">루트 권한 얻기</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">화면 고정을 해제하려면 뒤로 버튼을 계속 누르세요</string>
-  <string name="live_display_auto">자동</string>
-  <string name="live_display_auto_summary">일출 및 일몰 후 화면의 색 온도를 자동으로 조정</string>
-  <string name="live_display_off">끄기</string>
-  <string name="live_display_off_summary">모든 조정 사용 안 함</string>
-  <string name="live_display_day">주간</string>
-  <string name="live_display_day_summary">주간 설정만으로 사용</string>
-  <string name="live_display_night">야간</string>
-  <string name="live_display_night_summary">야간 설정만으로 사용</string>
-  <string name="live_display_outdoor">야외 (밝은 햇빛)</string>
-  <string name="live_display_outdoor_summary">야외 설정만으로 사용</string>
-  <string name="live_display_hint">LiveDisplay는 눈의 피로를 줄이고 밤에 수면을 돕습니다. 적용하려면 클릭하십시오!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">연결된 기기 없음</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g>대의 기기가 연결되어 있습니다</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g>대의 기기가 연결되어 있습니다</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">액티비티 실행 제한됨</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g>은(는) 실행이 제한되어 있습니다. 탭하여 제한을 해제하고 애플리케이션을 실행하세요.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">배터리가 완전히 충전됨</string>
   <string name="notify_battery_fully_charged_text">배터리 수명을 향상시키기 위해 기기를 충전기에서 분리하세요.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">배터리 통계 재설정</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">앱이 현재의 배터리 사용 데이터를 초기화할 수 있도록 허용합니다.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM 카드가 변경되었습니다</string>
+  <string name="uicc_hot_swapped_event_text">탭하여 SIM 카드를 재설정</string>
 </resources>
diff --git a/core/res/res/values-ku/cm_strings.xml b/core/res/res/values-ku/cm_strings.xml
index f24a4f0..eb98dc2 100644
--- a/core/res/res/values-ku/cm_strings.xml
+++ b/core/res/res/values-ku/cm_strings.xml
@@ -17,42 +17,80 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">وێنەگرتنی ڕوونما</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">وەرگرتنی کورتەنامەی پارێزراو</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">ڕێگە بە بەرنامەکە بدە کە کورتەنامە پارێزراوەکەی داهاتوو وەربگرێت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">دەستکاریکردنی لیستی کورتەنامە پارێزراوەکان</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">ڕێگەدان بە بەرنامەکە بۆ دەستکاریکردنی لیستی کورتەنامە پارێزراوەکان.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">ئاسایش</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">مۆڵەت پێدان پەیوەندی زانیاری ئاسایشی ئامێرەکە.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">خوێندنەوەی بلۆکی تەلەفۆن</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">ڕێگەدان: بە بەرنامەیەک بۆ خوێندنەوەی زانیاریەکان دەربارەی ژمارەی تەلەفۆنەکە کە بلۆک کراوە بۆ نامەو تەلەفۆنکردنی هاتوو.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">گۆڕنی تەلەفۆن لە لیستی ڕەش</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">ڕێگەدان بە بەرنامەکە بۆ ئەو ژمارانەی بلۆک کراون بۆ نامەو تەلەفۆن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">دانانی کلیلە پارێز بۆ دیوارپۆش</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">ڕێگەدان: بە بەرنامەیەک بۆ گۆڕینی قوفڵی ڕوونمای دیوارپۆش.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">دوبارە خستنەگەڕ</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">ئێستا</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">سه‌رله‌نوێ خستنه‌ڕێ</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">ڕیکەڤەری</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">بووتلەودەر</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">داگرتن</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">کارپێکردنه‌وه‌ی قوڵ</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">ئیشپێکردنەوە</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">سه‌رله‌نوێ خستنه‌ڕێ دەبێت.</string>
   <string name="reboot_confirm" product="default">تەلەفۆنەکە سه‌رله‌نوێ ده‌کوژێته‌وه‌ و داده‌گیرسێته‌وه‌.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">سه‌رله‌نوێ خستنه‌ڕێ\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">بەرنامە داخرا</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ABD سه‌روو هێڵ کارده‌کات</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ABD سه‌روو USB و هێڵ کارده‌کات</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">ئێره‌ لێبده‌ بۆ له‌کارخستنی هه‌ڵدۆزینه‌وه‌.</string>
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s دانەمەزراوە</string>
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">چالاکردن یان لەکارخستنی بەرگری تایبەتی</string>
   <string name="permdesc_changePrivacyGuardState">ڕێگە دان بە بەرنامەکە بۆ گۆڕینی کەشوهەوای بەرنامەیەکی تر لە تایبەتی. کاتێک بەرنامەکە ئەکەوێتە کار لەگەڵ تایبەتی .هیچ ڕێگەیەکی نیە بۆ ئەوەی زانیاری تایبیەتیت بەکاربهێنێت وەکو ،ناوەکان،تەلەفۆن لۆگ یان نامە.</string>
   <string name="privacy_guard_notification">پاسەوانی تایبەتی چالاکراوە</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="بەرنامە">%1$s</xliff:g> ناتوانێت زانیاری تایبەتی بەکاربهێنێت</string>
   <string name="privacy_guard_dialog_title">پاسەوانی تایبەتی</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="بەرنامە">%1$s</xliff:g> حەز ئەکەی بۆ <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">بیرخستنەوەی هەڵبژاردنەکەم</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">ڕێگەدان بەکامێرا</string>
   <string name="app_ops_access_location">ڕێگەی ناوچەی</string>
   <string name="app_ops_access_notifications">تێبنینیەکانت بخوێنەوە</string>
@@ -102,15 +140,19 @@
   <string name="app_ops_write_mms">نوسنی نامەی MMS</string>
   <string name="app_ops_write_sms">نوسینی نامەی SMS</string>
   <string name="app_ops_su">بەدەستهێنانی ڕێگەپێدانی ڕۆت</string>
-  <string name="live_display_auto">خۆکارانه‌</string>
-  <string name="live_display_off">کوژانه‌وه‌</string>
-  <string name="live_display_off_summary">لەکارخستنی هەموو ڕێکخستنەکان</string>
-  <string name="live_display_day">ڕۆژ</string>
-  <string name="live_display_day_summary">بەکارهێنانی ڕێکخستنی ڕۆژ تەنها</string>
-  <string name="live_display_night">شەو</string>
-  <string name="live_display_night_summary">تەنها ڕێکخستنی شەو بەکاربهێنە</string>
-  <string name="live_display_outdoor">دەرەوە (ڕۆشنای خۆر)</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ئامێر پەیوەست نەکراوە</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ئامێر پەیوەستکراوە</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> ئامێری پەیوەستکراو</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-ku/strings.xml b/core/res/res/values-ku/strings.xml
index f1dc664..d4c50e2 100644
--- a/core/res/res/values-ku/strings.xml
+++ b/core/res/res/values-ku/strings.xml
@@ -19,41 +19,107 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
   <string name="byteShort">بایت</string>
+  <!-- Suffix added to a number to signify size in kilobytes. -->
   <string name="kilobyteShort">کیلۆبایت</string>
+  <!-- Suffix added to a number to signify size in megabytes. -->
   <string name="megabyteShort">مێگابایت</string>
+  <!-- Suffix added to a number to signify size in gigabytes. -->
   <string name="gigabyteShort">گیگابایت</string>
+  <!-- Suffix added to a number to signify size in terabytes. -->
   <string name="terabyteShort">تێرابایت</string>
+  <!-- Suffix added to a number to signify size in petabytes. -->
   <string name="petabyteShort">پیکۆبایت</string>
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
   <string name="untitled">&lt;بێ ناونیشان&gt;</string>
+  <!-- How to display the lack of a phone number -->
   <string name="emptyPhoneNumber">(هیچ ژماره‌ ته‌له‌فۆنێک نییه‌)</string>
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <string name="defaultVoiceMailAlphaTag">دەنگەپۆست</string>
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">کێشه‌ی په‌یوه‌ندی هه‌یه‌ یان کۆدی MMI ناڕاستە.</string>
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
   <string name="mmiFdnError">کردارەکە تەنیا بۆ ژمارە جێگیرکراوەکان سنووربەندکراوە.</string>
+  <!-- Displayed when a phone feature such as call barring was activated. -->
   <string name="serviceEnabled">خزمه‌تگوزارییەکە چالاککرا.</string>
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
   <string name="serviceEnabledFor">خزمه‌تگوزارییەکە چالاککرا بۆ:</string>
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
   <string name="serviceDisabled">خزمه‌تگوزارییەکە ناچالاککراوە.</string>
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
   <string name="serviceRegistered">خۆتۆمارکردن سه‌رکه‌وتوو بوو.</string>
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
   <string name="serviceErased">سڕینه‌وه‌ سه‌رکه‌وتوو بوو.</string>
+  <!-- Displayed when a SIM password was entered incorrectly. -->
   <string name="passwordIncorrect">تێپه‌ڕەوشه‌ ناڕاستە.</string>
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
   <string name="mmiComplete">کۆدی MMI تەواوە.</string>
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
   <string name="badPin">(PIN)ە کۆنه‌کە کە نووسیوتە ڕاست نییە.</string>
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
   <string name="badPuk">(PUK)ەکە کە نووسیوتە ڕاست نییە.</string>
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
   <string name="mismatchPin">(PIN)ەکان کە نووسیوتن له‌یه‌کناچن.</string>
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
   <string name="invalidPin">(PIN)ەک بنووسه‌ که‌ ٤ بۆ ٨ ژماره‌ بێت.</string>
+  <!-- Displayed when a SIM PUK password is too short. -->
   <string name="invalidPuk">(PUK)ەکەیەک بنووسە کە ٨ ژمارە یان درێژتر بێت.</string>
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
   <string name="needPuk">سیمکارته‌که‌ت داخراوە به‌ PUK، بۆ کردنه‌وه‌ی کۆدی PUK بنووسە.</string>
   <string name="needPuk2">تکایه‌ PUK2 بنووسه‌ بۆ کردنەوەی سیمکارت.</string>
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
   <string name="enablePin">سه‌رکه‌وتوو نه‌بوو ، تکایه‌ داخەری SIM/RUIM چالاک بکه‌.</string>
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <plurals name="pinpuk_attempts">
+    <item quantity="one"><xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ پێش ئه‌وه‌ی سیمکارت دابخرێت.</item>
+    <item quantity="other"><xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ پێش ئه‌وه‌ی سیمکارت دابخرێت.</item>
+  </plurals>
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
   <string name="imei">IMEI</string>
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
   <string name="meid">MEID</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
   <string name="ClipMmi">هاتنی پێناسه‌ی پەیوەندیکه‌ر</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
   <string name="ClirMmi">ڕۆیشتنی پێناسەی په‌یوه‌ندیکه‌ر</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
   <string name="CfMmi">ناردنەوەی په‌یوه‌ندی</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
   <string name="CwMmi">چاوەڕوانیی پەیوەندی</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
   <string name="BaMmi">نەهێشتنی پەیوەندی</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
   <string name="PwdMmi">گۆڕینی تێپه‌ڕەوشه‌</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
   <string name="PinMmi">گۆڕینی PIN</string>
   <string name="CnipMmi">ژماره‌ی په‌یوه‌ندی ئاماده‌یە</string>
   <string name="CnirMmi">ژماره‌ی په‌یوه‌ندی سنووربەند کراوە</string>
@@ -61,29 +127,56 @@
   <string name="RuacMmi">بەرپەرچ دانەوەی په‌یوه‌ندییە بێزارکەرەکان و نەخوازراوەکان</string>
   <string name="CndMmi">گەیاندنی ژماره‌ی په‌یوه‌ندیکردن</string>
   <string name="DndMmi">مەمشێوێنە</string>
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
   <string name="CLIRDefaultOnNextCallOn">پێناسەی په‌یوه‌ندیکه‌ر له‌سه‌ر سنووربەندکراوە. په‌یوه‌ندیی داهاتوو: سنووربەند کراوە</string>
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
   <string name="CLIRDefaultOnNextCallOff">پێناسەی په‌یوه‌ندیکه‌ر له‌سه‌ر سنووربەندکراوە. بەڵام په‌یوه‌ندیی داهاتوو: سنووربەند نەکراوە</string>
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
   <string name="CLIRDefaultOffNextCallOn">پێناسەی په‌یوه‌ندیکه‌ر له‌سه‌ر سنووربەندکراو نییه‌. بەڵام په‌یوه‌ندیی داهاتوو: سنووربەند کراوە</string>
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
   <string name="CLIRDefaultOffNextCallOff">پێناسەی په‌یوه‌ندیکه‌ر له‌سه‌ر سنوورداره نییه‌. په‌یوه‌ندیی داهاتوو: سنووردار نییه‌</string>
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
   <string name="serviceNotProvisioned">خزمه‌تگوزاری به‌رده‌ست نییه‌.</string>
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
   <string name="CLIRPermanent">ناتوانیت ڕێکخستنی پێناسەی په‌یوه‌ندیکه‌ر بگۆڕیت.</string>
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
   <string name="RestrictedChangedTitle">دەستگەیاندنی سنووردار گۆڕدرا</string>
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
   <string name="RestrictedOnData">خزمەتگوزاریی دراوە به‌ستراوه‌.</string>
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
   <string name="RestrictedOnEmergency">خزمەتگوزاریی فریاکەوتن به‌ستراوه‌.</string>
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
   <string name="RestrictedOnNormal">خزمەتگوزاریی ده‌نگ به‌ستراوه‌.</string>
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
   <string name="RestrictedOnAllVoice">هه‌موو خزمەتگوزارییەکانی ده‌نگ به‌ستراون.</string>
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
   <string name="RestrictedOnSms">خزمەتگوزاریی کورتەنامە به‌ستراوه‌.</string>
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
   <string name="RestrictedOnVoiceData">خزمەتگوزارییەکانی ده‌نگ و داتا به‌ستراون.</string>
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
   <string name="RestrictedOnVoiceSms">خزمەتگوزارییەکانی ده‌نگ و کورتەنامە به‌ستراون.</string>
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
   <string name="RestrictedOnAll">هه‌موو خزمەتگوزارییەکانی ده‌نگ، داتا و کورتەنامە به‌ستراون.</string>
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">ده‌نگ</string>
+  <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassData">داتا</string>
+  <!-- Example: Service was enabled for: Voice, FAX -->
   <string name="serviceClassFAX">فاکس</string>
+  <!-- Example: Service was enabled for: Voice, SMS -->
   <string name="serviceClassSMS">کورتەنامە</string>
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
   <string name="serviceClassDataAsync">ناهاوکاتگەری</string>
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
   <string name="serviceClassDataSync">هاوکاتگەری</string>
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <string name="serviceClassPacket">گورزەی دراوە</string>
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">نەزانراو</string>
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
   <string name="roamingText0">دیارخه‌ری ڕۆمینگ هەڵکراوە</string>
   <string name="roamingText1">دیارخه‌ری ڕۆمینگ کوژاوه‌ته‌وه‌</string>
   <string name="roamingText2">دیارخه‌ری ڕۆمینگ چاو دادەگرێ</string>
@@ -98,111 +191,291 @@
   <string name="roamingText11">هێمای ڕۆمینگ هەڵکراوە</string>
   <string name="roamingText12">هێمای ڕۆمینگ کوژاوه‌ته‌وه‌</string>
   <string name="roamingTextSearching">گه‌ڕان به‌دوای خزمه‌تگوزاری</string>
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی ئاراستە نەکراوە</string>
+  <!-- Displayed when the call forwarding query was forwarded. -->
   <string name="cfTemplateForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: <xliff:g id="dialing_number">{1}</xliff:g></string>
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <string name="cfTemplateForwardedTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: <xliff:g id="dialing_number">{1}</xliff:g> دوای <xliff:g id="time_delay">{2}</xliff:g> چرکه‌</string>
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegistered"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی  ئاراستە نەکراوە</string>
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: پەیوەندی  ئاراستە نەکراوە</string>
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">کۆدی تایبەت ته‌واو بوو.</string>
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">کێشه‌ی گرێدان هه‌یه‌ یان کۆدی تایبەت ناڕاسته‌.</string>
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">باشه‌</string>
+  <!-- Displayed when a web request failed with a generic network error. -->
   <string name="httpError">هه‌ڵه‌یه‌ک له‌ تۆڕدا هه‌بوو.</string>
+  <!-- Displayed when a web request failed because the URL could not be found. -->
   <string name="httpErrorLookup">نه‌یتوانی ناونیشانی ئینتەرنێتی بدۆزێته‌وه‌.</string>
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
   <string name="httpErrorUnsupportedAuthScheme">پلانی پارێزپرسیی ماڵپه‌ڕ پشتگیری ناکرێت.</string>
+  <!-- Displayed when a web request failed because the authentication failed. -->
   <string name="httpErrorAuth">نەیتوانی پارێزپرسی تێپەڕ بکات.</string>
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
   <string name="httpErrorProxyAuth">تێپەڕکردنی پارێزپرسی له‌ ڕێی ڕاژه‌کاری پرۆکسی سه‌رکه‌وتوو نه‌بوو.</string>
+  <!-- Displayed when a web request failed because there was a connection error. -->
   <string name="httpErrorConnect">نه‌یتوانی گرێبدرێت به‌ ڕاژه‌کاره‌وه‌.</string>
+  <!-- Displayed when a web request failed because there was an input or output error. -->
   <string name="httpErrorIO">نه‌یتوانی گرێبدرێت به‌ ڕاژه‌کاره‌وه‌. دواتر هه‌وڵبده‌وه‌.</string>
+  <!-- Displayed when a web request failed because the request timed out -->
   <string name="httpErrorTimeout">کاتی گرێدان به‌ ڕاژه‌کاره‌وه‌ به‌سه‌ر چوو.</string>
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
   <string name="httpErrorRedirectLoop">په‌ڕه‌که‌ پڕە لە ئاراستەگۆڕینی ڕاژه‌کار.</string>
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
   <string name="httpErrorUnsupportedScheme">پرۆتۆكۆڵەکە پشتگیری ناکرێت.</string>
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
   <string name="httpErrorFailedSslHandshake">نەیتوانی گرێدانێکی دڵنیا دابمه‌زرێنێت.</string>
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
   <string name="httpErrorBadUrl">نەیتوانی په‌ڕه‌که‌ بکاته‌وه‌ لەبەر ئەوەی ناونیشانه‌که‌ ڕاست نییه‌.</string>
+  <!-- Displayed when a request failed because we failed to open the file. -->
   <string name="httpErrorFile">نەیتوانی دەست بگەیەنێتە فایلەکە.</string>
+  <!-- Displayed when a request failed because the file wasn't found. -->
   <string name="httpErrorFileNotFound">نەیتوانی فایلی داواکراو بدۆزێته‌وه‌.</string>
+  <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">داواکاریی زۆر خراوه‌ته‌ ڕوو. دواتر هه‌وڵبده‌وه‌.</string>
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">هه‌ڵه‌ له‌ چوونه‌ژووره‌وه‌ بۆ <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">هاوکاتگەری</string>
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <string name="contentServiceSyncNotificationTitle">هاوکاتگەری</string>
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
   <string name="contentServiceTooManyDeletesNotificationDesc">هەندێک <xliff:g id="content_type">%s</xliff:g>  دەسڕێنەوە.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="tablet">بیرگه‌ی تابلێت پڕە. هه‌ندێک فایل بسڕه‌وه‌ بۆ ئازادکردنی بۆشایی.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">بیرگه‌ی تەلەفۆن پڕە. هه‌ندێک فایل بسڕه‌وه‌ بۆ ئازادکردنی بۆشایی.</string>
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">له‌وانه‌یه‌ تۆڕه‌که‌ چاودێری کرابێت</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_by_unknown">له‌لایه‌ن به‌شی نه‌ناسراوی سێیه‌مه‌وه‌</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">له‌لایه‌ن <xliff:g id="managing_domain">%s</xliff:g></string>
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">من</string>
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">بژارده‌کانی تابلێت</string>
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="default">بژارده‌کانی ته‌له‌فۆن</string>
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
   <string name="silent_mode">دۆخی بێده‌نگ</string>
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
   <string name="turn_on_radio">داگیرساندنی بێته‌ل</string>
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
   <string name="turn_off_radio">کوژاندنه‌وه‌ی بێته‌ل</string>
+  <!-- Button to lock the screen, within the Phone Options dialog -->
   <string name="screen_lock">داخەری ڕوونما</string>
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
   <string name="power_off">کوژاندنه‌وه‌</string>
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_silent">کوژاندنه‌وه‌ی زه‌نگلێدەر</string>
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_vibrate">زەنگلێدەر لەسەر دۆخی لەرین</string>
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_ring">بەکارخستنی زه‌نگلێدەر</string>
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
   <string name="shutdown_progress">کوژاندنه‌وه‌ی\u2026</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="tablet">تابلێته‌که‌ت ده‌کووژێته‌وه‌.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="default">ته‌له‌فۆنه‌که‌ت ده‌کووژێته‌وه‌.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
   <string name="shutdown_confirm_question">ده‌ته‌وێت بکوژێته‌وه‌؟</string>
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
   <string name="reboot_safemode_title">دەسپێکردنەوە بۆ سەر دۆخی دڵنیاکراو</string>
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
   <string name="reboot_safemode_confirm">ده‌ته‌وێت دەست پێ بکەیتەوە بۆ دۆخی دڵنیاکراو؟
          ئه‌م کرداره‌ هه‌موو ئه‌و به‌رنامه‌ لاوه‌کییانه‌ ده‌سڕێته‌وه‌ که‌ داتمه‌زراندوون.
          ئەوانە دەگەڕێنەوە باری خۆیان، کاتێک سەر لە نوێ دەست پێ دەکەیتەوە.</string>
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
   <string name="recent_tasks_title">نوێ</string>
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
   <string name="no_recent_tasks">هیچ به‌رنامه‌یەکی نوێ نییه‌.</string>
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="tablet">بژارده‌کانی تابلێت</string>
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="default">بژاردەکانی ته‌له‌فۆن</string>
+  <!-- label for item that locks the phone in the phone options dialog -->
   <string name="global_action_lock">داخەری ڕوونما</string>
+  <!-- label for item that turns off power in phone options dialog -->
   <string name="global_action_power_off">کوژاندنه‌وه‌</string>
+  <!-- label for item that generates a bug report in the phone options dialog -->
   <string name="global_action_bug_report">ڕاپۆرتی کەلێن</string>
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
   <string name="bugreport_title">گرتنەوەی ڕاپۆرتی کەلێن</string>
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
   <string name="bugreport_message">ئه‌م کردارە سەبارەت بە ئامێری ئێستات زانیاری کۆ ده‌کاته‌وه‌
         و بە شێوەی پۆستی ئەلەکترۆنی دەینێرێت. ماوەیەکی زۆر کەم دەخایەنێت
          بۆ ئامادەکردنی ڕاپۆرتەکە تا ئەوکات کە دەنێردرێت: تکایە هێور بە.</string>
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
   <string name="global_action_toggle_silent_mode">دۆخی بێده‌نگ</string>
+  <!-- status message in phone options dialog for when silent mode is enabled -->
   <string name="global_action_silent_mode_on_status">دەنگ کوژاوەیە</string>
+  <!-- status message in phone options dialog for when silent mode is disabled -->
   <string name="global_action_silent_mode_off_status">دەنگ هەڵکراوە</string>
+  <!-- label for item that toggles airplane mode -->
   <string name="global_actions_toggle_airplane_mode">دۆخی فڕۆکە</string>
+  <!-- status message in phone options dialog for when airplane mode is on -->
   <string name="global_actions_airplane_mode_on_status">دۆخی فڕۆکه‌ کراوه‌یه‌</string>
+  <!-- status message in phone options dialog for when airplane mode is off -->
   <string name="global_actions_airplane_mode_off_status">دۆخی فڕۆکه‌ کوژاوه‌یه‌</string>
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
   <string name="status_bar_notification_info_overflow">+٩٩٩</string>
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
   <string name="safeMode">دۆخی دڵنیاکراو</string>
+  <!-- Label for the Android system components when they are shown to the user. -->
   <string name="android_system_label">سیسته‌می ئه‌ندرۆید</string>
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_calendar">ڕۆژمێر</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_sms">کورتەنامە</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_storage">بیرگه‌</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_microphone">بیستۆک</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_microphone">تۆمارکردنی دەنگ</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_camera">کامێرا</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_phone">مۆبایل</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
   <string name="capability_title_canRetrieveWindowContent">ناوەرۆكى پەنجەرە بگێڕەوە</string>
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
   <string name="capability_desc_canRetrieveWindowContent">ناوەرۆكى پەنجەرەيێك دەپشكنێت تۆ ن 
 
 لەگەڵ كار لە يەكتان كرد.</string>
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
   <string name="capability_title_canRequestTouchExploration">وێبگەر بکەرەوە بە دەست لێدان</string>
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
   <string name="capability_desc_canRequestTouchExploration">برگەى بەركەوتن بەدەنگى بەرز قسە دەكرێن 
 
 و شاشەكە دەتوانێت سەرنج بدەرێت بەكارهێنانى نيشانە.
 </string>
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
   <string name="capability_title_canRequestEnhancedWebAccessibility">وێبى زيادكراو بەكار بخە 
 
 دەشێت لێى نزيك ببێتەوە يا بچێتە ناوى</string>
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
   <string name="capability_desc_canRequestEnhancedWebAccessibility">نوسراو لەوانەيە بۆ دا بمەزرێنرێن 
 
 ناوەرۆكى بەرنامە ئاسان پەيدابووتر كرد.</string>
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
   <string name="capability_title_canRequestFilterKeyEvents">نووسين تێبينى بكە تۆ جۆر دەن</string>
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
   <string name="capability_desc_canRequestFilterKeyEvents">وەكو متمانەى زانيارى كەسى بگرەوە 
 
 كارت ڕەنووس دەكات و وشەى تێپەڕين.
 </string>
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_statusBar">پەك دەخات بە يان میله‌ يان  دۆخ دەگۆڕێت</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_statusBar">ڕێ دەدات بە بەرنامە تا شيشەكەى دۆخ پەك دەخات بێت يان زياد دەكات و ئايكۆنى سيستەم لا دەبات.</string>
-  <string name="permlab_statusBarService">تووڵ دۆخ
-</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_statusBarService">ڕێ دەدات بە بەرنامە تا شيشەكەى دۆخ ببێت.
 </string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_expandStatusBar"> شيشى دۆخى ڕووخان فراوان بكە</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_expandStatusBar">ڕێ دەدات بە بەرنامە تا فراوان بكات يان ڕووخان شيشەكەى دۆخ.
 
 
@@ -218,207 +491,463 @@
 
 
 </string>
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permlab_install_shortcut">شۆتكەتس دا بمەزرێنە</string>
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permdesc_install_shortcut">ڕێگه‌ دان بۆ زیادکردنی به‌رنامه‌
 قه‌د بڕ له‌سه‌ر ڕوونمای ماڵه‌وه‌ به‌بێ به‌کارهێنه‌ر.</string>
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
   <string name="permlab_uninstall_shortcut">سڕینه‌وه‌ قه‌دبڕه‌کان</string>
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permdesc_uninstall_shortcut">ڕێگه‌دان به‌ بارنامه‌ بۆ سڕینه‌وه‌
 قه‌دبڕی ڕوونمای ماڵه‌وه‌ به‌بێ به‌کارهێنه‌ر.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_processOutgoingCalls">ته‌له‌فۆنکردنی ده‌ره‌وه‌</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_processOutgoingCalls">ڕێگه‌ دان به‌به‌رنامه‌که‌ بۆ بینینی ژماره‌کان که‌ لێدراوهن له‌کاتی ته‌له‌فۆنی ده‌ره‌وه‌ هه‌ڵبژارده‌ی ته‌له‌فۆن بۆ ڕێگه‌ دان به‌ ته‌له‌فۆنکردنی جیاواز.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveSms">گه‌شتنی ده‌قه‌ نامه‌(SMS)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveSms">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ گه‌شتنی نامه‌.ئه‌مه‌ مانانی
 ئه‌وه‌یه‌ به‌رنامه‌که‌ ئه‌توانێت نامه‌ بسڕێته‌وه‌ یان ناردنی بۆ ئامێره‌که‌ به‌ بێ پیشاندانی تۆ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveMms">گه‌شتنی ده‌قه‌ نامه‌ی(MMS)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveMms">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ گه‌شتنی نامه‌.ئه‌مه‌ مانانی
 ئه‌وه‌یه‌ به‌رنامه‌که‌ ئه‌توانێت نامه‌ بسڕێته‌وه‌ یان ناردنی بۆ ئامێره‌که‌ به‌ بێ پیشاندانی تۆ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCellBroadcasts">خوێندنه‌وه‌ی هه‌موو خانه‌ی په‌خشه‌ نامه‌کان</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_subscribedFeedsRead">خوێندنه‌وه‌ی پێدانی به‌شداریپێکراو</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_subscribedFeedsRead">ڕێگه‌دان به‌ به‌رنامه‌ بۆ وه‌رگرتنی زانیاری له‌باره‌ی خوێندنه‌وه‌ی پێدانی به‌شداریپێکراو.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sendSms">ڕێ دەدات بە بەرنامە تا نامەى ئێس ئێم ئێس بنێرێت.
 
 ئەمە لەوانەيە ببێت بە هۆى تۆمەتى چاوەروان نەكراو. بەرنامەى قيناوى لەوانەيە تێ بچن لەلايەن پارەى تۆ
 
 ناردنى نامە بەبێ دووپات كردنت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSms">خوێندنه‌وه‌ی نامه‌کان(MMS یان SMS)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="tablet">ڕێ دەدات بە بەرنامە تا ئێس ئێم ئێس بخوێنێتەوە
 
 نامە لەسەر كارتتى جۆر يان سيميان خەزن كرد. ئەمە ڕێ دەدەن بە بەرنامە تا هەموو بخوێنێتەوە
 
 نامەى ئێس ئێم ئێس، بێگوێدانەى ناوەرۆك يان برايانە. </string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="default">ڕێ دەدات بە بەرنامە تا ئێس ئێم ئێس بخوێنێتەوە
 
 نامە لەسەر كارتتى تەلەفۆن يان سيميان خەزن كرد. ئەمە ڕێ دەدەن بە بەرنامە تا هەموو بخوێنێتەوە
 
 نامەى ئێس ئێم ئێس، بێگوێدانەى ناوەرۆك يان برايانە.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveWapPush">گه‌شتنی نامه‌ی (WAP)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveWapPush">ڕێ دەدات بە بەرنامە تا وەر بگرێت و كردار
 
 نامەى WAP. ئەمە ڕێگەپێدان توانايەكە دەگرێتەوە تا چاودێرى بكات يان دەسڕێتەوە
 
 بۆ نامە ناردى تۆ بۆ پيشاندانى ئەوان تۆ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getTasks">گه‌ڕانه‌وه‌ی به‌رنامه‌ی له‌کار</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getTasks">ڕێ دەدات بە بەرنامە تا زانيارى بگێڕێتەوە
 
 دەربارەى ئێستا و بەم دواييە ڕاكردنى ئەرك. ئەمە لەوانەيە ڕێ بدات بە بۆ بەرنامە
 
 زانيارى دەربارەى بدۆزەوە داوا كردن بەكار دێنرێن لەسەر ئامرازەكە.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_reorderTasks">تۆمارکردنی به‌رنامه‌ی کراوه‌</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_reorderTasks">ڕێگه‌ دان به‌ به‌رنامه‌که‌ بۆ گۆڕینی ئه‌رک بۆ سه‌رو پاشه‌وه‌ی پشته‌گه‌ڵاڵه‌. به‌رنامه‌که‌ بێ تۆ ئه‌یکات.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_enableCarMode">چالاککردنی باری سه‌یاره‌</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_enableCarMode">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ چالاککردنی باری سه‌یاره‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_killBackgroundProcesses">داخستنی به‌رنامه‌ی تر</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_killBackgroundProcesses">ڕێ دەدات بە بەرنامە تا كۆتايى پێ بهێنێت
 
 كردارى زەمينەى بەرنامەى ديكە. ئەمە لەوانەيە ببێتە هۆى بەرنامەى ديكە تا ڕا بگرن
 
 ڕاكردن. </string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_systemAlertWindow">پیشاندان لە سەروی بەرنامەکانی ترەوە</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_systemAlertWindow">ڕێگە بە بەرنامەکە دەدا کە تێکەڵی روکاری بەرنامەکانی تر بێت.وە ئەوشتەی کەدەیبینیت بگۆرێت</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_persistentActivity">وا له‌ به‌رنامه‌که‌ بکرێت هه‌میشه‌ کرابێته‌وه‌</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_persistentActivity" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ به‌شکردنی خۆی له ناو بیرگەی. ئه‌مه‌ له‌وانه‌یه‌ بیرگەییه‌که‌ت سنوردار بکات بۆ به‌رنامه‌کانی تر که‌ تابلێته‌که‌ت خاو ده‌کاته‌وه‌.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_persistentActivity" product="default">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ به‌شکردنی خۆی له ناو بیرگەی. ئه‌مه‌ له‌وانه‌یه‌ بیرگەییه‌که‌ت سنوردار بکات بۆ به‌رنامه‌کانی تر که‌ مۆبایله‌که‌ت خاو ده‌کاته‌وه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getPackageSize">مامه‌ڵه‌کردن له‌گه‌ڵ قه‌باره‌ی به‌کارنه‌هێنراو</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getPackageSize">ڕێگه‌دان به‌ به‌رنامه‌ بۆ وه‌رگرتنی کۆد ، زانیاری ، و قه‌باره‌ی فایله‌ زیاده‌کان</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeSettings">گۆڕینی رێکخستنەکانی سیستەم</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeSettings">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ گۆڕینی زانیاری سیسته‌م.به‌رنامه‌ به‌دخووه‌کان بۆ تێکدانی سیسته‌م به‌کاریده‌هێنن ڕێگه‌ به‌ هه‌موو به‌رنامه‌یه‌ک مه‌ده‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveBootCompleted">کارکردن له‌گه‌ڵ داگیرساندن</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ خۆکارانه‌ ده‌ستپێکردن له‌گه‌ڵ داگیرساندنی تابلێته‌که‌ت. به‌ڵام له‌وانه‌یه‌ هۆکارێک بێت بۆ خاوبوونه‌وه‌ی داگیرساندن وه‌ خاوکردنه‌وه‌ی تابلێتکه‌.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="default">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ خۆکارانه‌ ده‌ستپێکردن له‌گه‌ڵ داگیرساندنی مۆبایله‌که‌ت. به‌ڵام له‌وانه‌یه‌ هۆکارێک بێت بۆ خاوبوونه‌وه‌ی داگیرساندن وه‌ خاوکردنه‌وه‌ی مۆبایله‌که‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_broadcastSticky">ناردنی په‌خشی لکێنراو</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ ناردنی په‌خشی لکێندراو، که‌ ده‌مێنێته‌وه‌ دوای ته‌واوبونی په‌خشیش. له‌وانه‌یه‌ ببێته‌ هۆی سه‌رفکردنی زۆرێک له‌ بیرگه‌ و خاوکردنه‌وه‌ی تابلێت.
     </string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="default">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ ناردنی په‌خشی لکێندراو، که‌ ده‌مێنێته‌وه‌ دوای ته‌واوبونی په‌خشیش. له‌وانه‌یه‌ ببێته‌ هۆی سه‌رفکردنی زۆرێک له‌ بیرگه‌ و خاوکردنه‌وه‌ی مۆبایل.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readContacts">خوێندنه‌وه‌ی په‌یوه‌ندێكانت</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ خوێندنه‌وه‌ی زانیاری له‌باره‌ی په‌یوه‌ندییه‌کانت له‌ناو تابلێته‌که‌ته‌، که‌ فریکوەنسی له‌گه‌ڵه‌ بۆ ته‌له‌فۆنکراوه‌کان، ئیمێلکراوه‌کان، کۆمه‌ڵایه‌تییه‌کان له‌ چه‌نده‌ها ڕێگای تره‌وه‌.ده‌سته‌ڵاته‌که‌ ڕێگه‌ ئه‌دات به‌ به‌رنامه‌که‌ که‌ په‌یوه‌ندییه‌کانت پاشه‌که‌وت بکات له‌گه‌ڵ زانیارییه‌کانیان.به‌ڵام وریای به‌رنامه‌ به‌دخووه‌کان به‌ بۆ مه‌به‌ستی خراپ به‌کارده‌هێنن.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="default">ڕێگه‌دان به‌ به‌رنامه‌که‌ بۆ خوێندنه‌وه‌ی زانیاری له‌باره‌ی په‌یوه‌ندییه‌کانت له‌ناو مۆبایله‌که‌ت. که‌ فریکوەنسی له‌گه‌ڵه‌ بۆ ته‌له‌فۆنکراوه‌کان، ئیمێلکراوه‌کان، کۆمه‌ڵایه‌تییه‌کان له‌ چه‌نده‌ها ڕێگای تره‌وه‌.ده‌سته‌ڵاته‌که‌ ڕێگه‌ ئه‌دات به‌ به‌رنامه‌که‌ که‌ په‌یوه‌ندییه‌کانت پاشه‌که‌وت بکات له‌گه‌ڵ زانیارییه‌کانیان.به‌ڵام وریای به‌رنامه‌ به‌دخووه‌کان به‌ بۆ مه‌به‌ستی خراپ به‌کارده‌هێنن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeContacts">گۆڕانکاری لە ژمارەی پەیوەندیەکانتدا بکە</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گۆڕینی زانیاری له‌باره‌ی په‌یوه‌ندییه‌ پاشه‌که‌وتکراوه‌کان له‌ تابلێته‌که‌ت، که‌ فریکوه‌نسی تێدایه‌ په‌یوه‌ندیت پێوه‌کردوون،ئیمێل،یان هه‌ر شتێکی تری کۆمه‌ڵایه‌تی، ئه‌م ده‌سته‌ڵاته‌ ڕێگه‌ ئه‌دات به‌ به‌رنامه‌که‌ داتاکانت بسڕێته‌وه‌.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گۆڕینی زانیاری له‌باره‌ی په‌یوه‌ندییه‌ پاشه‌که‌وتکراوه‌کان له‌ مۆبایله‌که‌ت، که‌ فریکوه‌نسی تێدایه‌ په‌یوه‌ندیت پێوه‌کردوون،ئیمێل،یان هه‌ر شتێکی تری کۆمه‌ڵایه‌تی، ئه‌م ده‌سته‌ڵاته‌ ڕێگه‌ ئه‌دات به‌ به‌رنامه‌که‌ داتاکانت بسڕێته‌وه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCallLog">خوێندنه‌وه‌ی ته‌له‌فۆنی تۆمارکراو</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ خوێندنه‌وه‌ی تۆماری په‌یوه‌ندییه‌کان، که‌ زانیاری تێدایه‌ له‌باره‌ی په‌یوه‌ندی هاتوو وه‌ ڕۆشتوو.ئه‌م ده‌سته‌لاته‌ ڕێگه به‌ به‌رنامه‌که‌ ده‌دات بۆ خه‌زن کردنی تۆماری په‌یوه‌ندییه‌کانت.وه‌ به‌رنامه‌ به‌دخووه‌کان بۆ مه‌به‌ستی بڵاوکردنه‌وه‌یان به‌کاریده‌هێنن به‌بێ زانیاری تۆ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ خوێندنه‌وه‌ی تۆماری په‌یوه‌ندییه‌کان، که‌ زانیاری تێدایه‌ له‌باره‌ی په‌یوه‌ندی هاتوو وه‌ ڕۆشتوو.ئه‌م ده‌سته‌لاته‌ ڕێگه به‌ به‌رنامه‌که‌ ده‌دات بۆ خه‌زن کردنی تۆماری په‌یوه‌ندییه‌کانت.وه‌ به‌رنامه‌ به‌دخووه‌کان بۆ مه‌به‌ستی بڵاوکردنه‌وه‌یان به‌کاریده‌هێنن به‌بێ زانیاری تۆ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeCallLog">نوسینی تۆماری په‌یوه‌ندییه‌کان</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گۆڕینی تۆماری په‌یوه‌ندییه‌کانت.که‌ زانیاری له‌باره‌ی په‌یوه‌ندی هاتوو و وه‌ ڕۆشتووی تێدایه‌.به‌رنامه‌ به‌دخووه‌کان به‌کاری ئه‌هێنن بۆ سڕینه‌وه‌ی تۆماره‌کان.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گۆڕینی تۆماری په‌یوه‌ندییه‌کانت.که‌ زانیاری له‌باره‌ی په‌یوه‌ندی هاتوو و وه‌ ڕۆشتووی تێدایه‌.به‌رنامه‌ به‌دخووه‌کان به‌کاری ئه‌هێنن بۆ سڕینه‌وه‌ی تۆماره‌کان.</string>
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCalendar">خوێندنه‌وه‌ی ڕووداوه‌کانی ڕۆژژمێر بۆ زانیاری شاراوه‌</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ خوێندنه‌وه‌ی هه‌موو ڕووداوه‌کانی ناو ڕۆژژمێره‌کان له‌ ئامێره‌که‌ت، وه‌ک هاوڕێکان و شوانه‌کان. ئه‌مه‌ ڕێگه‌ به‌ به‌رنامه‌که‌ ده‌دات بۆ به‌شداریپێکردنی یان پاشه‌که‌وتکردنی زانیاری ڕۆژژمێره‌که‌ت وریابه‌.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ خوێندنه‌وه‌ی هه‌موو ڕووداوه‌کانی ناو ڕۆژژمێره‌کان له‌ ئامێره‌که‌ت، وه‌ک هاوڕێکان و شوانه‌کان. ئه‌مه‌ ڕێگه‌ به‌ به‌رنامه‌که‌ ده‌دات بۆ به‌شداریپێکردنی یان پاشه‌که‌وتکردنی زانیاری ڕۆژژمێره‌که‌ت وریابه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeCalendar">زیادکردن یان گۆڕینی ڕووداو له‌ناو ڕۆژژمێر و ناردنی ئیمێل بۆ میوانه‌کان به‌بێ زانیاری له‌ باره‌ی دروستکه‌ره‌که‌ی</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessLocationExtraCommands">ده‌سته‌ڵاتی شوێنی زیاتر بۆ فرمانی دابینکردن</string>
-  <string name="permlab_accessFineLocation">شوێنی ورد(GPS و دامه‌زراو له‌سه‌ر خه‌ت)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessFineLocation">ڕێگه‌دان به‌ به‌رنامه‌ بۆ ده‌ستکه‌وتنی شوێنی ته‌واوی تۆ به‌ GPS یان خه‌ته‌که‌ت وه‌ک وایه‌رلێس و هێڵ.خزمه‌تگوزاری شوێن پێویسته‌ کاربکات بۆ ئه‌وه‌ی به‌رنامه‌کان شوێن بدۆزنه‌وه‌.به‌رنامه‌کان ده‌توانن بزانن له‌ کوێیت به‌ GPS ، ئه‌م کاره‌ باتری مۆبایله‌که‌ت که‌م ده‌کات.</string>
-  <string name="permlab_accessCoarseLocation">شوێنی نزیک(له‌سه‌ر خه‌ت)</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessCoarseLocation">ڕێگه‌دان به‌ به‌رنامه‌ بۆ ده‌ستکه‌وتنی شوێنی نزیکی تۆ به‌ GPS یان خه‌ته‌که‌ت وه‌ک وایه‌رلێس و هێڵ.خزمه‌تگوزاری شوێن پێویسته‌ کاربکات بۆ ئه‌وه‌ی به‌رنامه‌کان شوێن بدۆزنه‌وه‌.به‌رنامه‌کان ده‌توانن بزانن له‌ کوێیت به‌ GPS ، ئه‌م کاره‌ باتری مۆبایله‌که‌ت که‌م ده‌کات.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyAudioSettings">گۆڕینی ڕێکخستنه‌کانی ده‌نگ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyAudioSettings">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گۆڕینی ڕێکخستنی ده‌نگی گشتی وه‌ک ده‌نگی بڵنگۆ به‌کاردێت بۆ ده‌رچه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_recordAudio">تۆمارکردنی دەنگ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_recordAudio">ڕێگه‌دان به‌ به‌رنامه‌ بۆ تۆمارکردنی ده‌نگ له‌گه‌ڵ مایکرۆفۆنه‌که‌. ئه‌م ده‌سته‌ڵاته‌ ڕێگه‌ ئه‌دات به‌ به‌رنامه‌که‌ هه‌رکاتێک بیه‌وێت ده‌نگ تۆماربکات.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_camera">گرتنی وێنه‌ یان ڤیدیۆ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_camera">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گرتنی وێنه‌ و ڤیدیۆ له‌گه‌ڵ کامێراکه‌، ئه‌م ده‌سته‌ڵاته‌ ڕێگه‌ به‌ به‌رنامه‌که‌ ئه‌دات کامێرا به‌کاربهێنێ هه‌رکات بیه‌وێت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_vibrate">سه‌رپه‌رشتیکردنی له‌رین</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_vibrate">ڕێگه‌دان به‌ به‌رنامه‌ بۆ سه‌رپه‌رشتی کردنی له‌رینه‌وه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_flashlight">سه‌رپه‌رشتیکردنی ڕووناکی فلاش</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_flashlight">ڕێگه‌دان به‌ به‌رنامه‌ بۆ سه‌رپه‌رشتیکردنی ڕووناکی فلاش.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_callPhone">په‌یوه‌ندی کردنی ژماره‌کان ڕاسته‌وخۆیی</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_callPhone">ڕێگه‌دان به‌ به‌رنامه‌ بۆ په‌یوه‌ندی کردن به‌ ژماره‌وه‌ به‌بێ زانینی تۆ.له‌وانه‌یه‌ ئه‌نجامه‌که‌ی خراپ بێت بۆ په‌یوه‌ندی کردن.
 تێبینی:ئه‌مه‌ ڕێگه‌ نادات به‌ به‌رنامه‌که‌ په‌یوه‌ندی به‌ ڕوداوی له‌ناکاو و کتوپڕ بکات.
 به‌رنامه‌ خراپه‌کان به‌کاریده‌هێنن بۆ سه‌رفکردنی باڵانسه‌کانت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneState">خوێندنه‌وه‌ی باری ئامێر و ناسنامه‌</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneState">ڕێگه‌دان به‌ به‌رنامه‌ بۆ ده‌سته‌ڵاتکردنی خزمه‌ته‌کانی ئامێر.ئه‌مه‌ ڕێگه‌ به‌ به‌رنامه‌که‌ ئه‌دات بۆ دیاریکردنی ژماره‌ی مۆبایل و ID ئامێر، کاتێک که‌ په‌یوه‌ندی له‌کاردایه‌ ، یان ژماره‌یه‌کی دووره‌ده‌ست په‌یوه‌ندییه‌ بۆ په‌یوه‌ندی.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="tablet">ڕێگری کردن له‌ تابلێت بۆ نوستن</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="default">ڕێگری کردن له‌ مۆبایل بۆ نوستن</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ ڕێگری کردن له‌ تابلێت بۆ نوستن.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ ڕێگری کردن له‌ مۆبایله‌که‌ت بۆ نوستن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_transmitIr">گوێزه‌ره‌وه‌ی خوارسوور</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گواستنه‌وه‌ی خوارسور.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گواستنه‌وه‌ی خوارسور.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setWallpaper">دانانی دیوارپۆش</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setWallpaper">ڕێگەدانی بەرنامە بۆ دانانی دیوارپۆشی سیستەم.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setWallpaperHints">گونجاندنی قەبارەی دیوارپۆش</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setWallpaperHints">ڕێگه‌دان به‌ به‌رنامه‌ بۆ دانانی قه‌باره‌ی سه‌رڕوونما.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setTimeZone">کاتی ناوچەیی رێکبخە</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="tablet">ڕێگە بە نمواڵەکە بدە کاتی ناوچەیی تاتەبژمێرەکە بگۆرێت.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="default">ڕێگە بە نمواڵەکە بدە کاتی ناوچەیی تەلەفونەکە بگۆرێت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getAccounts">هەژمارەکان لە سەر ئامێرەکە بدۆزەرەوە</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="tablet">ڕیگە بە نمواڵەکە بدە لیستی هەژمارە ناسراوەکان بەدەستبخات لەلایەن تاتەبژمیرەکەوە. ئەمە لەوانەیە هەریەکێ لە هەژمارەکان بگریتەوە کە لەلایەن نەرمەواڵا دابەزینراوەکانەوە دروست کرابێت.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ به‌ده‌ستهێنانی لیستی هه‌موو هه‌ژماره‌کان له‌لایه‌ن ئامێره‌وه‌ ناسراون. له‌وانه‌یه‌ ئه‌مه‌ هه‌موو هه‌ژمارێکی تیابێت که‌ له‌لایه‌ن به‌رنامه‌کانه‌وه‌ دروستت کردووه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNetworkState">بینینی په‌یوه‌ندییه‌کانی خه‌ت</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNetworkState">ڕێگه‌دان به‌ به‌رنامه‌ بۆ بینینی زانیاری له‌باره‌ی په‌یوه‌ندی خه‌ت وه‌ک چ خه‌تێک هه‌یه‌ و چی په‌یوه‌ندیپێوه‌کراوه‌.</string>
-  <string name="permlab_createNetworkSockets">پڕاوپڕ ده‌سته‌ڵاتی خه‌ت</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_createNetworkSockets">ڕێگه‌دان به‌ به‌رنامه‌ بۆ دروستکردنی زانیاری خه‌ت و به‌کارهێنانی پرۆتۆکۆڵ.وه‌ وێبگه‌ره‌که‌ و به‌رنامه‌ی تر که‌ مانات ده‌داتێ وه‌ک ناردنی داتا بۆ ئینته‌رنێط.ئه‌م ده‌سته‌ڵاته‌ پێویست نییه‌ بۆ ناردنی داتا بۆ ئینته‌رنێت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeNetworkState">گۆڕینی په‌یوه‌ندی خه‌ت</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeNetworkState">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گۆڕینی باری په‌یوه‌ندی تۆڕ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeTetherState">گۆڕینی په‌یوه‌ندی به‌شداریپێکراو</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
   <string name="permdesc_changeTetherState">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گۆڕینی باری په‌یوه‌ندی به‌شداریپێکراوی تۆڕ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessWifiState">بینینی په‌یوه‌ندی وایه‌رلێس</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessWifiState">ڕێگه‌دان به‌ به‌رنامه‌ بۆ بینینی زانیاری له‌باره‌ی وایه‌رلێس،وه‌ک ئایا وایه‌رلێس کارده‌کات یان ناوی وایه‌رلیسی په‌یوه‌ندی پێکراو.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeWifiState">په‌یوه‌ندی یان پچڕان له‌ وایه‌رلێسه‌وه‌</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiState">ڕێگه‌پێدان به‌ به‌رنامه‌ بۆ په‌یوه‌ندی کردن یان په‌یوه‌ندی پچڕان له‌ ده‌سته‌ڵاتی وایه‌رلێسه‌وه‌ وه‌ گۆڕینی ئامیر بۆ وایه‌رلێس.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeWifiMulticastState">ڕێگه‌دان بۆ وایه‌رلێس 2 قبوڵبکات</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiMulticastState" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌کان بۆ وه‌رگرتنی پاکه‌تی په‌یوه‌ندی بۆ هه‌موو ئامێره‌کان له‌ وایه‌رلێسه‌وه‌ بۆ ناونیشانی دوانی.نه‌ک ته‌نیا بۆ تابلێته‌که‌ت.بۆ زۆر  هیزی تر به‌کاردێت نه‌ک ته‌نیا دوانی.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiMulticastState" product="default">ڕێگه‌دان به‌ به‌رنامه‌کان بۆ وه‌رگرتنی پاکه‌تی په‌یوه‌ندی بۆ هه‌موو ئامێره‌کان له‌ وایه‌رلێسه‌وه‌ بۆ ناونیشانی دوانی.نه‌ک ته‌نیا بۆ ئامێره‌که‌ت.بۆ زۆر  هیزی تر به‌کاردێت نه‌ک ته‌نیا دوانی.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bluetoothAdmin">چوونه‌ ناو ڕێکخستنه‌کانی بلوتوس</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ ڕێکخستنی بلوتوسی ناوه‌کی تابلێت.وه‌ دۆزینه‌وه‌ و ناساندنی دووره‌ ئامێر.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ ڕێکخستنی بلوتوسی ناوه‌کی مۆبایل.وه‌ دۆزینه‌وه‌ و ناساندنی دووره‌ ئامێر.</string>
   <string name="permlab_accessWimaxState">په‌یوه‌ندی یان پچڕان له‌ وایماکسه‌وه‌</string>
   <string name="permdesc_accessWimaxState">ڕێگه‌دان به‌ به‌رنامه‌ بۆ بڕیاردان که‌ی وایماکس کار بکات و زانیاری له‌باره‌ی وایماکس که‌ په‌یوه‌ندی پێوه‌کراوه‌. </string>
-  <string name="permlab_changeWimaxState">گۆڕینی باری وایماکس</string>
   <string name="permdesc_changeWimaxState" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ په‌یوه‌ندی کردنی تابلێت یان پچڕانی تابلێت له‌ وایماکسه‌وه‌.</string>
   <string name="permdesc_changeWimaxState" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ په‌یوه‌ندی کردنی مۆبایل یان پچڕانی مۆبایل له‌ وایماکسه‌وه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bluetooth">ناساندن له‌گه‌ڵ ئامێری بلوتوس</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="tablet">ڕێگه‌دان به‌ به‌رنامه‌ بۆ بینینی ڕێکخستنی بلوتوس له‌سه‌ر تابلێت، وه‌ک قبوڵکردن و دروستکردنی په‌یوه‌ندی له‌گه‌ڵ ناسرێنراوه‌کان.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ بینینی ڕێکخستنی بلوتوس له‌سه‌ر مۆبایله‌که‌ت. وه‌ک قبوڵکردن و دروستکردنی په‌یوه‌ندی له‌گه‌ڵ ناسرێنراوه‌کان.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_nfc">سه‌رپه‌رشتیکردنی په‌یوه‌ندییه‌ نزیکه‌کان.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_nfc">رێگە بە بەرنامەکە دەدات کە کۆنترۆلی پەیوەندی لەرێگەی Near Field Communicationەوە بکات</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_disableKeyguard">ناچالاککردنی داخەری ڕوونما</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_disableKeyguard">ڕێگە بە بەرنامەکە دەدا کە قوفلی دوکمەکان و وشە نهێنیەکەنیان لەکار بخا .بۆ نمونە مۆبایلەکەت لە کاتی هاتنی پەیوەندی ،قوفڵەکە بۆ ماوەیەکی کاتی لەکار دەخا بۆ ئەوەی بتوانی وەڵام بدەیتەوە</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncSettings">خوێندنەوەی زانیاریەکەنی هاوتاکردن</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSyncSettings">ڕیگە بە بەرنامەکە دەدا کە زانیاری دەربارەی هاوتاکردن بخوێنێتەوە.بۆ نمونە ئەمە دیاری دەکەت کە ئایا بەرنامەی Pepole لەگەڵ هیچ هەژمارێک هاوتا کراوە یان نە</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeSyncSettings">هاوتاکردن بکوژێنەوە یان داگیرسێنە</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeSyncSettings">ڕێگە بە بەرنامەکە دەدا کە دەستکاری رێکخستنی هاوتاکردن بکات.بۆ نمونە ئەمە دەتوانریت بۆ هاوتاکردنی بەرنامەی pepole لەگەڵ هەژمارێک بەکاربێت</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncStats">خوێندنه‌وه‌ی هاوتاکردنی ئامارکردنه‌کان</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSyncStats">ڕێگه‌دان به‌ به‌رنامه‌یه‌ک بۆ هاوتاکردنی ئامار بۆ هه‌ژمارێک، وه‌ک مێژووی هاوتاکردنی ڕووداوه‌کان وه‌ چه‌ند داتا هاوتاکراوه‌. </string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permlab_sdcardRead" product="nosdcard">خوێندنه‌وه‌ی به‌شه‌کانی ناو بیرگه‌ی USB.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_sdcardRead" product="default">خوێندنه‌وه‌ی پێکهاته‌ی ناو بیرگه‌ی ناوه‌کی</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permdesc_sdcardRead" product="nosdcard">ڕێگه‌دان به‌ به‌رنامه‌ بۆ خوێندنه‌وه‌ی پێکهاته‌ی ناو بیرگه‌ی USB.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sdcardRead" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ خوێندنه‌وه‌ی پێکهاته‌ی ناو بیرگه‌ی ناوه‌کی.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permlab_sdcardWrite" product="nosdcard">گۆڕین یان سڕینه‌وه‌ی پێکهاته‌ی بیرگه‌ی USB</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_sdcardWrite" product="default">گۆڕین یان سڕینه‌وه‌ی پێکهاته‌ی بیرگه‌ی ناوه‌کی</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permdesc_sdcardWrite" product="nosdcard">ڕێگه‌دان به‌ به‌رنامه‌ بۆ نوسینی بیرگه‌ی USB.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sdcardWrite" product="default">ڕێگه‌دان به‌ به‌رنامه‌ بۆ نوسینی بیرگه‌ی ناوه‌کی.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readNetworkUsageHistory">خوێندنه‌وه‌ی تۆماری به‌کارهێنانی تۆڕ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readNetworkUsageHistory">ڕێگه‌دان به‌ به‌رنامه‌ بۆ خوێندنه‌وه‌ی تۆماری به‌کارهێنانی تۆڕ بۆ تۆڕێکی تایبه‌ت و به‌رنامه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_manageNetworkPolicy">به‌ڕێوه‌بردنی ڕه‌وگه‌ی تۆڕ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_manageNetworkPolicy">ڕێگه‌دان به‌ به‌رنامه‌ بۆ به‌ڕێوه‌بردنی ڕه‌وگه‌ی تۆڕ و یاسایی تایبه‌تی به‌رنامه‌.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyNetworkAccounting">گۆڕینی به‌کارهێنانی هەژماری تۆڕ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyNetworkAccounting">ڕێگه‌دان به‌ به‌رنامه‌ بۆ گۆڕینی به‌کارهێنانی هەژماری تۆڕ.بۆ به‌رنامه‌ی ئاسایی به‌کارنایه‌ت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNotifications">ده‌سته‌ڵاتی تێبینییه‌کان</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNotifications">ڕێگه‌دان به‌ به‌رنامه‌ بۆ ده‌سته‌لاتی وه‌رگرتن و کارپێکردن و پاککردنه‌وه‌ی ئاگادارکردنه‌وه‌کان.وه‌ک پۆسته‌کانی به‌رنامه‌کان.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindNotificationListenerService">گوێ نەدان بە خزمەتگوزاری بیسەری تێبینییەکان</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindNotificationListenerService">ڕێگە بە هەڵگر بە بۆ لەکار خستنی دۆخی ئاست-بەرزی خزمەتگوزاری بیسەری تێبینییەکان. هیچکات پێویست نابێت بۆ بەرنامە ئاساییەکان.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_invokeCarrierSetup">داواکاری ڕێپێدان بۆ بەرنامەی ڕێکبەندەکانی ئۆپەراتۆر</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_invokeCarrierSetup">ڕێگە بە هەڵگر بە بۆ داواکاری ڕێپێدان بۆ بەرنامەی ڕێکبەندەکانی ئۆپەراتۆر. بۆ بەرنامە ئاساییەکان هیچکات پێویست نابێت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNetworkConditions">گوێدان بە تێبینییەکانی ناو بار و دۆخی تۆڕ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNetworkConditions">ڕێگە بە بەرنامەیەک بدە بۆ گوێدان بە تێبینییەکانی ناو بار و دۆخی تۆڕ. بۆ بەرنامە ئاساییەکان هیچکات پێویست ناکات.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
   <string name="policylab_limitPassword">دانانی یاسایی وشه‌ی نهێنی</string>
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
   <string name="policylab_watchLogin">هەوڵەکانی چالاککردنی پێشانگا تۆماربکە</string>
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="tablet">ژمارەی نهێنوشە هەڵەکان تۆمار بکە
     کە ئەنووسرێن کاتی چالاککردنی پێشانگا، تابلێتەکە دابخە یان هەموو زانیارییەکانی
     ناو تابلێت بسڕەوە ئەگەر نهێنوشەی هەڵە زۆر جار نووسراوە.</string>
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="default">ژمارەی نهێنوشە هەڵەکان تۆمار بکە
     کە ئەنووسرێن کاتی چالاککردنی پێشانگا، مۆبایلەکە دابخە یان هەموو زانیارییەکانی
     ناو مۆبایل بسڕەوە ئەگەر نهێنوشەی هەڵە زۆر جار نووسراوە.</string>
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
   <string name="policylab_forceLock">قوفڵی سه‌رڕوونما</string>
+  <!-- Description of policy access to limiting the user's password choices -->
   <string name="policydesc_forceLock">چاودێری پێسانگە بکە کە چۆن و کەی دادەخرێت.</string>
+  <!-- Title of policy access to wipe primary user's data -->
   <string name="policylab_wipeData">سڕینەوەی هەموو دراو</string>
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="tablet">هەموو زانیارییەکانی تابلێتەکە بسڕەوە بێ نیگەرانی لە ڕێکخستنەوەی داتاکانی کارگە.</string>
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="default">هەموو زانیارییەکانی مۆبایلەکە بسڕەوە بێ نیگەرانی لە ڕێکخستنەوەی داتاکانی کارگە.</string>
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
   <string name="policylab_setGlobalProxy">دانانی پرۆکسی جیهانی بۆ ئامێرەکەت</string>
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
   <string name="policylab_encryptedStorage">نهێنیکردنی بیرگە</string>
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
   <string name="policydesc_encryptedStorage">پێویستە کە بەرنامەی هەڵگیراو نهێنی بکرێت.</string>
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
   <string name="policylab_disableCamera">لەکارخستنی کامیراکان</string>
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
   <string name="policydesc_disableCamera">رێگرتن لە بەکارهێنانی هەمو کامیرەکان</string>
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>ماڵ</item>
     <item>موبایل</item>
@@ -429,29 +958,39 @@
     <item>دیکە</item>
     <item>دروستکراو</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>ماڵ</item>
     <item>کار</item>
     <item>دیکە</item>
     <item>دروستکراو</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>ماڵ</item>
     <item>کار</item>
     <item>دیکە</item>
     <item>دروستکراو</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>ماڵ</item>
     <item>کار</item>
     <item>دیکە</item>
     <item>دروستکراو</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>کار</item>
     <item>دیکە</item>
     <item>دروستکراو</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>ئامانج</item>
     <item>Windows Live</item>
@@ -462,444 +1001,949 @@
     <item>ICQ</item>
     <item>Jabber</item>
   </string-array>
+  <!-- Custom phone number type -->
   <string name="phoneTypeCustom">دروستکراو</string>
+  <!-- Home phone number type -->
   <string name="phoneTypeHome">ماڵ</string>
+  <!-- Mobile phone number type -->
   <string name="phoneTypeMobile">موبایل</string>
+  <!-- Work phone number type -->
   <string name="phoneTypeWork">کار</string>
+  <!-- Work fax phone number type -->
   <string name="phoneTypeFaxWork">کاری فاکس</string>
+  <!-- Home fax phone number type -->
   <string name="phoneTypeFaxHome">ماڵی فاکس</string>
+  <!-- Pager phone number type -->
   <string name="phoneTypePager">Pager</string>
+  <!-- Other phone number type -->
   <string name="phoneTypeOther">دیکە</string>
+  <!-- Callback phone number type -->
   <string name="phoneTypeCallback">Callback</string>
+  <!-- Car phone number type -->
   <string name="phoneTypeCar">ئۆتۆمۆبیل</string>
+  <!-- Company main phone number type -->
   <string name="phoneTypeCompanyMain">کۆمپانیای سەرەکی</string>
+  <!-- ISDN phone number type -->
   <string name="phoneTypeIsdn">ISDN</string>
+  <!-- Main phone number type -->
   <string name="phoneTypeMain">سەرەکی</string>
+  <!-- Other fax phone number type -->
   <string name="phoneTypeOtherFax">فاکسی دیکە</string>
+  <!-- Radio phone number type -->
   <string name="phoneTypeRadio">Radio</string>
+  <!-- Telex phone number type -->
   <string name="phoneTypeTelex">تێلێکس</string>
+  <!-- TTY TDD phone number type -->
   <string name="phoneTypeTtyTdd">TTY TDD</string>
+  <!-- Work mobile phone number type -->
   <string name="phoneTypeWorkMobile">کاری مۆبایل</string>
+  <!-- Work pager phone number type -->
   <string name="phoneTypeWorkPager">Work Pager</string>
+  <!-- Assistant phone number type -->
   <string name="phoneTypeAssistant">یاریدەدەر</string>
+  <!-- MMS phone number type -->
   <string name="phoneTypeMms">MMS</string>
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
   <string name="eventTypeCustom">تایبەت</string>
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
   <string name="eventTypeBirthday">ڕۆژی لە دایک بوون</string>
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
   <string name="eventTypeAnniversary">یادکردنەوە</string>
+  <!-- Label for other events  [CHAR LIMIT=20] -->
   <string name="eventTypeOther">جۆری تر</string>
+  <!-- Custom email type -->
   <string name="emailTypeCustom">تایبەت</string>
+  <!-- Home email type -->
   <string name="emailTypeHome">ماڵەوە</string>
+  <!-- Work email type -->
   <string name="emailTypeWork">کار</string>
+  <!-- Other email type -->
   <string name="emailTypeOther">جۆری تر</string>
+  <!-- Mobile email type -->
   <string name="emailTypeMobile">مۆبایل</string>
+  <!-- Custom postal address type -->
   <string name="postalTypeCustom">تایبەت</string>
+  <!-- Home postal address type -->
   <string name="postalTypeHome">ماڵەوە</string>
+  <!-- Work postal address type -->
   <string name="postalTypeWork">کار</string>
+  <!-- Other postal address type -->
   <string name="postalTypeOther">دیکە</string>
+  <!-- Custom IM address type -->
   <string name="imTypeCustom">ده‌ستکرد</string>
+  <!-- Home IM address type -->
   <string name="imTypeHome">ماڵه‌وه‌</string>
+  <!-- Work IM address type -->
   <string name="imTypeWork">کار</string>
+  <!-- Other IM address type -->
   <string name="imTypeOther">دیکە</string>
+  <!-- Custom IM protocol type -->
   <string name="imProtocolCustom">دەستکرد</string>
+  <!-- AIM IM protocol type -->
   <string name="imProtocolAim">AIM</string>
+  <!-- MSN IM protocol type -->
   <string name="imProtocolMsn">Windows Live</string>
+  <!-- Yahoo IM protocol type -->
   <string name="imProtocolYahoo">یاهوو</string>
+  <!-- Skype IM protocol type -->
   <string name="imProtocolSkype">سکایپ</string>
+  <!-- QQ IM protocol type -->
   <string name="imProtocolQq">QQ</string>
+  <!-- Google Talk IM protocol type -->
   <string name="imProtocolGoogleTalk">Hangouts</string>
+  <!-- ICQ IM protocol type -->
   <string name="imProtocolIcq">ICQ</string>
+  <!-- Jabber IM protocol type -->
   <string name="imProtocolJabber">Jabber</string>
+  <!-- NetMeeting IM protocol type -->
   <string name="imProtocolNetMeeting">NetMeeting</string>
+  <!-- Work organization type -->
   <string name="orgTypeWork">کار</string>
+  <!-- Other organization type -->
   <string name="orgTypeOther">دیکە</string>
+  <!-- Custom organization type -->
   <string name="orgTypeCustom">دەستکرد</string>
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
   <string name="relationTypeCustom">دەستکرد</string>
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeAssistant">یاریدەدەر</string>
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeBrother">برا</string>
+  <!-- Child relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeChild">مناڵ</string>
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeDomesticPartner">هاوبەشی خۆماڵی</string>
+  <!-- Father relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeFather">باوک</string>
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeFriend">هاوڕێ</string>
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeManager">بەڕێوەبەر</string>
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeMother">دایک</string>
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeParent">باوان</string>
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
   <string name="relationTypePartner">هاوڕێ</string>
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeReferredBy">ئاماژەبۆکراوە لەلایەن</string>
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeRelative">خزم</string>
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeSister">خوشک</string>
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeSpouse">هاوسەر</string>
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
   <string name="sipAddressTypeCustom">دەستکرد</string>
+  <!-- Home SIP address type. Same context as Home phone type. -->
   <string name="sipAddressTypeHome">ماڵەوە</string>
+  <!-- Work SIP address type. Same context as Work phone type. -->
   <string name="sipAddressTypeWork">کار</string>
+  <!-- Other SIP address type. Same context as Other phone type. -->
   <string name="sipAddressTypeOther">دیکە</string>
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
   <string name="quick_contacts_not_available">هیچ به‌رنامه‌یه‌ک نه‌دۆزرایه‌وه‌ بۆ بینینی ئه‌م په‌یوه‌ندییه‌.</string>
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_code">نوسینی PIN کۆد</string>
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_puk_code">نووسینی PUK لەگەڵ PIN کۆدی نوێ</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">PUK کۆد</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">PIN کۆدی نوێ</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">دەست لێدان بۆ نووسینی تێپه‌ڕوشه‌</font></string>
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_password_code">نوسینی تێپەڕە وشە بۆ کردنه‌وه‌</string>
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_password_code">PIN بنووسه‌ بۆ کردنه‌وه‌</string>
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
   <string name="keyguard_password_wrong_pin_code">کۆدی PIN هەڵەیە.</string>
+  <!-- Instructions telling the user how to unlock the phone. -->
   <string name="keyguard_label_text">بۆ کردنه‌وه‌، پەنجە بنێ بە لیست و پاشان 0.</string>
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
   <string name="emergency_call_dialog_number_for_display">ژمارەی فریاگوزاری</string>
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">خزمەتگوزاری نیە.</string>
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <string name="lockscreen_screen_locked">شاشە قفلدراوە.</string>
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
   <string name="lockscreen_instructions_when_pattern_enabled">پەنجە بنێ بە لیست بۆ چالاککردنی یان دانانی تەلەفۆنی فریاگوزاری.</string>
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="lockscreen_instructions_when_pattern_disabled">پەنجە بنێ بە لیست بۆ کردنەوە.</string>
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
   <string name="lockscreen_pattern_instructions">شێوەکە راکێشە بۆ چالاککردن</string>
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
   <string name="lockscreen_return_to_call">گەڕانەوە بۆ تەلەفۆن</string>
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
   <string name="lockscreen_pattern_correct">ڕاست!</string>
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
   <string name="lockscreen_pattern_wrong">دوبارە هەوڵبدەرەوە</string>
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
   <string name="lockscreen_password_wrong">دووباره‌ هەوڵ بدەوە</string>
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
   <string name="faceunlock_multiple_failures">چالاککردنی قوفڵ بە ڕوخسار هەوڵ زۆر دراوە</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message_short">سیمکارتی تیا نیە</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="tablet">سیمکارت نیە لە تاتەبژمێر.</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="default">سیمکارت نیە لە تەلەفۆن.</string>
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
   <string name="lockscreen_missing_sim_instructions">سیمکارتی تیا بکە.</string>
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
   <string name="lockscreen_missing_sim_instructions_long">سیمکارتەکە تیایە نیە یان نایخوێنێتەوە. سیمکارتی تێبکە.</string>
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
   <string name="lockscreen_permanent_disabled_sim_message_short">سیمکارتەکە بەکارنایەت.</string>
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
   <string name="lockscreen_permanent_disabled_sim_instructions">سیمکارتەکە لە کارخرا .\n پەیوەندی بکە بە کۆمپانیای بێ تەلەوە بۆ سیمێکی تر.</string>
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
   <string name="emergency_calls_only" msgid="2485604591272668370">ته‌نها په‌یوه‌ندی كتوپڕ</string>
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
   <string name="lockscreen_network_locked_message">تۆڕ قوفڵکراوە</string>
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
   <string name="lockscreen_sim_puk_locked_message">سیمکارتەکە PUK-قوفڵکراوە.</string>
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
   <string name="lockscreen_sim_puk_locked_instructions">بینینی تێبینی بەکارهێنەر یان پەیوەندی بکە بە خزمەتگوزاری یارمەتیدەرەوە.</string>
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
   <string name="lockscreen_sim_locked_message">سیمکارتەکە داخراوه‌.</string>
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
   <string name="lockscreen_sim_unlock_progress_dialog_message">کردنەوەی سیمکارت\u2026</string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
   <string name="lockscreen_too_many_failed_attempts_dialog_message">
         تۆ قوفڵی کێشانەکەت بە هەڵە لێداوە <xliff:g id="number">%d</xliff:g> جار.
         \n\nدوبارە هەوڵبدەروەە <xliff:g id="number">%d</xliff:g> دوەم.
     .
     </string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
   <string name="lockscreen_too_many_failed_password_attempts_dialog_message">
         بەهەڵە چەند جارێک تێپەڕە وشەت لێداوە <xliff:g id="number">%d</xliff:g> جار.
         \n\nدوبارە هەوڵبدەرەوە <xliff:g id="number">%d</xliff:g> دوەم.
     .
     </string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
   <string name="lockscreen_too_many_failed_pin_attempts_dialog_message">
         چەند جارێک بە هەڵە PIN نوسیوە <xliff:g id="number">%d</xliff:g> times.
         \n\nدوبارە هەوڵبدەرەوە <xliff:g id="number">%d</xliff:g> دوەمجار.
     .
     </string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="tablet">
         بەهەڵە هەوڵی چالاککردنی کێشانەکەت داوە بۆ چالاککردن <xliff:g id="number">%d</xliff:g> times.
        After <xliff:g id="number">%d</xliff:g>زۆر هەوڵدان زیاتر ئەوە پرسیارت لێ ئەکەت بە بەکارهیانی هەژمارەکەت بچیتە ژورەوە.\n\n
        Try again in <xliff:g id="number">%d</xliff:g> دوەم.
     .
     </string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="default">
         بەهەڵە هەوڵی چالاککردنی کێشانەکەت داوە بۆ چالاککردن <xliff:g id="number">%d</xliff:g> times.
        After <xliff:g id="number">%d</xliff:g>زۆر هەوڵدان زیاتر ئەوە پرسیارت لێ ئەکەت بە بەکارهیانی هەژمارەکەت بچیتە ژورەوە.\n\n
        Try again in <xliff:g id="number">%d</xliff:g> دوەم.
     .
     </string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet">
        چەند جارێک هەوڵی کردنەوەی تاتەبژمێرەکەت داوە بە‌ەلە <xliff:g id="number">%d</xliff:g> times.
        After <xliff:g id="number">%d</xliff:g> بەهەڵە لێی بدەیتەوە ئەوە تاتەبژمێرەکەت ئەچێتەوە باری بنەڕەت و هەموو داتاکان و فایلەکان ئەسڕێتەوە.
     .
     </string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="default">
        چەند جارێک هەوڵی چالاککردنی تاتەبژمێرەکەت داوە بە‌ەلە <xliff:g id="number">%d</xliff:g> times. After <xliff:g id="number">%d</xliff:g> بەهەڵە لێی بدەیتەوە ئەوە تاتەبژمێرەکەت ئەچێتەوە باری بنەڕەت و هەموو داتاکان و فایلەکان ئەسڕێتەوە.
     </string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="tablet">
        تۆ بەهەڵە هەوڵت داوە تاتە بژمێرەکە بکەیتەوە <xliff:g id="number">%d</xliff:g> times.
        Tزۆر هەڵە لێدانی فایلەکان ئەسڕێتەوە بۆ باری بنەڕەتی ئەچێتەوە.
     .
     </string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="default">
        بەهەڵە هەوڵت داوە بۆ چالاککردنی تەلەفۆنەکەت <xliff:g id="number">%d</xliff:g> times.
       تەلەفۆنەکە ئێستا ئەجیتەوە باری بنەڕەتی.
     .
     </string>
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
   <string name="lockscreen_too_many_failed_attempts_countdown">دوبارە هەوڵبدەرەوە <xliff:g id="number">%d</xliff:g> دووەم.</string>
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
   <string name="lockscreen_forgot_pattern_button_text">بیرچونی کێشانەکە?</string>
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
   <string name="lockscreen_glogin_forgot_pattern">کردنەوەی هەژمارەکە</string>
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
   <string name="lockscreen_glogin_too_many_attempts">زۆر هەوڵت داوە قوفڵە کێشان دانێیت</string>
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
   <string name="lockscreen_glogin_instructions">بۆ کردنەوە.بچۆ ژورەوە بە هەژماری Googleەکەت.</string>
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_username_hint">ناو(ئیمەیڵ)</string>
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_password_hint">تێپەڕەوشە</string>
+  <!-- Button to try to unlock the phone using username and password -->
   <string name="lockscreen_glogin_submit_button">چونەژورەوە</string>
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
   <string name="lockscreen_glogin_invalid_input">ناو لە کارە نیە یان تێپەڕە وشە.</string>
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
   <string name="lockscreen_glogin_account_recovery_hint">ناو یان تێپەڕە وشەکەت بیرچوە؟\?\nVisit <b>google.com/هەمار/recovery</b>.</string>
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
   <string name="lockscreen_glogin_checking_password">پشکنین\u2026</string>
+  <!-- Displayed on lock screen's left tab - unlock -->
   <string name="lockscreen_unlock_label">چالاککردن</string>
+  <!-- Displayed on lock screen's right tab - turn sound on -->
   <string name="lockscreen_sound_on_label">چالاککردنی دەنگ</string>
+  <!-- Displayed on lock screen's right tab - turn sound off -->
   <string name="lockscreen_sound_off_label">ناچالاککردنی دەنگ</string>
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_start">قوفڵ کێشان دەستی پێکرد</string>
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_cleared">کێشانەکە پاکرایەوە</string>
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
   <string name="lockscreen_access_pattern_cell_added">خانە زیادکرا</string>
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_detected">کێشانەکە تەواوکرا</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="lockscreen_access_pattern_area" msgid="">ناوچەی کێشان.</string>
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_changed">%1$s. وێدج%2$d of %3$d.</string>
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_add_widget">زیادکردنی کورته‌وێنه‌.</string>
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_empty_slot">بەتاڵ</string>
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_unlock_area_expanded">کردنەوی ناوچە بڵاوکرایەوە.</string>
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_unlock_area_collapsed">ناوچەی چالاککردن لەناوچوون.</string>
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget"><xliff:g id="کورته‌وێنه‌_index">%1$s</xliff:g> widget.</string>
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_user_selector">هەڵبژاردەی بەکارهێنەر</string>
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_status">ئاست</string>
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_camera">کامێرا</string>
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
   <string name="keygaurd_accessibility_media_controls">کۆنترۆڵی ڕاگه‌یێنه‌کان</string>
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_reorder_start">دوبارە کورته‌وێنه‌ەکە داوابکە.</string>
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_reorder_end">داواکردنی وێدجەکان کۆتایهات.</string>
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_deleted">کورته‌وێنه‌ <xliff:g id="widget_index">%1$s</xliff:g> سڕایەوە.</string>
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_expand_lock_area">بڵاوکردنەوەی ناوچەی کردنەوە.</string>
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_unlock">کردنەوە بە لادان.</string>
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_unlock">کردنه‌وه‌ بە گه‌یاندن.</string>
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_face_unlock">چالاککردن بە ڕووخسار.</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">کردنەوە بە کۆد.</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">کردنەوە بە تێپەڕەوشە.</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area">ناوچەی کێشان.</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">ناوچەی لادان.</string>
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_alpha_key">ABC</string>
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_alt_key">ALT</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_character">کارەکتەر</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_word">وشە</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_link">بەستەرە</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_line">هێڵ</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
   <string name="hour_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="pm">%P</xliff:g>"</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
   <string name="hour_cap_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="PM">%p</xliff:g>"</string>
+  <!-- Title of the alert when something went wrong in the factory test. -->
   <string name="factorytest_failed">گەڕانەوە بۆ باری ئاسایی سەرنەکەوت</string>
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
   <string name="factorytest_not_system">چالاکی بۆ باری بنەڕەتی
 تەنها پاڵپشتی ئەوانە دەکات کە دامەزراون لە سیستەم/بەرنامە.</string>
+  <!-- Error message displayed when the factory test could not be started. -->
   <string name="factorytest_no_action">هیچ گورزەیەک نەدۆرایەوە کە
         فرمانی تاقیکاری کارگە لە خۆ بگرێت.</string>
+  <!-- Button to restart the device after the factory test. -->
   <string name="factorytest_reboot">دووباره‌ داگیرساندنه‌وه‌</string>
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
   <string name="js_dialog_title">پەڕەکە لە \"<xliff:g id="title">%s</xliff:g>\" ئەڵێت:</string>
+  <!-- Default title for a javascript dialog -->
   <string name="js_dialog_title_default">جاڤاسکریپت</string>
+  <!-- Title for the unload javascript dialog -->
   <string name="js_dialog_before_unload_title">دڵنیاکردنەوەی ڕێدۆزەر</string>
+  <!-- Text for the positive button on the unload javascript dialog -->
   <string name="js_dialog_before_unload_positive_button">جێهێشتنی ئەم پەڕەیە</string>
+  <!-- Text for the negative button on the unload javascript dialog -->
   <string name="js_dialog_before_unload_negative_button">مانەوە لەسەر ئەم پەڕەیە</string>
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
   <string name="js_dialog_before_unload"><xliff:g id="message">%s</xliff:g>\n\nتۆى دڵنيان تۆ دەوێتان تا دوور لە ئەمە لاپەڕەوە بەناودا بڕوات؟ ?</string>
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
   <string name="save_password_label">دلنیاکردنەوە</string>
+  <!-- Toast for double-tap -->
   <string name="double_tap_toast">سەر: دوجار -لێدان بۆ زوم نزیک و دەرەوە.</string>
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
   <string name="autofill_this_form">خۆکارپڕ</string>
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
   <string name="setup_autofill">دانانی خۆکارپڕ</string>
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
   <string name="autofill_address_name_separator">\u0020</string>
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
   <string name="autofill_address_summary_name_format">$1$2$3</string>
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
   <string name="autofill_address_summary_separator">,\u0020</string>
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
   <string name="autofill_address_summary_format">$1$2$3</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_attention_ignored_re">سەرنجدان|attn</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_region_ignored_re">province|region|other<!-- es -->|provincia<!-- pt-BR, pt-PT -->|bairro|suburb</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_company_re">company|business|organization|organisation|department<!-- de-DE -->|firma|firmenname<!-- es -->|empresa<!-- fr-FR -->|societe|société<!-- it-IT -->|ragione.?sociale<!-- ja-JP -->|会社<!-- ru -->|название.?компании<!-- zh-CN -->|单位|公司</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_1_re">address.?line|address1|addr1|street<!-- de-DE -->|strasse|straße|hausnummer|housenumber<!-- en-GB -->|house.?name<!-- es -->|direccion|dirección<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所1<!-- pt-BR, pt-PT -->|morada|endereço<!-- ru -->|Адрес<!-- zh-CN -->|地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_1_label_re">ناونیشان<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所<!-- zh-CN -->|地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_2_re">ناونیشان.?line2|address2|addr2|street|suite|unit<!-- de-DE -->|adresszusatz|ergänzende.?angaben<!-- es -->|direccion2|colonia|adicional<!-- fr-FR -->|addresssuppl|complementnom|appartement<!-- it-IT -->|indirizzo2<!-- ja-JP -->|住所2</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_3_re">ناونیشان.?line3|address3|addr3|street|line3<!-- es -->|municipio<!-- fr-FR -->|batiment|residence<!-- it-IT -->|indirizzo3</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_country_re">وڵات|ناوچه‌<!-- ja-JP -->|国<!-- zh-CN -->|国家</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_zip_code_re">zip|postal|post code|pcode|^1z$<!-- de-DE -->|postleitzahl<!-- es -->|cp<!-- fr-FR -->|cdp<!-- it-IT -->|cap<!-- ja-JP -->|郵便番号<!-- pt-BR, pt-PT -->|codigo|codpos|cep<!-- ru -->|Почтовый.?Индекс<!--zh-CN -->|邮政编码|邮编<!-- zh-TW -->|郵遞區號</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_zip_4_re">zip|^-$|post2<!-- pt-BR, pt-PT -->|codpos2</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_city_re">city|town<!-- de-DE -->|ort|stadt<!-- en-AU -->|suburb<!-- es -->|ciudad|provincia|localidad|poblacion<!-- fr-FR -->|ville|commune<!-- it-IT -->|localita<!-- ja-JP -->|市区町村<!-- pt-BR, pt-PT -->|cidade<!-- ru -->|Город<!-- zh-CN -->|市<!-- zh-TW -->|分區</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_state_re">state|county|region|province<!-- de-DE -->|land<!-- en-UK -->|county|principality<!-- ja-JP -->|都道府県<!-- pt-BR, pt-PT -->|estado|provincia<!-- ru -->|область<!-- zh-CN -->|省<!-- zh-TW -->|地區</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_type_same_as_re">وەکو هەمان</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_type_use_my_re">بەکارهێنانی</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_billing_designator_re">گەڵاڵە</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_shipping_designator_re">ناردن</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_email_re">e.?mail<!-- ja-JP -->|メールアドレス<!-- ru -->|Электронной.?Почты<!-- zh-CN -->|邮件|邮箱<!-- zh-TW -->|電郵地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_username_re">user.?name|user.?id<!-- de-DE -->|vollständiger.?name<!-- zh-CN -->|用户名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_re">^name|full.?name|your.?name|customer.?name|firstandlastname<!-- es -->|nombre.*y.*apellidos<!-- fr-FR -->|^nom<!-- ja-JP -->|お名前|氏名<!-- pt-BR, pt-PT -->|^nome<!-- zh-CN -->|姓名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_specific_re">^name<!-- fr-FR -->|^nom<!-- pt-BR, pt-PT -->|^nome</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_first_name_re">irst.*name|initials|fname|first$<!-- de-DE -->|vorname<!-- es -->|nombre<!-- fr-FR -->|forename|prénom|prenom<!-- ja-JP -->|名<!-- pt-BR, pt-PT -->|nome<!-- ru -->|Имя</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_middle_initial_re">ةاوەند.*initial|m\\.i\\.|mi$</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_middle_name_re">ناوی ناوەنجی.*ناو|mname|ناوەند$<!-- es -->|apellido.?materno|کۆتای ناو</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_last_name_re">last.*name|lname|surname|last$<!-- de-DE -->|nachname<!-- es -->|apellidos<!-- fr-FR -->|famille|^nom<!-- it-IT -->|cognome<!-- ja-JP -->|姓<!-- pt-BR, pt-PT -->|morada|apelidos|surename|sobrenome<!-- ru -->|Фамилия</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_re">phone<!-- de-DE -->|telefonnummer<!-- es -->|telefono|teléfono<!-- fr-FR -->|telfixe<!-- ja-JP -->|電話<!-- pt-BR, pt-PT -->|telefone|telemovel<!-- ru -->|телефон<!-- zh-CN -->|电话</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_area_code_re">ناوچە.*کۆد|acode|ناوچە</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_prefix_re">prefix<!-- fr-FR -->|preselection<!-- pt-BR, pt-PT -->|ddd</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_suffix_re">پاشگر</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_extension_re">ext<!-- pt-BR, pt-PT -->|ramal</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_on_card_re">card.?holder|name.?on.?card|ccname|owner<!-- de-DE -->|karteninhaber<!-- es -->|nombre.*tarjeta<!-- fr-FR -->|nom.*carte<!-- it-IT -->|nome.*cart<!-- ja-JP -->|名前<!-- ru -->|Имя.*карты<!-- zh-CN -->|信用卡开户名|开户名|持卡人姓名<!-- zh-TW -->|持卡人姓名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_on_card_contextual_re">ناو</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_cvc_re">گونجاندن|کارتidentification|cvn|security code|cvv code|cvc</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_number_re">ژمارە|کارت.?#|card.?no|ccnum<!-- de-DE -->|nummer<!-- es -->|credito|numero|número<!-- fr-FR -->|numéro<!-- ja-JP -->|カード番号<!-- ru -->|Номер.*карты<!-- zh-CN -->|信用卡号|信用卡号码<!-- zh-TW -->|信用卡卡號</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_expiration_month_re">بەسەرچوون|exp.*مانگ|نمونە.*ڕۆژ|ccmonth<!-- de-DE -->|gueltig|gültig|monat<!-- es -->|fecha<!-- fr-FR -->|date.*exp<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|لەکارە<!-- ru -->|Срок действия карты<!-- zh-CN -->|月</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_expiration_date_re">exp|^/|year<!-- de-DE -->|ablaufdatum|gueltig|gültig|yahr<!-- es -->|fecha<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|年|有效期</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_ignored_re">^کارت</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_fax_re">فاکس<!-- fr-FR -->|télécopie|telecopie<!-- ja-JP -->|ファックス<!-- ru -->|факс<!-- zh-CN -->|传真<!-- zh-TW -->|傳真</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_country_code_re">وڵات.*کۆد|ccode|_cc</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_area_code_notext_re">^\\($</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_prefix_separator_re">^-$|^\\)$</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_suffix_separator_re">^-$</string>
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_province">پارێزگا</string>
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_postal_code">کۆدی پۆستان</string>
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_state">دەوڵەت</string>
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_zip_code">کۆدی پۆستە</string>
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_county">وڵات</string>
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_island">دوورگە</string>
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_district">ناوچە</string>
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_department">بەش</string>
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_prefecture">ولایەت</string>
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_parish">پاریس</string>
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_area">ناوچە</string>
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_emirate">میرنشین</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_readHistoryBookmarks">خوێندنەوەی وێبنیشانکەرەکە و مێژوو</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_readHistoryBookmarks">رێگە بە بەرنامە بە بۆ خوێندنەوەی
      مێژووی هەموو ئەو وێبپەڕانەی کە وێبگەڕەکەت سەردانی کردوون، لەگەڵ هەموو وێبپەڕە
      هیماکراوەکان. تێبینی: ئەم ڕێدانە لەوە ئەچێ پابەند نەبێت بە وێبگەڕە یاریدەدەرەکانەوە
      یان ئەو بەرنامانەی کە توانایی گەڕانی وێبیان هەبێت.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_writeHistoryBookmarks">نوسینی په‌رتوکنیشانکه‌ری وێبگه‌ر و مێژو</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
   <string name="permlab_setAlarm">دانانی زەنگ</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
   <string name="permlab_addVoicemail">زیادکردنی نامەی دەنگی</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
   <string name="permdesc_addVoicemail">ڕێگەدان بە بەرنامەکە بۆ زیادکردنی نامەکان
 بۆ سندوقی دەنگە نامە.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_writeGeolocationPermissions">لابردنی تازەکردنەوەی شوێنی جوگرافی وێبگەر</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_writeGeolocationPermissions">ڕێ دەدات بە بەرنامە تا بگۆڕێت
 
 ڕێگەپێدانى شوێنی جوگرافی براوزە. بەرنامەى ڤایرۆسی
 
 لەوانەيە ئەمە بەكار بهێنێت تا ڕێ بدات بە بۆ ناردنى وێبسايتى زانياريى شوێن هەرەمەكى.</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
   <string name="save_password_message">ئایا دەتەوێت وێبگەڕەکەت ئەم نهێنووشەیە بە یادت بهێنێتەوە؟</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
   <string name="save_password_notnow">ئێستا نا</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
   <string name="save_password_remember">وەبیرهاتنەوە</string>
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
   <string name="save_password_never">هەرگیز</string>
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
   <string name="open_permission_deny">تۆ ڕێگەت نیە بۆ چالاککردنی ئەم پەڕەیە.</string>
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
   <string name="text_copied">دەقەکە لەبەریگیرایەوە بۆ پارێزەر.</string>
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
   <string name="more_item_label">زیاتر</string>
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
   <string name="prepend_shortcut_label">پێڕست+</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
   <string name="menu_space_shortcut_label">بۆشایی</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <string name="menu_enter_shortcut_label">دانان</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">سڕینەوە</string>
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">گەڕان</string>
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_search">گەڕان</string>
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
   <string name="searchview_description_query">داوای گەڕان</string>
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_clear">پاکردنەوەی داوا</string>
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_submit">ناردنی داوا</string>
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_voice">گەڕانی دەنگی</string>
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
   <string name="enable_explore_by_touch_warning_title">چالاککردنی گەڕان بە دەستلێدان</string>
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
   <string name="enable_explore_by_touch_warning_message" product="tablet">
         <xliff:g id="accessibility_service_name">%1$s</xliff:g>بوێ تا لەلايەن دەست لێدان سەرنج بدات.
 
 كاتێك لەلايەن دەست لێدان بەكار دەخرێت، تۆ دەتوانن ببيستن يان باسكردنى دەبينن ئەوەى كەى لەژێر
 
 پەنجەت يان نيشانە ئەنجام دەدات تا لەگەڵ حەبەكە كار لە يەك بكەن.</string>
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
   <string name="enable_explore_by_touch_warning_message" product="default">
         <xliff:g id="accessibility_service_name">%1$s</xliff:g>بوێ تا لەلايەن دەست لێدان سەرنج بدات.
 
 كاتێك لەلايەن دەست لێدان بەكار دەخرێت، تۆ دەتوانن ببيستن يان باسكردنى دەبينن ئەوەى كەى لەژێر
 
 پەنجەت يان نيشانە ئەنجام دەدات تا لەگەڵ حەبەكە كار لە يەك بكەن.</string>
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
   <string name="oneMonthDurationPast">1 مانگ لەمەوپێش</string>
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
   <string name="beforeOneMonthDurationPast">لە پێش 1 مانگ لەمەپێش</string>
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
   <string name="last_month">مانگی دوایین</string>
+  <!-- This is used to express that something happened longer ago than the previous options -->
   <string name="older">بەتەمەنتر</string>
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
   <string name="preposition_for_date">لەسەر<xliff:g id="date" example="May 29">%s</xliff:g></string>
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
   <string name="preposition_for_time">لەسەر<xliff:g id="time" example="2:33 am">%s</xliff:g></string>
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
   <string name="preposition_for_year">لەناو<xliff:g id="year" example="2003">%s</xliff:g></string>
+  <!-- Appened to express the value is this unit of time: singular day -->
   <string name="day">رۆژ</string>
+  <!-- Appened to express the value is this unit of time: plural days -->
   <string name="days">رۆژەکان</string>
+  <!-- Appened to express the value is this unit of time: singular hour -->
   <string name="hour">کاژێر</string>
+  <!-- Appened to express the value is this unit of time: plural hours -->
   <string name="hours">کاژێرەکان</string>
+  <!-- Appened to express the value is this unit of time: singular minute -->
   <string name="minute">خولەک</string>
+  <!-- Appened to express the value is this unit of time: plural minutes -->
   <string name="minutes">خولەکەکان</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="second">چرکە</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="seconds">چرکەکان</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="week">هەفتە</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="weeks">هەفتەکان</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="year">ساڵ</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="years">ساڵەکان</string>
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
   <string name="VideoView_error_title">کێشەی ڤیدیۆ</string>
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
   <string name="VideoView_error_text_invalid_progressive_playback">ڤیدیۆکە لەکارە نیە لەسەر ئەم ئامێرە.</string>
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
   <string name="VideoView_error_text_unknown">ناتوانرێت ئەم ڤیدیۆیە لێدرێت</string>
+  <!-- Button to close error alert when a video cannot be played -->
   <string name="VideoView_error_button">باشه‌</string>
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
   <string name="relative_time">"<xliff:g id="date" example="4 hours ago">%1$s</xliff:g>, <xliff:g id="time" example="11:00 am">%2$s</xliff:g>"</string>
+  <!-- Quoted name for 12pm, lowercase -->
   <string name="noon">"نیوەڕۆ"</string>
+  <!-- Quoted name for 12pm, uppercase first letter -->
   <string name="Noon">"نیوەڕۆ"</string>
+  <!-- Quoted name for 12am, lowercase -->
   <string name="midnight">"نیوەشەو"</string>
+  <!-- Quoted name for 12am, uppercase first letter -->
   <string name="Midnight">"نیوەشەو"</string>
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
   <string name="elapsed_time_short_format_mm_ss"><xliff:g id="minutes" example="1">%1$02d</xliff:g>:<xliff:g id="seconds" example="23">%2$02d</xliff:g></string>
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
   <string name="elapsed_time_short_format_h_mm_ss"><xliff:g id="hours" example="1">%1$d</xliff:g>:<xliff:g id="minutes" example="43">%2$02d</xliff:g>:<xliff:g id="seconds" example="33">%3$02d</xliff:g></string>
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
   <string name="selectAll">دیاریکردنی هەموو</string>
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
   <string name="cut">بڕین</string>
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
   <string name="copy">لەبەرگرتنەوە</string>
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
   <string name="paste">لكاندن</string>
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
   <string name="replace">لەبریدانان\u2026</string>
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
   <string name="delete">سڕینه‌وه‌</string>
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
   <string name="copyUrl">لەبەرگرتنەوەURL</string>
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
   <string name="selectTextMode">هەڵبژاردنی دەق</string>
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
   <string name="textSelectionCABTitle">دەقی دیاریکراو</string>
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
   <string name="addToDictionary">زیادبکە بۆ فەرهەنگ</string>
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
   <string name="deleteText">سڕینه‌وه‌</string>
+  <!-- EditText context menu -->
   <string name="inputMethod">تێكردن ڕێگە</string>
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
   <string name="editTextMenuTitle">چالاکی دەق</string>
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
   <string name="low_internal_storage_view_title">بیرگەی بۆشایی خەریکە نامێنێت</string>
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
   <string name="low_internal_storage_view_text">هەمان کرداری سیستەم لەوانەیە ئیش نەکات</string>
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
   <string name="app_running_notification_title"><xliff:g id="app_name">%1$s</xliff:g>
         لە کارە</string>
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
   <string name="app_running_notification_text">دەستلێدان بۆ زانیاری زیاتر
 یان بەرنامەکە بوەستێنە.</string>
+  <!-- Preference framework strings. -->
   <string name="ok">باشه‌</string>
+  <!-- Preference framework strings. -->
   <string name="cancel">هەڵوەشاندنەوە</string>
+  <!-- Preference framework strings. -->
   <string name="yes">باشه‌</string>
+  <!-- Preference framework strings. -->
   <string name="no">هەڵوەشاندنەوە</string>
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
   <string name="dialog_alert_title">ئاگاداری</string>
+  <!-- Text shown by list fragment when waiting for data to display. -->
   <string name="loading">دامەزراندنی\u2026</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_on">چالاککردن</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_off">کووژاوە</string>
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
   <string name="whichApplication">تەواوکردنی بەکارهێنانی چالاکیەکە</string>
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
   <string name="alwaysUse">بەکارهێنانی بنەڕەت بۆ ئەم چالاکیە.</string>
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
   <string name="clearDefaultHintMsg">پاکردنەوەی بنەڕەت لە ڕێکخستنی سیستەم وgt; Apps وgt; دابەزی.</string>
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
   <string name="chooseActivity">چالاکیەک هەڵبژێرە</string>
+  <!-- title for the USB activity chooser. -->
   <string name="chooseUsbActivity">هەڵبژاردنی بەرنامەیک بۆ ئامێری USB</string>
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
   <string name="noApplications">‌هیچ بەرنامەیەک ناتوانێت ڕۆڵی ئەم چالاکیە ببینێت.</string>
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">بەداخەوە, <xliff:g id="application">%1$s</xliff:g>وەستا.</string>
+  <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">بەداخەوە پرۆسەکە <xliff:g id="process">%1$s</xliff:g> وەستا.</string>
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="بەرنامە">%2$s</xliff:g> وەڵام نادانتەوە.\n\nئەتەوێت دایخەیت?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_process">چالاکی<xliff:g id="activity">%1$s</xliff:g> وەڵام ناداتەوە.\n\nئەتەوێت دایخەیت?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_application_process"><xliff:g id="application">%1$s</xliff:g> وەڵام ناداتەوە ئەتەوێت دایخەیت?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_process">پرۆسەکە<xliff:g id="پرۆسەکە">%1$s</xliff:g>وەڵام نادرێتەوە .\n\nئەتەوێت دایخەیت?</string>
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
   <string name="force_close">باشه‌</string>
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
   <string name="report">ڕاپۆرت</string>
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
   <string name="wait">چاوەڕێ</string>
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
   <string name="webpage_unresponsive">ئەم پەڕەیە کارا نەماوە.\n\nئایا دەتەوێ دایبخەی؟</string>
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_title">بەرنامە گواسترایەوە</string>
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_replace"><xliff:g id="app_name">%1$s</xliff:g> ئێستا له‌کاره‌.</string>
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_original"><xliff:g id="app_name">%1$s</xliff:g> لە بنەڕەتدا دەستپێکرابوو.</string>
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
   <string name="screen_compat_mode_scale">پێوانە</string>
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
   <string name="screen_compat_mode_show">هەمیشە پیشانبدە</string>
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
   <string name="screen_compat_mode_hint">سەر لەنوێ ئەمە چالاک بکەوە لە ڕێکبەندەکانی سیستەم وgt; بەرنامەکان وgt; دابەزێندراوەکان.</string>
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
   <string name="smv_application">بەرنامەی <xliff:g id="application">%1$s</xliff:g>
         (ئەرکی <xliff:g id="process">%2$s</xliff:g>) بە شێوەی خۆسەپاو لە دۆخێکی دژواری پاراستن سەرپێچی کردووە.</string>
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
   <string name="smv_process">ئەرکی <xliff:g id="process">%1$s</xliff:g> has
       بە شێوەی خۆسەپاو لە دۆخێکی دژواری پاراستن سەرپێچی کردووە.</string>
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
   <string name="android_upgrading_title">ئەندرۆید لە نوێکاریدایە\u2026</string>
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
   <string name="android_upgrading_apk">باشینەسازی بەرنامە
         <xliff:g id="number" example="123">%1$d</xliff:g> ی
         <xliff:g id="number" example="123">%2$d</xliff:g>.</string>
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
   <string name="android_upgrading_starting_apps">دەستپێکردنی بەرنامەکان.</string>
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
   <string name="android_upgrading_complete">تەواوبوونی بووت.</string>
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
   <string name="heavy_weight_notification"><xliff:g id="app">%1$s</xliff:g> کارکردن</string>
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
   <string name="heavy_weight_notification_detail">لێدە بۆ گۆڕین بۆ بەرنامە</string>
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
   <string name="heavy_weight_switcher_title">گۆڕینی بەرنامەکان؟</string>
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
   <string name="heavy_weight_switcher_text">بەرنامەیەکی دیکە لە کارادایە
     کە ئەبێ بوەستێندرێت پێش ئەوەی کە دانەیەکی نوێ دەستپێبکەیت.</string>
   <string name="old_app_action">گەڕانەوە بۆ <xliff:g id="old_app">%1$s</xliff:g></string>
   <string name="old_app_description">بەرنامەی نوێ دەست پێ مەکە.</string>
   <string name="new_app_action">دەستپێکردنی <xliff:g id="old_app">%1$s</xliff:g></string>
   <string name="new_app_description">بەرنامە کۆنەکە بوەستێنە بێ پاشەکەوتکردن.</string>
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
   <string name="sendText">فرمانێک هەڵبژێرە بۆ نووسراوە</string>
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
   <string name="volume_ringtone">قەبارەی دەنگی زەنگ لێدەر</string>
+  <!-- Title of the dialog where the user is adjusting the music volume -->
   <string name="volume_music">ده‌نگی ڕاگه‌یێنه‌کان</string>
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
   <string name="volume_music_hint_playing_through_bluetooth">لێدان لەڕێگەی بلوتوسەوە</string>
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
   <string name="volume_music_hint_silent_ringtone_selected">دانانی زەنگی بێدەنگ دانرا</string>
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
   <string name="volume_call">دەنگی تەلەفۆنی هاتوو</string>
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
   <string name="volume_bluetooth_call">دەنگی تەلەفۆن لە ڕیگەی بلوتوسەوە</string>
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
   <string name="volume_alarm">ده‌نگی بیرخه‌ره‌وه‌</string>
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
   <string name="volume_notification">ده‌نگی تێبینی</string>
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
   <string name="volume_unknown">دەنگ</string>
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_bluetooth">ده‌نگی بلوتوس</string>
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_ringer">دەنگی زەنگ</string>
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_incall">دەنگی تەلەفۆن</string>
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_media">ده‌نگی ڕاگه‌یێنه‌کان</string>
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">ده‌نگی تێبینی</string>
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">زەنگی بنەڕەتی</string>
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <string name="ringtone_default_with_actual">زەنگی بنەڕەتی (<xliff:g id="actual_ringtone">%1$s</xliff:g>)</string>
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
   <string name="ringtone_silent">هیچ</string>
+  <!-- The title of the ringtone picker dialog. -->
   <string name="ringtone_picker_title">دەنگی زەنگ</string>
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
   <string name="ringtone_unknown">زەنگی نەناسراو</string>
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <plurals name="wifi_available">
+    <item quantity="one">Wi-Fi تۆڕ لەکارە</item>
+    <item quantity="other">Wi-Fi تۆڕ لەکارە</item>
+  </plurals>
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <plurals name="wifi_available_detailed">
+    <item quantity="one"> Wi-Fi تۆڕی کراوە لە کارە</item>
+    <item quantity="other"> Wi-Fi تۆڕەکانی کراوە لە کارە</item>
+  </plurals>
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
   <string name="network_available_sign_in_detailed"><xliff:g id="network_ssid">%1$s</xliff:g></string>
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
   <string name="wifi_watchdog_network_disabled">ناتوانرێت پەیوەستبکرێت بە Wi-Fiەوە</string>
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
   <string name="wifi_watchdog_network_disabled_detailed">هێڵی \u0020 ئینته‌رنێتێکی لاوازی هه‌یه‌.</string>
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
   <string name="wifi_p2p_dialog_title">Wi-Fi ڕاستەوخۆ</string>
   <string name="wifi_p2p_turnon_message">دەستپێکردنی Wi-Fi. ئەمە Wi-Fi /هۆتسپۆت ئەکوژێنێتەوە.</string>
   <string name="wifi_p2p_failed_message">ناتوانرێت Wi-Fi یەکسەر بکەوێتە کار.</string>
@@ -915,74 +1959,210 @@
   <string name="wifi_p2p_show_pin_message">PIN: </string>
   <string name="wifi_p2p_frequency_conflict_message" product="tablet">تابلێت بۆ ماوەی کاتی پەیوەندی Wi-Fi ئەپچڕێنێت کاتێک بەستراوەتەوە بە <xliff:g id="device_name">%1$s</xliff:g></string>
   <string name="wifi_p2p_frequency_conflict_message" product="default">تەلەفۆن بۆ ماوەی کاتی پەیوەندی Wi-Fi ئەپچڕێنێت کاتێک بەستراوەتەوە بە <xliff:g id="device_name">%1$s</xliff:g></string>
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">تێخستنی نووسە</string>
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">ناردنی کورتە نامە</string>
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_control_message">وlt;bوgt;<xliff:g id="app_name">%1$s</xliff:g>وlt;/bوgt; خەریکە ژمارەیەکی زۆر کورتە نامە دەنێرێت. ئایا دەتەوێت ڕێگە بەم بەرنامە بدەیت بۆ ناردنی کورتەنامەکان؟</string>
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_yes">رێدان</string>
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">نکوڵی</string>
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">وlt;bوgt;<xliff:g id="app_name">%1$s</xliff:g>وlt;/bوgt; داخوازی ناردنی کورتە نامەی بۆ وlt;bوgt;<xliff:g id="dest_address">%2$s</xliff:g>وlt;/bوgt;.</string>
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_allow">ناردن</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_deny">هەڵوەشاندنەوە</string>
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="sms_short_code_remember_choice">بیرم بهێنەوە هەڵبژاردەکەم</string>
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
   <string name="sms_short_code_remember_undo_instruction">ئەتوانی ئەمە دواتر بگۆڕیت لە ڕێکخستن\u00A0وgt;\u00A0Apps\"</string>
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_always_allow">هەمیشە ڕێگە بدە</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">هەرگیز ڕێگە مەدە</string>
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">سیمکارتەکە دەرکرا</string>
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
   <string name="sim_done_button">ئه‌نجام درا</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_added_title">سیمکارتەکە زیادکرا</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
   <string name="sim_restart_button">لەنۆکردنەوە</string>
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
   <string name="time_picker_dialog_title">دیاریکردنی کات</string>
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
   <string name="date_picker_dialog_title">دیاریکردنی ڕۆژ</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_set">دانان</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_done">کراو</string>
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
   <string name="perms_new_perm_prefix"><font size="12" fgcolor="#ff33b5e5">تازە: </font></string>
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
   <string name="perms_description_app">ئامادەکرا لەلایەن <xliff:g id="app_name">%1$s</xliff:g>.</string>
+  <!-- Shown for an application when it doesn't require any permission grants. -->
   <string name="no_permissions">هیچ یارمەتیەک داوانەکراوە</string>
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
   <string name="perm_costs_money">ئەمە پێ ئەچێت پارەت لێبسێنێت</string>
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
   <string name="usb_storage_activity_title">بارستەی USB بیرگە</string>
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
   <string name="usb_storage_title">USB په‌یوه‌ست کرا</string>
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_message" product="nosdcard">تۆ بەستراویتەوە بە کۆمپیوتەرەکەت بە USB. دوگمەی خوارەوە لێدە ئەگەر تۆ دەتەوێت فیلەکانت کۆپی بکەی لە نێوان کۆمپیوتەر و بیرگەی USB ئەندرۆیدەکەت.</string>
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_message" product="default">تۆ بەستراویتەوە بە کۆمپیوتەرەکەت بە USB. دوگمەی خوارەوە لێدە ئەگەر تۆ دەتەوێت فیلەکانت کۆپی بکەی لە نێوان کۆمپیوتەر و بیرگەی هەڵگرتنی ئەندرۆیدەکەت.</string>
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
   <string name="usb_storage_button_mount">هەڵکردنی بیرگه‌ی USB</string>
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_error_message" product="nosdcard">هەڵەیەک هەیە لە بەکار هێنانی بیرگەی USB بۆ بیرگه‌ی USB.</string>
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
   <string name="usb_storage_error_message" product="default">هەڵەیەک هەیە لە بەکار هێنانی بیرگەی هەڵگرتنی بۆ بیرگه‌ی USB.</string>
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
   <string name="usb_storage_notification_title">USB بەسترایەوە</string>
+  <!-- See USB_STORAGE. This is the message. -->
   <string name="usb_storage_notification_message">دەست لێدە بۆ کۆپی کردنی فایلەکان بۆ/لە ناو کۆمپیوتەرەکەتدا.</string>
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
   <string name="usb_storage_stop_notification_title">کوژاندنەوەی بیرگه‌ی USB</string>
+  <!-- See USB_STORAGE. This is the message. -->
   <string name="usb_storage_stop_notification_message">دەست لێدە بۆ کوژاندنەوەی بیرگه‌ی USB.</string>
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
   <string name="usb_storage_stop_title">بیرگەی USB لە کارادایە</string>
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_stop_message" product="nosdcard">پێش ئەوەی بیرگەی USB بکووژێنیتەوە، بیرگەی USB ئەندرۆیدەکەت لە ناو کۆمپیوتەرەکەت (\"بهێنەدەر\") دەربکێشە.</string>
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
   <string name="usb_storage_stop_message" product="default">پێش ئەوەی بیرگەی USB بکووژێنیتەوە، بیرگەی کارتی هەڵگرتنی ئەندرۆیدەکەت لە ناو کۆمپیوتەرەکەت (\"بهێنەدەر\") دەربکێشە.</string>
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
   <string name="usb_storage_stop_button_mount">کوژاندنەوەی کۆگای USB</string>
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
   <string name="usb_storage_stop_error_message">هەڵەیەک ڕوویدا کاتی کووژاندنەوەی بیرگه‌ی USB. بزانە بیرگەی USB و هەڵگرتنی دەرهێنراون، پاشان دووبارە هەوڵبدەوە.</string>
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
   <string name="dlg_confirm_kill_storage_users_title">هەڵکردنی کۆگای USB</string>
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
   <string name="dlg_confirm_kill_storage_users_text">ئەگەر بیرگه‌ی USB هەڵبکەیت، هەندێک بەرنامە کە لە ئێستادا بەکاریان ئەهێنی ئەوێستن و لەوە ئەچێ بەردەستیش نەبن تاکو بیرگه‌ی USB دەکوژێنیتەوە.</string>
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
   <string name="dlg_error_title">سەرکەوتو نەبوو USB فرمانی</string>
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
   <string name="dlg_ok">باشه‌</string>
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
   <string name="usb_accessory_notification_title">USB په‌یوه‌ست کرا وەک یاریدەدەری</string>
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
   <string name="adb_active_notification_title">‌هەڵەدۆزینەوەی USB بەستراوەتەوە</string>
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
   <string name="adb_active_notification_message">دەست لێدە بۆ ناچالاککردنی هەڵەدۆزینەوەی USB.</string>
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
   <string name="hardware">رەقەکاڵا</string>
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <string name="select_keyboard_layout_notification_title">چۆری تەختەکلیل دیاریبکە</string>
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <string name="select_keyboard_layout_notification_message">پەنجەی پێدا بنێ بۆ دیاریکردنی تەختەکلیل.</string>
   <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>دەستنیشانکراوەکان</u></string>
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
   <string name="ext_media_status_checking">پشکنین\u2026</string>
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
   <string name="activity_list_empty">هیچ چلاکییەکی لەیەک چوو نەدۆزرایەوە.</string>
-  <string name="permlab_route_media_output">ڕێپیشاندەری بەرهەمی میدیا بە</string>
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
   <string name="permdesc_route_media_output">ڕێگە بە بەرنامەیەک بدە تاکو ڕێپیشاندەری بەرهەمی میدیا بکات بۆ دیکەی ئامێرە دەرەکییەکان.</string>
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
   <string name="tutorial_double_tap_to_zoom_message_short">دووجار دەست لێدە بۆ چاودێری گەورەکردنەوە</string>
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
   <string name="gadget_host_error_inflating">ناتوانرێت کورتە وێنۆچک‌ زیادبکرێت.</string>
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
   <string name="ime_action_go">بڕۆ</string>
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
   <string name="ime_action_search">گه‌ڕان</string>
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
   <string name="ime_action_send">ناردن</string>
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
   <string name="ime_action_next">دواتر</string>
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
   <string name="ime_action_done">کراو</string>
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
   <string name="ime_action_previous">پێشوو</string>
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <string name="ime_action_default">بەجێهێنان</string>
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">ژمارە بگرە\nبە بەکارهێنانی <xliff:g id="number" example="555">%s</xliff:g></string>
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <string name="create_contact_using">دروستکردنی ناو\nبەهۆی <xliff:g id="number" example="555">%s</xliff:g></string>
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
   <string name="grant_credentials_permission_message_header">یەک یان چەند بەرنامەی ناوبراو داوای ڕێگەپێدان ئەکەن بۆ دەسی پێ گەیشتنی ئەژمێرەکەت، ئێستا و لە داهاتوودا.</string>
   <string name="grant_credentials_permission_message_footer">ئەتەوێ ڕێگە بدەیت بەم داواکارییە؟</string>
   <string name="grant_permissions_header_text">داواکردنی ڕێگەپێدان</string>
@@ -990,178 +2170,405 @@
   <string name="deny">نکۆڵی</string>
   <string name="permission_request_notification_title">داواکردنی مۆڵەت پێدان</string>
   <string name="permission_request_notification_with_subtitle">داواکردنی مۆڵەت پێدان \nfor account <xliff:g id="account" example="foo@gmail.com">%s</xliff:g>.</string>
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
   <string name="input_method_binding_label">شێوازی نوسین</string>
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
   <string name="sync_binding_label">هاوکاتکردن</string>
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
   <string name="accessibility_binding_label">توانای ده‌ستپێگه‌شتن</string>
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
   <string name="wallpaper_binding_label">وێنەی سەرشاشە</string>
+  <!-- Dialog title for user to select a different wallpaper from service list -->
   <string name="chooser_wallpaper">گۆڕینی دیوارپۆش</string>
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
   <string name="notification_listener_binding_label">گوێگری تێبینییەکان</string>
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
   <string name="vpn_title">VPN چالاکرا</string>
+  <!-- The title of the notification when VPN is active with an application name. -->
   <string name="vpn_title_long">VPN چالاکراو لەلایەن <xliff:g id="app" example="FooVPN client">%s</xliff:g></string>
+  <!-- The text of the notification when VPN is active. -->
   <string name="vpn_text">دەست لێدە بۆ بەڕێوەبردنی تۆڕەکە.</string>
+  <!-- The text of the notification when VPN is active with a session name. -->
   <string name="vpn_text_long">گرێدراوە بە <xliff:g id="session" example="office">%s</xliff:g>. دەست لێدە بۆ بەڕێوەبردنی تۆڕەکە.</string>
+  <!-- Notification title when connecting to lockdown VPN. -->
   <string name="vpn_lockdown_connecting">\"VPN\"ی هەردەم چالاک گرێدەدرێت\u2026</string>
+  <!-- Notification title when connected to lockdown VPN. -->
   <string name="vpn_lockdown_connected">\"VPN\"ی هەردەم چالاک گرێدرا</string>
+  <!-- Notification title when error connecting to lockdown VPN. -->
   <string name="vpn_lockdown_error">\"VPN\"ی هەردەم چالاک هەڵەی دا</string>
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
   <string name="vpn_lockdown_config">دەست لێدان بۆ سازدان</string>
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
   <string name="upload_file">هەڵبژاردنی پەڕگە</string>
+  <!-- Label for the file upload control when no file has been chosen yet -->
   <string name="no_file_chosen">هیچ فایلێک دەستنیشان نەکراوە</string>
+  <!-- Label for <input type="reset"> button in html -->
   <string name="reset">ڕێکخستنەوە</string>
+  <!-- Label for <input type="submit"> button in html -->
   <string name="submit">پێشکەشکردن</string>
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
   <string name="car_mode_disable_notification_title">دۆخی ئۆتۆمۆبیل چالاک کرا</string>
   <string name="car_mode_disable_notification_message">دەست لێدان بۆ ده‌رچوون لە دۆخی ئۆتۆمۆبیل.</string>
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
   <string name="tethered_notification_title">چالاککردن و به‌ستنه‌وه‌ی hotspot</string>
   <string name="tethered_notification_message">دەست لێدان بۆ جێگیركردن.</string>
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
   <string name="back_button_label">گەڕانەوە</string>
   <string name="next_button_label">دواتر</string>
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
   <string name="skip_button_label">تێپەڕاندن</string>
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
   <string name="no_matches">هیچ ئەنجامێک نیە</string>
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
   <string name="find_on_page">دۆزینەوە لە پەڕە</string>
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <plurals name="matches_found">
+    <!-- Case of one match -->
+    <item quantity="one">1 هاوتا</item>
+    <!-- Case of multiple total matches -->
+    <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> لە <xliff:g id="total" example="137">%d</xliff:g></item>
+  </plurals>
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
   <string name="action_mode_done">تەواو</string>
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
   <string name="progress_erasing" product="nosdcard">سڕینەوەی بیرگەیUSB\u2026</string>
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
   <string name="progress_erasing" product="default">سڕینەوەی بیرگەی دەرەکی\u2026</string>
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
   <string name="share">هاوبه‌شیکردن</string>
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
   <string name="find">دۆزینەوە</string>
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
   <string name="websearch">بەدواگەڕانی وێب</string>
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
   <string name="find_next">دۆزینەوەی داهاتوو</string>
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
   <string name="find_previous">دۆزینەوەی پێشوو</string>
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
   <string name="gpsNotifTicker">داواکردنی شوێن لە <xliff:g id="name">%s</xliff:g></string>
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
   <string name="gpsNotifTitle">داواکردنی شوێن</string>
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
   <string name="gpsNotifMessage">داواکراوە لەلایەن<xliff:g id="name">%1$s</xliff:g> (<xliff:g id="service" example="SUPL-service">%2$s</xliff:g>)</string>
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
   <string name="gpsVerifYes">بەڵێ</string>
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
   <string name="gpsVerifNo">نەخێر</string>
+  <!-- Error message when the sync tried to delete too many things -->
   <string name="sync_too_many_deletes">سڕینەوەی سنوور زیاد لە پێویست</string>
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
   <string name="sync_too_many_deletes_desc">بە ژماردە <xliff:g id="number_of_deleted_items">%1$d</xliff:g> بڕگەی سڕیاو هەیە بۆ <xliff:g id="type_of_sync">%2$s</xliff:g>, ئەژمێری <xliff:g id="account_name">%3$s</xliff:g>. دەتهەوێ چی بکەی؟</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
   <string name="sync_really_delete">سڕینەوەی بڕگەکان</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
   <string name="sync_undo_deletes">هه‌ڵوه‌شاندنه‌وەی سڕینەوەکان</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
   <string name="sync_do_nothing">هیچ مەکە بۆ ئێستا</string>
+  <!-- Choose Account Activity label -->
   <string name="choose_account_label">هەژمارێک هەڵبژێرە</string>
   <string name="add_account_label">"زیادکردنی هەژمار"</string>
+  <!-- List item to add an account [CHAR LIMIT=20] -->
   <string name="add_account_button_label">دانانی هەژمار</string>
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_button">زیادکردن</string>
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
   <string name="number_picker_decrement_button">کەمکردن</string>
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_scroll_mode"><xliff:g id="value" example="3">%s</xliff:g> دەستلێدە و بوەستە.</string>
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_scroll_action">لادان سەرۆ بۆ کەمکردن و بۆ خوارۆ بۆ زیادکردن.</string>
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_minute_button">زۆربوونی خولەک</string>
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_minute_button">کەمبوونەوەی خولەک</string>
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_hour_button">زۆربوونی کاژێر</string>
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_hour_button">کەمبوونەوەی کاژێر</string>
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_set_pm_button">دانای ئێوارە</string>
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_set_am_button">دانای بەیانی</string>
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_month_button">زۆربوونی مانگ</string>
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_month_button">کەمبوونەوەی مانگ</string>
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_day_button">زۆربوونی رۆژ</string>
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_day_button">کەمبوونەوەی رۆژ</string>
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_year_button">زۆربوونی ساڵ</string>
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_year_button">کەمبوونەوەی ساڵ</string>
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_alt">Alt</string>
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_cancel">پاشگەزبونەوە</string>
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">تاقیکردنەوەی ئەژمێر</string>
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_done">ئه‌نجام درا</string>
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_mode_change">گۆڕینی جۆر</string>
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_shift">شوێنگۆڕین</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_enter">دانان</string>
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
   <string name="activitychooserview_choose_application">داخستنی بەرنامەیەک</string>
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
   <string name="activitychooserview_choose_application_error">نەتوانرا دەستپێبکات <xliff:g id="application_name" example="Acme">%s</xliff:g></string>
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
   <string name="shareactionprovider_share_with">بەشداری لەگەڵ</string>
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
   <string name="shareactionprovider_share_with_application">بەشداری لەگەڵ <xliff:g id="application_name" example="Bluetooth">%s</xliff:g></string>
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="content_description_sliding_handle">"لادانی دەستی. دەستلێدانوamp; هەڵگرتن."</string>
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
   <string name="description_target_unlock_tablet">لایدە بۆ چالاککردن.</string>
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
   <string name="keyboard_headset_required_to_hear_password">بیستۆک ببەستەوە بۆ بیستنی دەنگی کلیلەکان کاتی نوسینی نهێنوشە.</string>
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
   <string name="keyboard_password_character_no_headset">خاڵ.</string>
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
   <string name="action_bar_home_description">بڕۆ بۆ ماڵەوە</string>
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
   <string name="action_bar_up_description">بڕۆ بۆ سەرەوە</string>
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
   <string name="action_menu_overflow_description">بەربژاردەی زیاتر</string>
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
   <string name="action_bar_home_description_format">%1$s, %2$s</string>
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
   <string name="action_bar_home_subtitle_description_format">%1$s, %2$s, %3$s</string>
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
   <string name="storage_internal">بیرگەی ناوەکی</string>
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
   <string name="storage_sd_card">بیرەگەی دەرەکی</string>
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
   <string name="storage_usb">هەڵگری USB</string>
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_warning_title">ئاگادارکردنەوەی بەکارهێنانی داتا</string>
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_warning_body">دەست لێدە بۆ بینینی بەکارهێنانەکان و ڕێکبەندەکان.</string>
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_3g_limit_snoozed_title">2G-3G زانیاری سنوردار به‌سه‌رچوو</string>
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_4g_limit_snoozed_title">زانیاری سنورداری 4G به‌سه‌رچوو</string>
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_wifi_limit_snoozed_title">Wi-Fi زانیاری سنور به‌سه‌رچو</string>
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_limit_snoozed_body"><xliff:g id="size" example="3.8GB">%s</xliff:g> سنورداری دیاریکراو.</string>
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
   <string name="data_usage_restricted_title">زانیاری پشتەگەڵاڵە سنوردارکرا</string>
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
   <string name="data_usage_restricted_body">دەستلێدان بۆ سڕینەوەی سنوردارکردن.</string>
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
   <string name="ssl_certificate">بڕوانامه‌ی پاراستن</string>
+  <!-- Message on an SSL Certificate dialog -->
   <string name="ssl_certificate_is_valid">بروانامەکە تەواو نیە.</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_to">بڵاوکراوە بۆ:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="common_name">ناوی هاوبەش:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="org_name">ڕێکخراو:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="org_unit">یه‌که‌ی ڕێکخراوی:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_by">بڵاوکراوە لەلایەن:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="validity_period">له‌کاره‌:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_on">ده‌رچوه‌ له‌:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="expires_on">بەسەردەچێ لە:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="serial_number">زنجیرە ژمارە:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="fingerprints">په‌نجه‌مۆر:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="sha256_fingerprint">SHA-256 په‌نجه‌مۆر:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="sha1_fingerprint">SHA-1 په‌نجه‌مۆر:</string>
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
   <string name="activity_chooser_view_see_all">هەموو ببينە</string>
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
   <string name="activity_chooser_view_dialog_title_default">هەڵبژاردنی چالاکی</string>
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
   <string name="share_action_provider_share_with">هاوبەشی بکە بە ناوی</string>
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
   <string name="list_delimeter">", "</string>
+  <!-- STK sending DTMF, SMS, USSD, SS -->
   <string name="sending">ناردن\u2026</string>
+  <!-- STK launch Browser -->
   <string name="launchBrowserDefault">چالاککردنی وێبگەر؟</string>
+  <!-- STK setup Call -->
   <string name="SetupCallDefault">پەیوەندی وەردەگرێت؟</string>
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_always">هەمیشە</string>
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_once">ته‌نیا یه‌کجار</string>
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="tablet">تابلێت</string>
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="default">مۆبایل</string>
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name_headphones">بیستۆک</string>
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name_dock_speakers">بڵندگۆی له‌نگه‌ر</string>
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
   <string name="default_media_route_name_hdmi">HDMI</string>
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
   <string name="default_audio_route_category_name">سیستەم</string>
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
   <string name="bluetooth_a2dp_audio_route_name">ده‌نگی بلوتوس</string>
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
   <string name="wireless_display_route_description">نیشاندانی وایه‌رلێسی</string>
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
   <string name="media_route_chooser_title">په‌یوه‌ندی کردن به‌ ئامێر</string>
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
   <string name="media_route_chooser_title_for_remote_display">ڕێگه‌گرتنی ڕوونما بۆ ئامێر</string>
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
   <string name="media_route_chooser_searching">گه‌ڕان به‌دوای ئامێر\u2026</string>
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
   <string name="media_route_chooser_extended_settings">ڕێکخستنه‌کان</string>
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
   <string name="media_route_controller_disconnect">په‌یوه‌ندی پچڕان</string>
+  <!-- Status message for remote routes attempting to scan/determine availability -->
   <string name="media_route_status_scanning">پشکنین...</string>
+  <!-- Status message for a remote route attempting to connect -->
   <string name="media_route_status_connecting">په‌یوه‌ندیكردن...</string>
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
   <string name="media_route_status_available">ئاماده‌</string>
+  <!-- Status message for remote routes that are not available for connection right now -->
   <string name="media_route_status_not_available">ئاماده‌ نیه‌</string>
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
   <string name="media_route_status_in_use">سەرقاڵە</string>
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
   <string name="display_manager_built_in_display_name">دروست کراو-لە شاشە</string>
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
   <string name="display_manager_hdmi_display_name">شاشەی HDMI</string>
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
   <string name="display_manager_overlay_display_name">دادەپۆشى #<xliff:g id="id">%1$d</xliff:g></string>
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
   <string name="display_manager_overlay_display_title"><xliff:g id="name">%1$s</xliff:g>: <xliff:g id="width">%2$d</xliff:g>x<xliff:g id="height">%3$d</xliff:g>, <xliff:g id="dpi">%4$d</xliff:g> dpi</string>
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
   <string name="display_manager_overlay_display_secure_suffix">, پارێزراو</string>
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">بیرچونی کێشانەکە</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">کێشان هەڵە</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">تێپەڕەوشەی هەڵە</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">PIN هەڵەیە</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown">دوبارە هەوڵبدەرەوە <xliff:g id="number">%1$d</xliff:g> چرکە.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">قوفڵی کێشان بکێشە</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">دانانی کۆدی سیمکارت</string>
+  <!-- Instructions for using the PIN unlock screen -->
   <string name="kg_pin_instructions">PIN بنوسە</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">نهێنوشە بنوسە</string>
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint">سیمکارتەکە لە کارکەوتوە ئێستا.PUK لێ بدە بۆ بەردەوام بوون. بۆ وردەکاری زیاتر پەیوەندی بکە بە ئۆپەراتۆر.</string>
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
   <string name="kg_puk_enter_pin_hint">کۆدێکی PIN بەخواستی خۆت دابنێ</string>
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
   <string name="kg_enter_confirm_pin_hint">کۆدی PIN دوپاتکەرەوە</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">کردنەوەی سیمکارت\u2026</string>
+  <!-- Message shown when the user enters the wrong PIN code -->
   <string name="kg_password_wrong_pin_code">کۆدی PIN ناڕاستە.</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">(PIN)ەک بنووسه‌ که‌ ٤ بۆ ٨ ژماره‌ بێت.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">دوبارە کۆدی PUK دروست تێبنووسەوە. هەوڵدانە دوبارەکراوەکان بۆ هەمیشە سیمکارتەکەت لاچالاک ئەکات.</string>
+  <!-- String shown in PUK screen when PIN codes don't match -->
   <string name="kg_invalid_confirm_pin_hint" product="default">کۆدەکانی PIN لە یەکتر ناچن</string>
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
   <string name="kg_login_too_many_attempts">هەوڵی کێشانی ئێجگار زۆری شێوەئاسا</string>
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
   <string name="kg_login_instructions">بۆ کردنەوە، بە هەژماری گوگڵ بچۆ ژووره‌وه‌.</string>
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_username_hint">ناوی بەکارهێنەر (ئیمەیڵ)</string>
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_password_hint">تێپەڕەوشە</string>
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
   <string name="kg_login_submit_button">چوونەژوورەوە</string>
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
   <string name="kg_login_invalid_input">ناو یان تێپه‌ڕوشه‌ ڕاست نییه‌.</string>
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
   <string name="kg_login_account_recovery_hint">ناو یان تێپەڕەوشەت لە بیرچووە\?\nVisit <b>google.com/accounts/recovery</b>.</string>
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
   <string name="kg_login_checking_password">تاقیکردنەوەی ئەژمێر\u2026</string>
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
   <string name="kg_too_many_failed_pin_attempts_dialog_message">
         بە هەڵە <xliff:g id="number">%d</xliff:g> جار PIN ت نووسیوە.
         \n\nله‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا سەرلەنوێ هەوڵبدەوە.
     
     .
     </string>
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
   <string name="kg_too_many_failed_password_attempts_dialog_message">
         بەهەڵە <xliff:g id="number">%d</xliff:g> جار تێپەڕەوشەت لێداوە.
         \n\nله‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا سەرلەنوێ هەوڵبدەوە.
@@ -1172,6 +2579,7 @@
         تۆ بە ناڕاست <xliff:g id="number">%d</xliff:g> جار چنراوی کردنەوەت کێشاوە.
         \n\nلە <xliff:g id="number">%d</xliff:g> چرکەدا سەرلەنوێ هەوڵبدەوە.
     </string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="tablet">
        تۆ بە ناڕاست <xliff:g id="number">%d</xliff:g> times جار هەوڵی کردنەوەی تابلێته‌که‌ت داوە.
        پاش <xliff:g id="number">%d</xliff:g> هه‌وڵی سه‌رنه‌که‌وتووی زیاتر،
@@ -1180,6 +2588,8 @@
          
     .
     </string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="default">
        تۆ بە ناڕاست <xliff:g id="number">%d</xliff:g> times جار هەوڵی کردنەوەی مۆبایلەکەت داوە.
        پاش <xliff:g id="number">%d</xliff:g> هه‌وڵی سه‌رنه‌که‌وتووی زیاتر،
@@ -1188,135 +2598,345 @@
          
     .
     </string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="tablet">
        تۆ بە ناڕاست <xliff:g id="number">%d</xliff:g> جار هەوڵی کردنەوەی تابلێتەکەت داوە.
        تابلێتەکە ڕێکدەسرێتەوە بۆ بنەڕەتی کارگە.
     </string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="default">
        تۆ بە ناڕاست <xliff:g id="number">%d</xliff:g> جار هەوڵی کردنەوەی مۆبایلەکەت داوە.
        مۆبایلەکە ڕێکدەسرێتەوە بۆ بنەڕەتی کارگە.
     </string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tablet">
        تۆ بەهەڵە شیوازی کردنەوەت <xliff:g id="number">%d</xliff:g> جار کێشاوە.
        دوای <xliff:g id="number">%d</xliff:g> جاری دیکە هەوڵدانی هەڵە,
        داوای ئەژمێری ئیمێڵەکەت لێئەکرێت بۆ کردنەوەی تابلێتەکەت.\n\n
        دوبارە هەوڵبدەوە لە <xliff:g id="number">%d</xliff:g> چرکەی دیکەدا.
     </string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="default">
        تۆ بەهەڵە شیوازی کردنەوەت <xliff:g id="number">%d</xliff:g> جار کێشاوە.
        دوای <xliff:g id="number">%d</xliff:g> جاری دیکە هەوڵدانی هەڵە,
        داوای ئەژمێری ئیمێڵەکەت لێئەکرێت بۆ کردنەوەی مۆبایلەکەت.\n\n
        دوبارە هەوڵبدەوە لە <xliff:g id="number">%d</xliff:g> چرکەی دیکەدا.
     </string>
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
   <string name="kg_text_message_separator" product="default">" \u2014 "</string>
+  <!-- The delete-widget drop target button text -->
   <string name="kg_reordering_delete_drop_target_text">سڕینەوە</string>
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
   <string name="continue_to_enable_accessibility">دو قامکت ڕاگرە لەکاتی کێشان بۆ خوارەوە بۆ چالاککردنی خزمەتگوزاری بەئاسانی بەدەست گەیشتن.</string>
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
   <string name="accessibility_enabled">خزمەتگوزاری بەئاسانی بەدەست گەیشتن چالاککرا.</string>
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
   <string name="enable_accessibility_canceled">توانای ده‌ستپێگه‌شتن پاشگەزبووەوە.</string>
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
   <string name="user_switched">بەکارهێنەری ئێستا <xliff:g id="name" example="Bob">%1$s</xliff:g>.</string>
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
   <string name="owner_name" msgid="3879126011135546571">خاوەن</string>
+  <!-- Error message title [CHAR LIMIT=35] -->
   <string name="error_message_title">هەڵە</string>
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
   <string name="app_not_found">هیچ نەرمەواڵایەک نەدۆزرایەوە تاکو ئەم کردارە لەخۆ بگرێت</string>
   <string name="revoke">‌هەڵوەشاندنەوه</string>
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
   <string name="mediasize_iso_a0">ISO A0</string>
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
   <string name="mediasize_iso_a1">ISO A1</string>
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
   <string name="mediasize_iso_a2">ISO A2</string>
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
   <string name="mediasize_iso_a3">ISO A3</string>
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
   <string name="mediasize_iso_a4">ISO A4</string>
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
   <string name="mediasize_iso_a5">ISO A5</string>
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
   <string name="mediasize_iso_a6">ISO A6</string>
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
   <string name="mediasize_iso_a7">ISO A7</string>
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
   <string name="mediasize_iso_a8">ISO A8</string>
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
   <string name="mediasize_iso_a9">ISO A9</string>
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
   <string name="mediasize_iso_a10">ISO A10</string>
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
   <string name="mediasize_iso_b0">ISO B0</string>
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
   <string name="mediasize_iso_b1">ISO B1</string>
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
   <string name="mediasize_iso_b2">ISO B2</string>
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
   <string name="mediasize_iso_b3">ISO B3</string>
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
   <string name="mediasize_iso_b4">ISO B4</string>
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
   <string name="mediasize_iso_b5">ISO B5</string>
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
   <string name="mediasize_iso_b6">ISO B6</string>
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
   <string name="mediasize_iso_b7">ISO B7</string>
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
   <string name="mediasize_iso_b8">ISO B8</string>
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
   <string name="mediasize_iso_b9">ISO B9</string>
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
   <string name="mediasize_iso_b10">ISO B10</string>
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
   <string name="mediasize_iso_c0">ISO C0</string>
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
   <string name="mediasize_iso_c1">ISO C1</string>
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
   <string name="mediasize_iso_c2">ISO C2</string>
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
   <string name="mediasize_iso_c3">ISO C3</string>
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
   <string name="mediasize_iso_c4">ISO C4</string>
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
   <string name="mediasize_iso_c5">ISO C5</string>
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
   <string name="mediasize_iso_c6">ISO C6</string>
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
   <string name="mediasize_iso_c7">ISO C7</string>
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
   <string name="mediasize_iso_c8">ISO C8</string>
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
   <string name="mediasize_iso_c9">ISO C9</string>
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
   <string name="mediasize_iso_c10">ISO C10</string>
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
   <string name="mediasize_na_letter">نامە</string>
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
   <string name="mediasize_na_gvrnmt_letter">نامەی حکومی</string>
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
   <string name="mediasize_na_legal">یاسا</string>
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
   <string name="mediasize_na_junior_legal">یاسایی پەیوەند</string>
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
   <string name="mediasize_na_ledger">دەفتەری تێبینی</string>
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
   <string name="mediasize_na_tabloid">پڕوێنە</string>
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
   <string name="mediasize_na_index_3x5">Index Card 3x5</string>
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
   <string name="mediasize_na_index_4x6">Index Card 4x6</string>
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
   <string name="mediasize_na_index_5x8">Index Card 5x8</string>
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
   <string name="mediasize_na_monarch">Monarch</string>
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
   <string name="mediasize_na_quarto">Quarto</string>
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
   <string name="mediasize_na_foolscap">Foolscap</string>
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
   <string name="mediasize_chinese_roc_8k">ROC 8K</string>
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
   <string name="mediasize_chinese_roc_16k">ROC 16K</string>
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
   <string name="mediasize_chinese_prc_1">PRC 1</string>
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
   <string name="mediasize_chinese_prc_2">PRC 2</string>
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
   <string name="mediasize_chinese_prc_3">PRC 3</string>
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
   <string name="mediasize_chinese_prc_4">PRC 4</string>
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
   <string name="mediasize_chinese_prc_5">PRC 5</string>
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
   <string name="mediasize_chinese_prc_6">PRC 6</string>
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
   <string name="mediasize_chinese_prc_7">PRC 7</string>
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
   <string name="mediasize_chinese_prc_8">PRC 8</string>
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
   <string name="mediasize_chinese_prc_9">PRC 9</string>
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
   <string name="mediasize_chinese_prc_10">PRC 10</string>
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_prc_16k">PRC 16K</string>
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_om_pa_kai">Pa Kai</string>
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_dai_pa_kai">Dai Pa Kai</string>
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_jurro_ku_kai">Jurro Ku Kai</string>
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
   <string name="mediasize_japanese_jis_b10">JIS B10</string>
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
   <string name="mediasize_japanese_jis_b9">JIS B9</string>
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
   <string name="mediasize_japanese_jis_b8">JIS B8</string>
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
   <string name="mediasize_japanese_jis_b7">JIS B7</string>
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
   <string name="mediasize_japanese_jis_b6">JIS B6</string>
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
   <string name="mediasize_japanese_jis_b5">JIS B5</string>
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
   <string name="mediasize_japanese_jis_b4">JIS B4</string>
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
   <string name="mediasize_japanese_jis_b3">JIS B3</string>
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
   <string name="mediasize_japanese_jis_b2">JIS B2</string>
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
   <string name="mediasize_japanese_jis_b1">JIS B1</string>
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
   <string name="mediasize_japanese_jis_b0">JIS B0</string>
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
   <string name="mediasize_japanese_jis_exec">JIS Exec</string>
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
   <string name="mediasize_japanese_chou4">Chou4</string>
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
   <string name="mediasize_japanese_chou3">Chou3</string>
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
   <string name="mediasize_japanese_chou2">Chou2</string>
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
   <string name="mediasize_japanese_hagaki">Hagaki </string>
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
   <string name="mediasize_japanese_oufuku">Oufuku </string>
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
   <string name="mediasize_japanese_kahu">Kahu</string>
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
   <string name="mediasize_japanese_kaku2">Kaku2</string>
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
   <string name="mediasize_japanese_you4">You4</string>
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
   <string name="mediasize_unknown_portrait">روخسار نەناسراو</string>
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
   <string name="mediasize_unknown_landscape">شێوە ئاسۆی نەناسراو</string>
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
   <string name="write_fail_reason_cancelled">پاشگەزبووەوە</string>
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
   <string name="write_fail_reason_cannot_write">هەڵە لە نووسینی ناوەڕۆک</string>
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
   <string name="reason_unknown">نەناسراو</string>
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
   <string name="reason_service_unavailable">خزمەتگوزاری چاپکەر نا چالاکە</string>
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
   <string name="print_service_installed_title"><xliff:g id="name" example="Cloud Print">%s</xliff:g> خزمەتگوزاری دامەزرا</string>
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
   <string name="print_service_installed_message">لێدان بۆ چالاککردن</string>
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_admin_pin">PIN ‌بەڕێوەبەرێكى ئامراز بنووسە</string>
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_pin">PIN بنووسە</string>
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
   <string name="restr_pin_incorrect">نادرووست</string>
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_old_pin">PIN هەنووکە</string>
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_new_pin">PIN نوێ</string>
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
   <string name="restr_pin_confirm_pin">پشتڕاستکردنەوەی PIN نوێ</string>
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
   <string name="restr_pin_create_pin">PIN دروست بکە بۆ گۆڕینی بەسترانەوەکان</string>
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
   <string name="restr_pin_error_doesnt_match">PIN ناگونجێت. دوبارە هەوڵبدەرەوە.</string>
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
   <string name="restr_pin_error_too_short">PIN زۆر کورتە. ئەبێ لانیکەم 4 ژمارە بێت.</string>
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <plurals name="restr_pin_countdown">
+    <item quantity="one">دوبارە هەوڵبدەرەوە لە 1 چرکەی تر</item>
+    <item quantity="other">دوبارە هەوڵبدەرەوە  لە <xliff:g id="count">%d</xliff:g> چرکەکان</item>
+  </plurals>
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
   <string name="restr_pin_try_later">دواتر دووبارە هەوڵبدە</string>
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
   <string name="zen_mode_feature_name">مەمشێوێنە</string>
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
   <string name="floating_toolbar_open_overflow_description">بەربژاردەی زیاتر</string>
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
 </resources>
diff --git a/core/res/res/values-ky-rKG/cm_strings.xml b/core/res/res/values-ky-rKG/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-ky-rKG/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-lb/cm_strings.xml b/core/res/res/values-lb/cm_strings.xml
index 5e8dbdf..79c1206 100644
--- a/core/res/res/values-lb/cm_strings.xml
+++ b/core/res/res/values-lb/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Schiermfoto</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">Geschützten SMSen empfänken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Erlaabt der App, erakommend geschützten SMS z\'empfänken.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">Lëscht vun de geschützten SMSen änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Erlaabt der App, d\'Lëscht vun de geschützten SMS-Adressen z\'änneren.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sécherheet</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Berechtegungen déi mat der Sécherheet vum Apparat ze dinn hunn.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">Schwaarz Lëscht ausliesen</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Erlaabt der App, Informatiounen iwwer blockéiert Telefonsnummere fir erakommend Uriff oder Messagen ze liesen.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">Schwaarz Lëscht änneren</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Erlaabt der App, d\'blockéiert Telefonsnummere fir erakommend Uriff oder Messagen z\'änneren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Hannergrondbild vum Spärschierm setzen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Erlaabt der App, d\'Hannergrondbild vum Spärschierm z\'änneren.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Nei starten</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Aktuell</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Nei starten</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recuperatioun</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Eroflueden</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Séieren Neistart</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Nei starten</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Däin Tablet gëtt nei gestart.</string>
   <string name="reboot_confirm" product="default">Däin Telefon gëtt nei gestart.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Gëtt nei gestart\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">App zougemaach</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB iwwer Netzwierk aktivéiert</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB iwwer USB an Netzwierk aktivéiert</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Drécke fir Debugging ze desaktivéieren.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB: <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB an Netzwierk</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Netzwierk</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">App-Start offänken</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s ass net installéiert</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritéit</string>
   <string name="silent_mode_none">Keen</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">WLAN-Zougrëffspunkt gouf opgrond vun Ännerunge am SIM-Abonnement desaktivéiert</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">WLAN ausschalten</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Privatsphärschutz aktivéieren oder desaktivéieren</string>
   <string name="permdesc_changePrivacyGuardState">Erlaabt der App, z\'änneren ob eng aner App mam Privatsphärschutz leeft. Wann eng App mam Privatsphärschutz leeft, huet se keen Accès op perséinlech Date wéi Kontakter, Uruffprotokoller oder Messagen.</string>
   <string name="privacy_guard_notification">Privatsphärschutz aktiv</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> huet keen Accès op perséinlech Daten</string>
   <string name="privacy_guard_dialog_title">Privatsphärschutz</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> wëll <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Mäi Choix verhalen</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">op d\'Kamera zougräifen</string>
   <string name="app_ops_access_location">op de Standuert zougräifen</string>
   <string name="app_ops_access_notifications">op d\'Notifikatiounen zougräifen</string>
@@ -97,6 +135,7 @@
   <string name="app_ops_start_at_bootup">automatesch starten</string>
   <string name="app_ops_toast_window">Kuerzzäit-Notifikatiounen uweisen</string>
   <string name="app_ops_toggle_bluetooth">Bluetooth un-/ausschalten</string>
+  <string name="app_ops_toggle_mobile_data">Mobil Daten un-/ausschalten</string>
   <string name="app_ops_toggle_nfc">NFC un-/ausschalten</string>
   <string name="app_ops_toggle_wifi">WLAN un-/ausschalten</string>
   <string name="app_ops_use_alarm_volume">d\'Lautstäerkt vum Wecker änneren</string>
@@ -111,20 +150,44 @@
   <string name="app_ops_use_voice_volume">d\'Sproochlautstäerkt änneren</string>
   <string name="app_ops_write_mms">eng MMS schreiwen</string>
   <string name="app_ops_write_sms">eng SMS schreiwen</string>
+  <string name="app_ops_use_fingerprint">Fangerofdrock benotzen</string>
+  <string name="app_ops_add_voicemail">eng Sproochnoriicht bäisetzen</string>
+  <string name="app_ops_read_phone_state">op Telefon-Status zougräifen</string>
+  <string name="app_ops_scan_wifi">WLAN-Netzwierker scannen</string>
+  <string name="app_ops_change_wallpaper">Hannergrondbild änneren</string>
+  <string name="app_ops_assist_structure">Ënnerstëtzungsstruktur benotzen</string>
+  <string name="app_ops_assist_screenshot">Schiermfoto maachen</string>
+  <string name="app_ops_use_body_sensors">Kierpersensore benotzen</string>
+  <string name="app_ops_read_cell_broadcasts">Cell-Broadcasts liesen</string>
+  <string name="app_ops_mock_location">Standuert simuléieren</string>
+  <string name="app_ops_read_external_storage">externe Späicher ausliesen</string>
+  <string name="app_ops_write_external_storage">op externe Späicher schreiwen</string>
+  <string name="app_ops_turn_on_screen">Schierm uschalten</string>
+  <string name="app_ops_get_accounts">Konte vum Apparat opruffen</string>
+  <string name="app_ops_wifi_change">WLAN-Status änneren</string>
   <string name="app_ops_su">Root-Accès kréien</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Fir dëse Schierm lasszeléisen, dréck den Zréck-Knäppchen an hal e gedréckt.</string>
-  <string name="live_display_auto">Automatesch</string>
-  <string name="live_display_auto_summary">Faarftemperatur automatesch dem Sonnenënnergank a Sonnenopgank upassen</string>
-  <string name="live_display_off">Aus</string>
-  <string name="live_display_off_summary">All Upassungen desaktivéieren</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Just Dagesmodus benotzen</string>
-  <string name="live_display_night">Nuecht</string>
-  <string name="live_display_night_summary">Just Nuetsmodus benotzen</string>
-  <string name="live_display_outdoor">Baussen (hell Sonn)</string>
-  <string name="live_display_outdoor_summary">Just Baussemodus benotzen</string>
-  <string name="live_display_hint">LiveDisplay ka géint Iwwerustrengung vun den Aen a beim Schlofen an der Nuecht hëllefen. Dréck hei, fir et auszeprobéieren!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Kee connectéierten Apparat</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> connectéierten Apparat</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> connectéiert Apparater</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Start vun der Aktivitéit blockéiert</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> ass vum Starten ofgehale ginn. Klick, fir d\'App ze authentifizéieren an nei ze starten.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Akku ganz opgelueden</string>
+  <string name="notify_battery_fully_charged_text">Stecker aus dem Apparat zéien, fir d\'Liewensdauer vum Akku ze verlängeren.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">Akkustatistiken zrécksetzen</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Erlaabt enger App, den Detail vun der Akkubenotzung zréckzesetzen.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">D\'SIM-Kaarte goufe gewiesselt</string>
+  <string name="uicc_hot_swapped_event_text">Dréck, fir d\'Standardastellunge fir d\'SIM-Kaart festzeleeën</string>
 </resources>
diff --git a/core/res/res/values-lb/strings.xml b/core/res/res/values-lb/strings.xml
index 9122965..f89fc67 100644
--- a/core/res/res/values-lb/strings.xml
+++ b/core/res/res/values-lb/strings.xml
@@ -19,56 +19,122 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
   <string name="byteShort">B</string>
+  <!-- Suffix added to a number to signify size in kilobytes. -->
   <string name="kilobyteShort">kB</string>
+  <!-- Suffix added to a number to signify size in megabytes. -->
   <string name="megabyteShort">MB</string>
+  <!-- Suffix added to a number to signify size in gigabytes. -->
   <string name="gigabyteShort">GB</string>
+  <!-- Suffix added to a number to signify size in terabytes. -->
   <string name="terabyteShort">TB</string>
+  <!-- Suffix added to a number to signify size in petabytes. -->
   <string name="petabyteShort">PB</string>
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
   <string name="durationDays"><xliff:g id="days">%1$d</xliff:g> Deeg</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
   <string name="durationDayHours"><xliff:g id="days">%1$d</xliff:g> Dag <xliff:g id="hours">%2$d</xliff:g> St.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
   <string name="durationDayHour"><xliff:g id="days">%1$d</xliff:g> Dag <xliff:g id="hours">%2$d</xliff:g> St.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
   <string name="durationHours"><xliff:g id="hours">%1$d</xliff:g> St.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
   <string name="durationHourMinutes"><xliff:g id="hours">%1$d</xliff:g> St. <xliff:g id="minutes">%2$d</xliff:g> Min.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
   <string name="durationHourMinute"><xliff:g id="hours">%1$d</xliff:g> St. <xliff:g id="minutes">%2$d</xliff:g> Min.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
   <string name="durationMinutes"><xliff:g id="minutes">%1$d</xliff:g> Min.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
   <string name="durationMinute"><xliff:g id="minutes">%1$d</xliff:g> Min.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
   <string name="durationMinuteSeconds"><xliff:g id="minutes">%1$d</xliff:g> Min. <xliff:g id="seconds">%2$d</xliff:g> Sek.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
   <string name="durationMinuteSecond"><xliff:g id="minutes">%1$d</xliff:g> Min. <xliff:g id="seconds">%2$d</xliff:g> Sek.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
   <string name="durationSeconds"><xliff:g id="seconds">%1$d</xliff:g> Sek.</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
   <string name="durationSecond"><xliff:g id="seconds">%1$d</xliff:g> Sek.</string>
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
   <string name="untitled">&lt;Ouni Titel&gt;</string>
+  <!-- How to display the lack of a phone number -->
   <string name="emptyPhoneNumber">(Keng Telefonsnummer)</string>
+  <!-- How to display the lack of a name -->
   <string name="unknownName">Onbekannt</string>
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <string name="defaultVoiceMailAlphaTag">Sproochopnam</string>
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">Connectiounsproblem oder ongëltegen MMI-Code.</string>
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
   <string name="mmiFdnError">De Virgank ass just fir deng zougeloosse Ruffnummer méiglech.</string>
+  <!-- Displayed when a phone feature such as call barring was activated. -->
   <string name="serviceEnabled">Service gouf aktivéiert.</string>
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
   <string name="serviceEnabledFor">Service gouf aktivéiert fir:</string>
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
   <string name="serviceDisabled">Service gouf desaktivéiert.</string>
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
   <string name="serviceRegistered">Registréierung war erfollegräich.</string>
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
   <string name="serviceErased">Ausläsche war erfollegräich.</string>
+  <!-- Displayed when a SIM password was entered incorrectly. -->
   <string name="passwordIncorrect">Inkorrekt Passwuert.</string>
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
   <string name="mmiComplete">MMI komplett.</string>
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
   <string name="badPin">Déi al PIN, déi s du aginn hues, ass net korrekt.</string>
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
   <string name="badPuk">De PUK, deen s du aginn hues, ass net korrekt.</string>
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
   <string name="mismatchPin">D\'PINen, déi s du aginn hues, stëmmen net iwwereneen.</string>
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
   <string name="invalidPin">Gëff e PIN an, deen tëscht 4 an 8 Zifferen huet.</string>
+  <!-- Displayed when a SIM PUK password is too short. -->
   <string name="invalidPuk">Gëff e PUK an, deen 8 oder méi Zifferen huet.</string>
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
   <string name="needPuk">Deng SIM-Kaart ass PUK-gespaart. Gëff de PUK-Code an, fir en z\'entspären.</string>
   <string name="needPuk2">Gëff de PUK2 vun der SIM-Kaart an, fir se z\'entspären.</string>
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
   <string name="enablePin">Feeler. Aktivéier d\'SIM-/RUIM-Spär.</string>
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <plurals name="pinpuk_attempts">
+    <item quantity="one">Du hues nach <xliff:g id="number">%d</xliff:g> Versuch iwwreg ier deng SIM gespaart ass.</item>
+    <item quantity="other">Du hues nach <xliff:g id="number">%d</xliff:g> Versich iwwreg ier deng SIM gespaart ass.</item>
+  </plurals>
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
   <string name="imei">IMEI</string>
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
   <string name="meid">MEID</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
   <string name="ClipMmi">Erakommend Uruffer-ID</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
   <string name="ClirMmi">Erausgoend Uruffer-ID</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
   <string name="ColpMmi">ID vun der verbonnener Leitung</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
   <string name="ColrMmi">Aschränkunge fir d\'ID vun der verbonnener Leitung</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
   <string name="CfMmi">Gespréich-Weiderleedung</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
   <string name="CwMmi">Gespréich pauséiert</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
   <string name="BaMmi">Uruffspär</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
   <string name="PwdMmi">Passwuert-Ännerung</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
   <string name="PinMmi">PIN-Ännerung</string>
   <string name="CnipMmi">Ruffnummer disponibel</string>
   <string name="CnirMmi">Rufnummer begrenzt</string>
@@ -76,33 +142,60 @@
   <string name="RuacMmi">Refus vun onerwënschten Uriff</string>
   <string name="CndMmi">Iwwermëttlung fir Ruffnummeren</string>
   <string name="DndMmi">Net stéieren</string>
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
   <string name="CLIRDefaultOnNextCallOn">D\'Uruffer-ID ass standardméisseg ageschränkt. Nächsten Uruff: Ageschränkt</string>
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
   <string name="CLIRDefaultOnNextCallOff">D\'Uruffer-ID ass standardméisseg ageschränkt. Nächsten Uruff: Net ageschränkt</string>
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
   <string name="CLIRDefaultOffNextCallOn">D\'Uruffer-ID ass standardméisseg net ageschränkt. Nächsten Uruff: Ageschränkt</string>
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
   <string name="CLIRDefaultOffNextCallOff">D\'Uruffer-ID ass standardméisseg net ageschränkt. Nächsten Uruff: Net ageschränkt</string>
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
   <string name="serviceNotProvisioned">Service net ageriicht.</string>
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
   <string name="CLIRPermanent">D\'Astellung fir d\'Uruffer-ID kann net geännert ginn.</string>
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
   <string name="RestrictedChangedTitle">Begrenzten Zougrëff geännert</string>
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
   <string name="RestrictedOnData">Dateservice ass gespaart.</string>
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
   <string name="RestrictedOnEmergency">Noutruff ass gespaart.</string>
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
   <string name="RestrictedOnNormal">Sproochservice ass gespaart.</string>
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
   <string name="RestrictedOnAllVoice">All Stëmmservicer si gespaart.</string>
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
   <string name="RestrictedOnSms">SMS-Service ass gespaart.</string>
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
   <string name="RestrictedOnVoiceData">Sprooch-/Dateservicer si gespaart.</string>
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
   <string name="RestrictedOnVoiceSms">Sprooch-/SMS-Servicer si gespaart.</string>
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
   <string name="RestrictedOnAll">Alle Sprooch-/Date-/SMS-Servicer si gespaart.</string>
+  <!-- Displayed to tell the user that peer changed TTY mode -->
   <string name="peerTtyModeFull">Peer huet TTY-Modus \"Vollstänneg\" ugefrot</string>
   <string name="peerTtyModeHco">Peer huet TTY-Modus \"HCO\" ugefrot</string>
   <string name="peerTtyModeVco">Peer huet TTY-Modus \"VCO\" ugefrot</string>
   <string name="peerTtyModeOff">Peer huet TTY-Modus \"Aus\" ugefrot</string>
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">Stëmm</string>
+  <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassData">Daten</string>
+  <!-- Example: Service was enabled for: Voice, FAX -->
   <string name="serviceClassFAX">FAX</string>
+  <!-- Example: Service was enabled for: Voice, SMS -->
   <string name="serviceClassSMS">SMS</string>
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
   <string name="serviceClassDataAsync">Async</string>
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
   <string name="serviceClassDataSync">Sync</string>
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <string name="serviceClassPacket">Pak</string>
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
   <string name="roamingText0">Roaming-Anzeig un</string>
   <string name="roamingText1">Roaming-Anzeig aus</string>
   <string name="roamingText2">Roaming-Anzeig blénkend</string>
@@ -117,330 +210,764 @@
   <string name="roamingText11">Roaming-Banner Un</string>
   <string name="roamingText12">Roaming-Banner Aus</string>
   <string name="roamingTextSearching">E Service gëtt gesicht</string>
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
+  <!-- Displayed when the call forwarding query was forwarded. -->
   <string name="cfTemplateForwarded"><xliff:g id="bearer_service_code">{0}</xliff:g>: <xliff:g id="dialing_number">{1}</xliff:g></string>
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <string name="cfTemplateForwardedTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: <xliff:g id="dialing_number">{1}</xliff:g> no <xliff:g id="time_delay">{2}</xliff:g> Sekonnen</string>
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegistered"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="bearer_service_code">{0}</xliff:g>: Net weidergeleet</string>
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">Funktiounscode ofgeschloss.</string>
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">Connectiounsproblem oder ongëltege Funktiounscode.</string>
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">OK</string>
+  <!-- Displayed when a web request failed with a generic network error. -->
   <string name="httpError">Et gouf en Netzwierkfeeler.</string>
+  <!-- Displayed when a web request failed because the URL could not be found. -->
   <string name="httpErrorLookup">URL gouf net fonnt.</string>
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
   <string name="httpErrorUnsupportedAuthScheme">Den Authentifizéierungsschema vun der Säit ass net ënnerstëtzt.</string>
+  <!-- Displayed when a web request failed because the authentication failed. -->
   <string name="httpErrorAuth">Konnt net authentifizéieren.</string>
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
   <string name="httpErrorProxyAuth">D\'Authentifizéierung iwwer de Proxy Server war net erfollegräich.</string>
+  <!-- Displayed when a web request failed because there was a connection error. -->
   <string name="httpErrorConnect">Konnt keng Connectioun mam Server hierstellen.</string>
+  <!-- Displayed when a web request failed because there was an input or output error. -->
   <string name="httpErrorIO">Konnt net mam Server kommunikéieren. Probéier méi spéit nees.</string>
+  <!-- Displayed when a web request failed because the request timed out -->
   <string name="httpErrorTimeout">Zäitiwwerschreidung bei der Connectioun mam Server.</string>
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
   <string name="httpErrorRedirectLoop">D\'Säit huet zevill Serverweiderleedungen.</string>
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
   <string name="httpErrorUnsupportedScheme">De Protokoll ass net ënnerstëtzt.</string>
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
   <string name="httpErrorFailedSslHandshake">Konnt keng sécher Connectioun hierstellen.</string>
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
   <string name="httpErrorBadUrl">Konnt d\'Säit net opmaache well d\'URL net gëlteg ass.</string>
+  <!-- Displayed when a request failed because we failed to open the file. -->
   <string name="httpErrorFile">Konnt net op de Fichier zougräifen.</string>
+  <!-- Displayed when a request failed because the file wasn't found. -->
   <string name="httpErrorFileNotFound">Konnt den ugefrote Fichier net fannen.</string>
+  <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">Et ginn ze vill Ufroe beaarbecht. Probéier méi spéit nees.</string>
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title">Feeler bei der Umeldung fir <xliff:g id="account" example="foo@gmail.com">%1$s</xliff:g></string>
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">Sync</string>
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <string name="contentServiceSyncNotificationTitle">Sync</string>
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
   <string name="contentServiceTooManyDeletesNotificationDesc">Ze vill <xliff:g id="content_type">%s</xliff:g> geläscht.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="tablet">Den Tabletsspäicher ass voll. Läsch Dateien, fir Späicherplaz fräizeginn.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="watch">Den Auerespäicher ass voll. Läsch Dateien, fir Späicherplaz fräizeginn.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="tv">Den Tëleespäicher ass voll. Läsch Dateien, fir Späicherplaz fräizeginn.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">Den Telefonsspäicher ass voll. Läsch Dateien, fir Späicherplaz fräizeginn.</string>
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">D\'Netzwierk kéint iwwerwaacht sinn</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_by_unknown">Vun engem onbekannten Drëtten</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_by_administrator">Vum Administrateur vun dengem Aarbechtsprofil</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed">Vu(n) <xliff:g id="managing_domain">%s</xliff:g></string>
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
   <string name="work_profile_deleted">Aarbechtsprofil geläscht</string>
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
   <string name="work_profile_deleted_description">Aarbechtsprofil geläscht well d\'Admin-App feelt.</string>
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
   <string name="work_profile_deleted_details">D\'Admin-App fir den Aarbechtsprofil feelt oder ass futti. Dowéinst gouf däin Aarbechtsprofil an all d\'Daten déi dozougehéiere geläscht. Kontaktéier däin Administrateur fir Hëllef ze kréien.</string>
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
   <string name="factory_reset_warning">Däin Apparat gëtt geläscht</string>
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
   <string name="factory_reset_message">D\'Admin-App kann net benotzt ginn, well se futti ass oder Komponente feelen. D\'Daten op dengem Apparat ginn elo geläscht. Kontaktéier däin Administrateur fir Hëllef ze kréien.</string>
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">Ech</string>
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">Tabletoptiounen</string>
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tv">Tëleesoptiounen</string>
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="default">Telefonsoptiounen</string>
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
   <string name="silent_mode">Stëlle Modus</string>
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
   <string name="turn_on_radio">Funk umaachen</string>
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
   <string name="turn_off_radio">Funk ausmaachen</string>
+  <!-- Button to lock the screen, within the Phone Options dialog -->
   <string name="screen_lock">Schiermspär</string>
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
   <string name="power_off">Ausmaachen</string>
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_silent">Schelltoun aus</string>
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_vibrate">Schellmodus \"Vibratioun\"</string>
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_ring">Schelltoun un</string>
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
   <string name="shutdown_progress">Gëtt ausgemaach\u2026</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="tablet">Däin Tablet gëtt ausgemaach.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="tv">Deng Tëlee schallt sech aus.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="watch">Deng Auer schalt sech aus.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="default">Däin Telefon gëtt ausgemaach.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
   <string name="shutdown_confirm_question">Wëlls du den Apparat ausmaachen?</string>
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
   <string name="reboot_safemode_title">An de séchere Modus wiesselen</string>
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
   <string name="reboot_safemode_confirm">Wëlls du an de séchere Modus wiesselen? Doduerch ginn all d\'Appe vun Drëttubidder desaktivéiert, déi s du installéiert hues. Se ginn no engem weideren Neistart awer nees hiergestallt.</string>
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
   <string name="recent_tasks_title">Rezent</string>
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
   <string name="no_recent_tasks">Keng rezent Appen.</string>
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="tablet">Tabletoptiounen</string>
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="tv">Tëleesoptiounen</string>
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="default">Telefonsoptiounen</string>
+  <!-- label for item that locks the phone in the phone options dialog -->
   <string name="global_action_lock">Schiermspär</string>
+  <!-- label for item that turns off power in phone options dialog -->
   <string name="global_action_power_off">Ausmaachen</string>
+  <!-- label for item that generates a bug report in the phone options dialog -->
   <string name="global_action_bug_report">Feelerbericht</string>
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
   <string name="bugreport_title">Feelerbericht maachen</string>
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
   <string name="bugreport_message">Bei dësem Feelerbericht ginn Daten iwwer den aktuelle Status vum Apparat erfaasst an als E-Mail verschéckt. Vum Start vum Bericht bis bei d\'Verschécke kann et ee Moment daueren; ee Moment Gedold.</string>
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
   <string name="global_action_toggle_silent_mode">Stëlle Modus</string>
+  <!-- status message in phone options dialog for when silent mode is enabled -->
   <string name="global_action_silent_mode_on_status">Den Toun ass AUS</string>
+  <!-- status message in phone options dialog for when silent mode is disabled -->
   <string name="global_action_silent_mode_off_status">Den Toun ass UN</string>
+  <!-- label for item that toggles airplane mode -->
   <string name="global_actions_toggle_airplane_mode">Fligermodus</string>
+  <!-- status message in phone options dialog for when airplane mode is on -->
   <string name="global_actions_airplane_mode_on_status">Fligermodus ass UN</string>
+  <!-- status message in phone options dialog for when airplane mode is off -->
   <string name="global_actions_airplane_mode_off_status">Fligermodus ass AUS</string>
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
   <string name="global_action_settings">Astellungen</string>
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
   <string name="global_action_lockdown">Elo spären</string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
   <string name="status_bar_notification_info_overflow">999+</string>
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
   <string name="safeMode">Séchere Modus</string>
+  <!-- Label for the Android system components when they are shown to the user. -->
   <string name="android_system_label">Android-System</string>
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
   <string name="managed_profile_label">Aarbecht</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_calendar">Kalenner</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_sms">SMS</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_storage">Späicher</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_microphone">Mikro</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_microphone">Toun ophuelen</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_camera">Fotoapparat</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_phone">Telefon</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
   <string name="capability_title_canRetrieveWindowContent">Fënsterinhalter ofruffen</string>
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
   <string name="capability_desc_canRetrieveWindowContent">D\'Inhalter vun der Fënster mat där s du interagéiers ginn ofgeruff.</string>
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
   <string name="capability_title_canRequestTouchExploration">\"Drécken an Entdecken\" aktivéieren</string>
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
   <string name="capability_desc_canRequestTouchExploration">Beréiert Elementer gi virgelies an de Schierm ka mat Gesten entdeckt ginn.</string>
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
   <string name="capability_title_canRequestEnhancedWebAccessibility">Verbessert Web-Benotzbarkeet uschalten</string>
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
   <string name="capability_desc_canRequestEnhancedWebAccessibility">Skripter kënnen installéiert ginn, fir den Zougrëff op App-Inhalter ze vereinfachen.</string>
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
   <string name="capability_title_canRequestFilterKeyEvents">Text observéieren deen s du agëss</string>
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
   <string name="capability_desc_canRequestFilterKeyEvents">Huet perséinlech Date wéi Kreditkaartennummeren a Passwierder als Inhalt.</string>
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_statusBar">Statusläischt desaktivéieren oder änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_statusBar">Erlaabt der App, d\'Statusläischt ze desaktivéieren oder System-Symbolbiller dobäizesetzen oder ze läschen.</string>
-  <string name="permlab_statusBarService">Statusläischt</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_statusBarService">Erlaabt der App, d\'Statusläischt ze sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_expandStatusBar">Statusläischt op-/zouklappen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_expandStatusBar">Erlaabt der App, d\'Statusläischt aus- oder zesummenzeklappen.</string>
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permlab_install_shortcut">Ofkierzungen installéieren</string>
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permdesc_install_shortcut">Erlaabt der App, Ofkierzungen ouni Benotzeragrëff op de Startschierm ze setzen.</string>
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
   <string name="permlab_uninstall_shortcut">Ofkierzungen desinstalléieren</string>
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permdesc_uninstall_shortcut">Erlaabt der App, Ofkierzungen ouni Benotzeragrëff vum Startschierm ze läschen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_processOutgoingCalls">Erausgoend Uriff ëmleeden</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_processOutgoingCalls">Erlaabt der App, ze gesi wéi eng Nummer grad gewielt gëtt an erméiglecht den Uruff op eng aner Nummer ëmzeleeden oder den Uruff ofzebriechen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveSms">SMSen empfänken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveSms">Erlaabt der App, SMSen z\'empfänken an ze veraarbechten. Dat bedeit datt d\'App Messagen déi s du geschéckt kriss iwwerwaachen oder läsche kann ouni datt s du se gesäis.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveMms">MMSen empfänken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveMms">Erlaabt der App, MMSen z\'empfänken an ze veraarbechten. Dat bedeit datt d\'App Messagen déi s du geschéckt kriss iwwerwaachen oder läsche kann ouni datt s du se gesäis.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCellBroadcasts">Messagë vun Zelliwwerdrounge liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_subscribedFeedsRead">Abonnéiert Feeds liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_subscribedFeedsRead">Erlaabt der App, Detailer iwwer déi momentan synchroniséiert Feeds ofzeruffen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sendSms">Erlaabt der App, SMSen ze schécken. Doduerch kéinten onerwaart Käschten entstoen. Béiswëlleg Appe kéinten dech Sue kaschten andeem se Messagen ouni deng Bestätegung verschécken.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSms">SMSen oder MMSe liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="tablet">Erlaabt der App, SMSen ze liesen déi um Tablet oder op der SIM-Kaart gespäichert sinn. Doduerch kann d\'App all d\'SMSe liesen, onofhängeg vum Inhalt an egal wéi vertraulech se sinn.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="tv">Erlaabt der App SMSen ze liesen déi op der Tëlee oder op der SIM-Kaart gespäichert sinn. Doduerch kann d\'App all d\'SMSe liesen, onofhängeg vum Inhalt an egal wéi confidentiell se sinn.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="default">Erlaabt der App, SMSen ze liesen déi um Telefon oder op der SIM-Kaart gespäichert sinn. Doduerch kann d\'App all d\'SMSe liesen, onofhängeg vum Inhalt an egal wéi vertraulech se sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveWapPush">Textmessagen (WAP) empfänken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveWapPush">Erlaabt der App, WAP-Messagen z\'empfänken an ze beaarbechten. Dës Berechtegung huet d\'Fäegkeet, Messagen déi s du geschéckt kriss z\'iwwerwaachen oder ze läschen, ouni datt s du se ze gesi kriss.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getTasks">Lafend Appen ausliesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getTasks">Erlaabt der App, Informatiounen iwwer Aufgaben ofzeruffen déi grad lafen oder viru kuerzem gelaf sinn. Dat kéint der App erméiglechen, Informatiounen z\'entdecken iwwer d\'Appen déi um Apparat benotzt ginn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_reorderTasks">Lafend Appen ëmzortéieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_reorderTasks">Erlaabt der App, Aufgabe vum Virgrond an den Hannergrond ze réckelen. D\'App kéint dat ouni däin Awierke maachen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_enableCarMode">Automodus aktivéieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_enableCarMode">Der App erlaben den Automodus z\'aktivéieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_killBackgroundProcesses">Aner Appen zoumaachen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_killBackgroundProcesses">Erlaabt der App, Hannergrondprozesser vun aneren Appen zouzemaachen. Doduerch kéinten aner Appen ophale mat funktionéieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_systemAlertWindow">Iwwer aner Appen uweisen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_systemAlertWindow">Erlaabt der App, fir iwwer aner Applikatiounen oder Deeler vum Benotzerinterface ze zeechnen. Dat kéint mat denge Benotzungsgewunneschten interferéieren, oder ännere wat s du an aneren Appe mengs ze gesinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_persistentActivity">App permanent ausféieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_persistentActivity" product="tablet">Erlaabt der App, Deeler vu sech selwer am Späicher ze persistéieren. Dat kann de Späicher dee fir aner Appen disponibel ass limitéieren an doduerch den Tablet méi lues maachen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_persistentActivity" product="tv">Erlaabt der App, Deeler vu sech selwer am Späicher ze persistéieren. Dat kann de Späicher dee fir aner Appen disponibel ass limitéieren an doduerch d\'Tëlee méi lues maachen.</string>
   <string name="permdesc_persistentActivity" product="default">Erlaabt der App, Deeler vu sech selwer am Späicher ze persistéieren. Dat kann de Späicher dee fir aner Appen disponibel ass limitéieren an doduerch den Telefon méi lues maachen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getPackageSize">Späicherplaz vun Appe moossen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getPackageSize">Erlaabt der App, säi Code, seng Daten a seng Tëschespäicher-Gréissten auszeliesen</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeSettings">Systemastellungen änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeSettings">Erlaabt der App, d\'Systemastellungsdaten z\'änneren. Béisaarteg Appe kéinten doduerch d\'Konfiguratioun vun dengem System beschiedegen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveBootCompleted">Beim Start ausféieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="tablet">Erlaabt der App, sech selwer ze starte soubal de System fäerdeg gelueden ass. Doduerch kéint den Tablet méi laang brauche fir ze starten an d\'App kéint de gesamten Tablet méi lues maache wa se stänneg leeft.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="tv">Erlaabt der App sech selwer ze starte soubal de System fäerdeg gelueden ass. Doduerch kéint d\'Tëlee méi laang brauche fir ze starten an d\'App kéint déi gesamt Tëlee méi lues maache wa se stänneg leeft.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="default">Erlaabt der App, sech selwer ze starte soubal de System fäerdeg gelueden ass. Doduerch kéint den Telefon méi laang brauche fir ze starten an d\'App kéint de gesamten Telefon méi lues maache wa se stänneg leeft.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_broadcastSticky">Dauerhafte Broadcast schécken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="tablet">Erlaabt der App, dauerhaft Broadcasten ze schécken, déi no der Iwwerdroung bestoe bleiwen. Exzessiv Benotzung kéint den Tablet méi lues oder instabil maachen, andeem ze vill Späicher benotzt gëtt.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="tv">Erlaabt der App, dauerhaft Broadcasten ze schécken, déi no der Iwwerdroung bestoe bleiwen. Exzessiv Benotzung kéint d\'Tëlee méi lues oder instabil maachen, andeem ze vill Späicher benotzt gëtt.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="default">Erlaabt der App, dauerhaft Broadcasten ze schécken, déi no der Iwwerdroung bestoe bleiwen. Exzessiv Benotzung kéint den Telefon méi lues oder instabil maachen, andeem ze vill Späicher benotzt gëtt.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readContacts">Kontakter liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="tablet">Erlaabt der App, Daten iwwer d\'Kontakter déi op dengem Tablet gespäichert sinn ze liesen, inklusiv der Frequenz mat där s de spezifesch Kontakter ugeruff hues, hinnen E-Maile geschéckt hues, oder anerwäerts mat hinne kommunikéiert hues. Dës Berechtegung erméiglecht et Appen, Kontaktdaten z\'änneren, a béisaarteg Appe kéinte Kontaktdaten ouni däi Wëssen deelen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="tv">Erlaabt der App, Daten iwwer d\'Kontakter déi op denger Tëlee gespäichert sinn ze liesen, inklusiv der Frequenz mat där s de spezifesch Kontakter ugeruff hues, hinnen E-Maile geschéckt hues, oder anerwäerts mat hinne kommunikéiert hues. Dës Berechtegung erméiglecht et Appen, Kontaktdaten z\'änneren, a béisaarteg Appe kéinte Kontaktdaten ouni däi Wëssen deelen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="default">Erlaabt der App, Daten iwwer d\'Kontakter déi op dengem Telefon gespäichert sinn ze liesen, inklusiv der Frequenz mat där s de spezifesch Kontakter ugeruff hues, hinnen E-Maile geschéckt hues, oder anerwäerts mat hinne kommunikéiert hues. Dës Berechtegung erméiglecht et Appen, Kontaktdaten z\'änneren, a béisaarteg Appe kéinte Kontaktdaten ouni däi Wëssen deelen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeContacts">Kontakter änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="tablet">Erlaabt der App, Daten iwwer d\'Kontakter déi op dengem Tablet gespäichert sinn z\'änneren, inklusiv der Frequenz mat där s de spezifesch Kontakter ugeruff hues, hinnen E-Maile geschéckt hues, oder anerwäerts mat hinne kommunikéiert hues. Dës Berechtegung erméiglecht et Appen, Kontaktdaten ze läschen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="tv">Erlaabt der App, Daten iwwer d\'Kontakter déi op denger Tëlee gespäichert sinn z\'änneren, inklusiv der Frequenz mat där s de spezifesch Kontakter ugeruff hues, hinnen E-Maile geschéckt hues, oder anerwäerts mat hinne kommunikéiert hues. Dës Berechtegung erméiglecht et Appen, Kontaktdaten ze läschen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="default">Erlaabt der App, Daten iwwer d\'Kontakter déi op dengem Telefon gespäichert sinn z\'änneren, inklusiv der Frequenz mat där s de spezifesch Kontakter ugeruff hues, hinnen E-Maile geschéckt hues, oder anerwäerts mat hinne kommunikéiert hues. Dës Berechtegung erméiglecht et Appen, Kontaktdaten ze läschen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCallLog">Urufflëscht liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="tablet">Erlaabt der App, d\'Urufflëscht vum Tablet auszeliesen, inklusiv Daten iwwer erakommend an erausgoend Uriff. Dës Berechtegung erlaabt et Appen, d\'Daten aus denger Urufflëscht ze späicheren, a béisaarteg Appe kéinten dës Daten ouni däi Wëssen deelen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="tv">Erlaabt der App, d\'Urufflëscht vun der Tëlee auszeliesen, inklusiv Daten iwwer erakommend an erausgoend Uriff. Dës Berechtegung erlaabt et Appen, d\'Daten aus denger Urufflëscht ze späicheren, a béisaarteg Appe kéinten dës Daten ouni däi Wëssen deelen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="default">Erlaabt der App, d\'Urufflëscht vum Telefon auszeliesen, inklusiv Daten iwwer erakommend an erausgoend Uriff. Dës Berechtegung erlaabt et Appen, d\'Daten aus denger Urufflëscht ze späicheren, a béisaarteg Appe kéinten dës Daten ouni däi Wëssen deelen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeCallLog">Urufflëscht änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="tablet">Erlaabt der App, d\'Urufflëscht vum Tablet z\'änneren, inklusiv Daten iwwer erakommend an erausgoend Uriff. Béisaarteg Appe kéinten dës Berechtegung benotze fir d\'Daten ouni däi Wëssen ze läschen oder z\'änneren.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="tv">Erlaabt der App, d\'Urufflëscht vun der Tëlee z\'änneren, inklusiv Daten iwwer erakommend an erausgoend Uriff. Béisaarteg Appe kéinten dës Berechtegung benotze fir d\'Daten ouni däi Wëssen ze läschen oder z\'änneren.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="default">Erlaabt der App, d\'Urufflëscht vum Telefon z\'änneren, inklusiv Daten iwwer erakommend an erausgoend Uriff. Béisaarteg Appe kéinten dës Berechtegung benotze fir d\'Daten ouni däi Wëssen ze läschen oder z\'änneren.</string>
-  <string name="permlab_bodySensors">Kierpersensoren (wéi e Bolsmiesser)</string>
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
   <string name="permdesc_bodySensors" product="default">Erlaabt der App, op d\'Date vu Sensoren zouzegräifen, déi deng kierperlech Verfaassung iwwerwaachen, z. B. däi Puls.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCalendar">Kalenner-Rendezvousen a vertraulech Informatioune liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="tablet">Erlaabt der App, all d\'Kalenner-Evenementer déi um Tablet gespäichert sinn ze liesen, inklusiv deene vu Frënn a Mataarbechter. Doduerch kéint d\'App deng Kalennerdate späicheren oder deelen, onofhängeg vun der agestallter Konfidentialitéit.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="tv">Erlaabt der App, all d\'Kalenner-Evenementer déi op der Tëlee gespäichert sinn ze liesen, inklusiv deene vu Frënn a Mataarbechter. Doduerch kéint d\'App deng Kalennerdate späicheren oder deelen, onofhängeg vun der agestallter Konfidentialitéit.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="default">Erlaabt der App, all d\'Kalenner-Evenementer déi um Telefon gespäichert sinn ze liesen, inklusiv deene vu Frënn a Mataarbechter. Doduerch kéint d\'App deng Kalennerdate späicheren oder deelen, onofhängeg vun der agestallter Konfidentialitéit.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeCalendar">Kalenner-Rendezvousen dobäisetzen oder änneren an E-Mailen u Gäscht ouni d\'Wësse vun de Benotzer schécken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCalendar" product="tablet">Erlaabt der App, Rendezvousen, déi s du op dengem Tablet ännere kanns, dobäizesetzen, ze läschen an z\'änneren, inklusiv deene vu Frënn oder Kollegen. Doduerch kann d\'App Noriichte verschécken, déi sou ausgesi wéi wa se vum Besëtzer vum Kalenner géife stamen, oder Rendezvousen änneren ouni datt de Besëtzer et matkritt.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCalendar" product="tv">Erlaabt der App, Rendezvousen, déi s du op denger Tëlee ännere kanns, dobäizesetzen, ze läschen an z\'änneren, inklusiv deene vu Frënn oder Kollegen. Doduerch kann d\'App Noriichte verschécken, déi sou ausgesi wéi wa se vum Besëtzer vum Kalenner géife stamen, oder Rendezvousen änneren ouni datt de Besëtzer et matkritt.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCalendar" product="default">Erlaabt der App, Rendezvousen, déi s du op dengem Telefon ännere kanns, dobäizesetzen, ze läschen an z\'änneren, inklusiv deene vu Frënn oder Kollegen. Doduerch kann d\'App Noriichte verschécken, déi sou ausgesi wéi wa se vum Besëtzer vum Kalenner géife stamen, oder Rendezvousen änneren ouni datt de Besëtzer et matkritt.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessLocationExtraCommands">Op zousätzlech Serviceproviderbefeeler fir de Standuert zougräifen</string>
-  <string name="permlab_accessFineLocation">Genaue Standuert (GPS- an Netzwierk-baséiert)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessFineLocation">Erlaabt der App, iwwer de Globale Positionéierungs-System (GPS) oder iwwer Netzwierkquelle wéi Funkmasten oder WLAN däi genaue Standuert ze bestëmmen. Dës Standuert-Servicer mussen ugeschalt a fir däin Apparat disponibel si fir datt d\'App se ka benotzen. Appe kéinten dat benotze fir ze bestëmme wou s de dech ophäls, an doduerch zousätzlech Akkuleeschtung beusprochen.</string>
-  <string name="permlab_accessCoarseLocation">Ongeféiere Standuert (Netzwierk-baséiert)</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessCoarseLocation">Erlaabt der App, däin ongeféiere Standuert ze bestëmmen. De Standuert gëtt unhand vun Netzwierkstanduertquellen, wéi Funkmasten oder WLAN ofgeleent. Dës Standuert-Servicer mussen ugeschalt a fir däin Apparat disponibel si fir datt d\'App se ka benotzen. Appe kéinten dat benotze fir ze bestëmme wou ongeféier s de dech ophäls.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyAudioSettings">Tounastellungen änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyAudioSettings">Erlaabt der App, déi global Audioastellungen ze steieren, z. B. d\'Lautstäerkt oder wéi ee Lautsprecher benotzt soll ginn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_recordAudio">Toun ophuelen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_recordAudio">Erlaabt der App, Toun mam Mikro opzehuelen. Dës Berechtegung erlaabt der App zu all Moment Toun ouni deng Bestätegung opzehuelen.</string>
-  <string name="permlab_sim_communication">SIM-Kommunikatioun</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sim_communication">Erlaabt der App, Befeeler un d\'SIM ze schécken. Dat ass immens geféierlech.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_camera">Biller a Videoen ophuelen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_camera">Erlaabt der App, Biller a Videoe mat der Kamera opzehuelen. Dës Berechtegung erlaabt der App, d\'Kamera zu all Moment ouni däin Awierken ze benotzen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_vibrate">Vibratioun steieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_vibrate">Erlaabt der App, d\'Vibratioun ze steieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_flashlight">Täscheluucht steieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_flashlight">Erlaabt der App, d\'Täscheluucht ze steieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_callPhone">Telefonsnummeren direkt uruffen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_callPhone">Erlaabt der App, Telefonsnummeren ouni deng Awierkung unzeruffen. Doduerch kéinten onerwaart Käschten oder Uriff entstoen. D\'App kann heiduerch awer keng Noutfallnummeren uruffen. Béiswëlleg Appe kéinte Käschte verursaachen andeem se Nummeren ouni deng Bestätegung uruffen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneState">Status an Identitéit vum Telefon liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneState">Erlaabt der App, op d\'Telefonsfunktioune vum Apparat zouzegräifen. Mat dëser Berechtegung kann d\'App d\'Telefonsnummer an d\'Identifikatiounsnummer vum Apparat, a wann en Uruff aktiv ass och d\'Telefonsnummer vum Gespréichspartner, ausliesen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="tablet">Tablet vum Schlofen ofhalen</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="tv">Rouzoustand vun der Tëlee ze desaktivéieren</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="default">Telefon vum Schlofen ofhalen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="tablet">Erlaabt der App, den Tablet dorun ze hënneren an de Rouzoustand ze wiesselen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="tv">Erlaabt der App d\'Tëlee dorun ze hënneren an de Rouzoustand ze wiesselen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="default">Erlaabt der App, den Telefon dorun ze hënneren an de Rouzoustand ze wiesselen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_transmitIr">Infrarout iwwerdroen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="tablet">Erlaabt der App, den Infrarout-Sender vum Tablet ze benotzen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="tv">Erlaabt der App, den Infrarout-Sender vun der Tëlee ze benotzen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="default">Erlaabt der App, den Infrarout-Sender vum Telefon ze benotzen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setWallpaper">Hannergrondbild setzen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setWallpaper">Erlaabt der App, d\'Hannergrondbild vum System ze setzen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setWallpaperHints">Gréisst vum Hannergrondbild ajustéieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setWallpaperHints">Erlaabt der App, d\'Gréisstenhiwäiser fir d\'Systemhannergrondbiller ze definéieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setTimeZone">Zäitzon setzen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="tablet">Erlaabt der App, d\'Zäitzon vum Tablet z\'änneren.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="tv">Erlaabt der App, d\'Zäitzon vun der Tëlee z\'änneren.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="default">Erlaabt der App, d\'Zäitzon vum Telefon z\'änneren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getAccounts">Konten op dësem Apparat sichen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="tablet">Erlaabt der App, eng Lëscht vun de Konten auszeliesen déi dem Tablet bekannt sinn. Dat kéint Konten aschléissen, déi vun Appen ugeluecht goufen, déi s du installéiert hues.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="tv">Erlaabt der App, eng Lëscht vun de Konten auszeliesen déi der Tëlee bekannt sinn. Dat kéint Konten aschléissen, déi vun Appen ugeluecht goufen, déi s du installéiert hues.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="default">Erlaabt der App, eng Lëscht vun de Konten auszeliesen déi dem Telefon bekannt sinn. Dat kéint Konten aschléissen, déi vun Appen ugeluecht goufen, déi s du installéiert hues.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNetworkState">Netzwierkconnectiounen ukucken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNetworkState">Erlaabt der App, Informatiounen iwwer Netzwierkconnectiounen auszeliesen, wéi z. B. wéi eng Netzwierker existéieren a wéi eng verbonne sinn.</string>
-  <string name="permlab_createNetworkSockets">Vollen Netzwierkzougrëff</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_createNetworkSockets">Erlaabt der App, Netzwierk-Sockets z\'erstellen an eegen Netzwierkprotokoller ze benotzen. De Browser an aner Appe bidde Méiglechkeeten, Daten iwwer den Internet ze verschécken. Dohier ass dës Berechtegung net néideg fir Daten iwwer den Internet ze schécken.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeNetworkState">Netzwierk-Connectivitéit änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeNetworkState">Erlaabt der App, de Status vun der Netzwierkconnectivitéit z\'änneren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeTetherState">Gethethert Connectivitéit änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
   <string name="permdesc_changeTetherState">Erlaabt der App, de Status vun der getetherter Netzwierkconnectivitéit z\'änneren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessWifiState">WLAN-Connectiounen uweisen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessWifiState">Erlaabt der App, Informatiounen iwwer d\'WLAN-Netzwierker auszeliesen. Beispillsweis ob WLAN un ass a wéi eng Nimm déi connectéiert WLAN-Apparater hunn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeWifiState">WLAN-Connectiounen hierstellen an trennen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiState">Erlaabt der App, Connectioune mat WLAN-Zougankspunkten hierzestellen an ze trennen a fir Ännerungen un der Konfiguratioun vun de WLAN-Netzwierker virzehuelen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeWifiMulticastState">WLAN-Multicast-Empfang erlaben</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiMulticastState" product="tablet">Erlaabt der App, Päck z\'empfänken, déi iwwer Multicast-Adressen u sämtlech Apparater an engem WLAN verschéckt ginn, net just un däin Tablet. Dat kascht méi Leeschtung wéi den Net-Multicast-Modus.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiMulticastState" product="tv">Erlaabt der App, Päck z\'empfänken, déi iwwer Multicast-Adressen u sämtlech Apparater an engem WLAN verschéckt ginn, net just un deng Tëlee. Dat kascht méi Leeschtung wéi den Net-Multicast-Modus.</string>
   <string name="permdesc_changeWifiMulticastState" product="default">Erlaabt der App, Päck z\'empfänken, déi iwwer Multicast-Adressen u sämtlech Apparater an engem WLAN verschéckt ginn, net just un däin Telefon. Dat kascht méi Leeschtung wéi den Net-Multicast-Modus.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bluetoothAdmin">Op d\'Bluetooth-Astellungen zougräifen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="tablet">Erlaabt der App, Bluetooth um Tablet ze konfiguréieren, an anerer Apparater z\'entdecken a Koppelunge mat hinnen hierzestellen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="tv">Erlaabt der App, Bluetooth opo der Tëlee ze konfiguréieren, an anerer Apparater z\'entdecken a Koppelunge mat hinnen hierzestellen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="default">Erlaabt der App, Bluetooth um Telefon ze konfiguréieren, an anerer Apparater z\'entdecken a Koppelunge mat hinnen hierzestellen.</string>
   <string name="permlab_accessWimaxState">WiMAX-Connectiounen hierstellen an trennen</string>
   <string name="permdesc_accessWimaxState">Erlaabt der App, festzestellen ob WiMAX aktivéiert ass an Informatiounen iwwer all WiMAX-Netzwierker déi connectéiert sinn.</string>
-  <string name="permlab_changeWimaxState">WiMAX-Status änneren</string>
   <string name="permdesc_changeWimaxState" product="tablet">Erlaabt der App, den Tablet mat WiMAX-Netzwierker ze connectéieren an deconnectéieren.</string>
   <string name="permdesc_changeWimaxState" product="tv">Erlaabt der App, eng Connectioun tëscht der Tëlee a WiMAX-Netzwierker z\'erstellen an ze trennen.</string>
   <string name="permdesc_changeWimaxState" product="default">Erlaabt der App, den Telefon mat WiMAX-Netzwierker ze connectéieren an deconnectéieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bluetooth">Mat Bluetooth-Apparater koppelen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="tablet">Erlaabt der App, d\'Bluetooth-Konfiguratioun um Tablet ze liesen, a Connectioune mat gekoppelten Apparater hierzestellen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="tv">Erlaabt der App, d\'Bluetooth-Konfiguratioun op der Tëlee ze liesen, a Connectioune mat gekoppelten Apparater hierzestellen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="default">Erlaabt der App, d\'Bluetooth-Konfiguratioun um Telefon ze liesen, a Connectioune mat gekoppelten Apparater hierzestellen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_nfc">No-Feld-Communicatioun (NFC) kontrolléieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_nfc">Erlaabt der App, iwwer No-Feld-Communicatioun (NFC) Badgen, Kaarten a Liesapparater ze kontrolléieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_disableKeyguard">Schiermspär desaktivéieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_disableKeyguard">Erlaabt der App, d\'Tastespär an déi liéiert Passwuertsécherheet ze desaktivéieren. Den Telefon desaktivéiert beispillsweis d\'Tastespär wann en Uruff erakënnt, a reaktivéiert se wann den Uruff ofgeschloss ass.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncSettings">Synchroniséierungsastellunge liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSyncSettings">Erlaabt der App, d\'Synchroniséierungsastellunge fir e Kont ze liesen. Doduerch ka beispillsweis festgestallt ginn ob d\'Kontakter mat engem Kont synchroniséiert sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeSyncSettings">Synchronisatioun un- an ausschalten</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeSyncSettings">Erlaabt der App, d\'Synchroniséierungsastellunge fir e Kont z\'änneren. Doduerch ka beispillsweis d\'Synchroniséierung vun de Kontakter mat engem Kont aktivéiert ginn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncStats">Synchronisatiounsstatistike liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSyncStats">Erlaabt der App, d\'Synchroniséierungs-Statistike fir ee Kont ze liesen, inklusiv dem Verlaf vun de Synchronisatiountsevenementer a wéi vill Date synchroniséiert ginn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permlab_sdcardRead" product="nosdcard">Inhalter vun dengem USB-Späicher liesen</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_sdcardRead" product="default">Inhalter vun denger SD-Kaart liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permdesc_sdcardRead" product="nosdcard">Erlaabt der App, d\'Inhalter vum USB-Späicher ze liesen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sdcardRead" product="default">Erlaabt der App, d\'Inhalter vun der SD-Kaart ze liesen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permlab_sdcardWrite" product="nosdcard">Inhalter vum USB-Späicher änneren oder läschen</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_sdcardWrite" product="default">Inhalter vun der SD-Kaart änneren oder läschen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permdesc_sdcardWrite" product="nosdcard">Erlaabt der App, op den USB-Späicher ze schreiwen.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sdcardWrite" product="default">Erlaabt der App, op d\'SD-Kaart ze schreiwen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_use_sip">SIP-Uriff maachen/empfänken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_use_sip">Erlaabt der App, SIP-Uriff ze maachen an entgéintzehuelen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_register_sim_subscription">Nei SIM-Telekommunikatiounsverbindunge registréieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_register_sim_subscription">Erlaabt der App, nei SIM-Telekommunikatiounsverbindungen ze registréieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_register_call_provider">Nei Telekommunikatiounsverbindunge registréieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_register_call_provider">Erlaabt der App, nei SIM-Telekommunikatiounsverbindungen ze registréieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_connection_manager">Telekommunikatiounsverbindunge verwalten</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_connection_manager">Erlaabt der App, Telekommunikatiounsverbindungen ze verwalten.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bind_incall_service">Mam Uruffschierm interagéieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bind_incall_service">Erlaabt der App, ze kontrolléiere wien a wéi de Benotzer den Uruffschierm gesäit.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bind_connection_service">Mat Telefonsservicer interagéieren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bind_connection_service">Erlaabt der App, mat Telefonsservicer z\'interagéieren, fir Uriff ze maachen/z\'empfänken.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_control_incall_experience">Uruffoptioune fir de Benotzer ubidden</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_control_incall_experience">Erlaabt der App, Uruffoptioune fir de Benotzer unzebidden.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readNetworkUsageHistory">Historesch Netzwierkdate liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readNetworkUsageHistory">Erlaabt der App, historesch Netzwierkbenotzungsdate fir spezifesch Netzwierker an Appen ze liesen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_manageNetworkPolicy">Netzwierkrichtlinne verwalten</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_manageNetworkPolicy">Erlaabt der App, Netzwierkrichtlinnen ze geréieren an App-spezifesch Regelen ze definéieren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyNetworkAccounting">Statistike vun der Netzwierkbenotzung änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyNetworkAccounting">Erlaabt der App, z\'ännere wéi d\'Netzwierkbenotzung vun aneren Appe gemooss gëtt. Net fir normal Appe geduecht.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNotifications">Op Notifikatiounen zougräifen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNotifications">Erlaabt der App, Notifikatiounen z\'empfänken, z\'analyséieren an ze läschen, inklusiv deenen déi vun aneren Appe geschriwwe goufen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindNotificationListenerService">Un en Notifikatiouns-Lauschter-Service ubannen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindNotificationListenerService">Erlaabt der App, sech um ieweschten Niveau vun engem Notifikatiouns-Lauschter-Service unzebannen. Sollt ni fir normal Appen néideg sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindConditionProviderService">Un e Konditiounsubidder-Service ubannen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindConditionProviderService">Erlaabt der App, sech um ieweschten Niveau vun engem Konditiounsubidder-Service unzebannen. Sollt ni fir normal Appen néideg sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindDreamService">Un en Dramservice ubannen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindDreamService">Erlaabt der App, sech op ieweschtem Niveau un d\'Schnëttstell vun engem Dramservice unzebannen. Sollt ni fir normal Appen néideg sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_invokeCarrierSetup">Konfiguratiounsapp vum Provider opruffen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_invokeCarrierSetup">Erlaabt dem Besëtzer, d\'Konfiguratiounsapp vum Provider opzeruffen. Sollt ni fir normal Appen néideg sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNetworkConditions">Informatiounen iwwer d\'Netzwierkkonditiounen offänken</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNetworkConditions">Erlaabt der App, Informatiounen zu den Netzwierkkonditiounen z\'erfaassen. Sollt ni fir normal Appen néideg sinn.</string>
   <string name="permlab_setInputCalibration">Kalibréierung fir Methode fir anzeginn änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setInputCalibration">Erlaabt der App d\'Kalibratiounsparametere vum Touchscreen z\'änneren. Sollt ni fir normal Appen néideg sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessDrmCertificates">Op DRM-Zertifikater zougräifen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessDrmCertificates">Erlaabt enger App, op DRM-Zertifikater zouzegräifen a se ze provisionéieren. Sollt ni fir normal Appen néideg sinn.</string>
-  <string name="permlab_handoverStatus">Android-Beam-Iwwerdroungsstatus empfänken</string>
   <string name="permdesc_handoverStatus">Erlaabt der App, Informatiounen iwwer aktuell Android-Beam-Iwwerdroungen z\'empfänken</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_removeDrmCertificates">DRM-Zertifikater läschen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_removeDrmCertificates">Erlaabt enger App, DRM-Zertifikater ze läschen. Sollt ni fir normal Appen néideg sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindCarrierMessagingService">Un engem Provider-SMS/MMS-Service bannen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindCarrierMessagingService">Erlaabt de Besëtzer an d\'Iwwerfläch vum SMS/MMS-Service-Provider op dem ieweschten Niveau ze bannen. Sollt ni fir normal Appen néideg sinn.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
   <string name="policylab_limitPassword">Passwuertregelen definéieren</string>
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
   <string name="policylab_watchLogin">Versich fir d\'Entspäre vum Schierm iwwerwaachen</string>
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="tablet">Unzuel vun de falsche Passwierder beim Entspäre vum Schierm iwwerwaachen an den Tablet spären oder all d\'Daten um Tablet läsche wann ze dacks een e falscht Passwuert aginn huet.</string>
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="TV">Unzuel vun de falsche Passwierder beim Entspäre vum Schierm iwwerwaachen an d\'Tlee spären oder all d\'Daten um Telefon läsche wann ze dacks een e falscht Passwuert aginn huet.</string>
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="default">Unzuel vun de falsche Passwierder beim Entspäre vum Schierm iwwerwaachen an den Telefon spären oder all d\'Daten um Telefon läsche wann ze dacks een e falscht Passwuert aginn huet.</string>
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
   <string name="policylab_forceLock">De Schierm spären</string>
+  <!-- Description of policy access to limiting the user's password choices -->
   <string name="policydesc_forceLock">Festleeë wéi a wéini de Schierm späert.</string>
+  <!-- Title of policy access to wipe primary user's data -->
   <string name="policylab_wipeData">All Date läschen</string>
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="tablet">Ouni Warnung op d\'Wierksastellungen zrécksetzen an Date vum Tablet läschen.</string>
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="tv">Ouni Warnung op d\'Wierksastellungen zrécksetzen an Date vun der Tëlee läschen.</string>
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="default">Ouni Warnung op d\'Wierksastellungen zrécksetzen an Date vum Telefon läschen.</string>
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
   <string name="policylab_setGlobalProxy">De globale Proxy-Server fir den Apparat festleeën</string>
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
   <string name="policylab_encryptedStorage">Späicherverschlësselung</string>
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
   <string name="policydesc_encryptedStorage">Gespäichert App-Date musse verschlësselt ginn.</string>
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
   <string name="policylab_disableCamera">Kameraen desaktivéieren</string>
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
   <string name="policydesc_disableCamera">D\'Benotzung vun alle Kameraen um Apparat verhënneren.</string>
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>Doheem</item>
     <item>Mobil</item>
@@ -451,29 +978,39 @@
     <item>Aner</item>
     <item>Personaliséiert</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>Doheem</item>
     <item>Aarbecht</item>
     <item>Aner</item>
     <item>Personaliséiert</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>Doheem</item>
     <item>Aarbecht</item>
     <item>Aner</item>
     <item>Personaliséiert</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>Doheem</item>
     <item>Aarbecht</item>
     <item>Aner</item>
     <item>Personaliséiert</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>Aarbecht</item>
     <item>Aner</item>
     <item>Personaliséiert</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
     <item>Windows Live</item>
@@ -484,411 +1021,928 @@
     <item>ICQ</item>
     <item>Jabber</item>
   </string-array>
+  <!-- Custom phone number type -->
   <string name="phoneTypeCustom">Personaliséiert</string>
+  <!-- Home phone number type -->
   <string name="phoneTypeHome">Doheem</string>
+  <!-- Mobile phone number type -->
   <string name="phoneTypeMobile">Mobil</string>
+  <!-- Work phone number type -->
   <string name="phoneTypeWork">Aarbecht</string>
+  <!-- Work fax phone number type -->
   <string name="phoneTypeFaxWork">Aarbechtsfax</string>
+  <!-- Home fax phone number type -->
   <string name="phoneTypeFaxHome">Fax doheem</string>
+  <!-- Pager phone number type -->
   <string name="phoneTypePager">Pager</string>
+  <!-- Other phone number type -->
   <string name="phoneTypeOther">Aner</string>
+  <!-- Callback phone number type -->
   <string name="phoneTypeCallback">Réckruff</string>
+  <!-- Car phone number type -->
   <string name="phoneTypeCar">Auto</string>
+  <!-- Company main phone number type -->
   <string name="phoneTypeCompanyMain">Firma</string>
+  <!-- ISDN phone number type -->
   <string name="phoneTypeIsdn">ISDN</string>
+  <!-- Main phone number type -->
   <string name="phoneTypeMain">Haapt</string>
+  <!-- Other fax phone number type -->
   <string name="phoneTypeOtherFax">Anere Fax</string>
+  <!-- Radio phone number type -->
   <string name="phoneTypeRadio">Radio</string>
+  <!-- Telex phone number type -->
   <string name="phoneTypeTelex">Telex</string>
+  <!-- TTY TDD phone number type -->
   <string name="phoneTypeTtyTdd">TTY/TDD</string>
+  <!-- Work mobile phone number type -->
   <string name="phoneTypeWorkMobile">Handy (Aarbecht)</string>
+  <!-- Work pager phone number type -->
   <string name="phoneTypeWorkPager">Pager (Aarbecht)</string>
+  <!-- Assistant phone number type -->
   <string name="phoneTypeAssistant">Assistent</string>
+  <!-- MMS phone number type -->
   <string name="phoneTypeMms">MMS</string>
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
   <string name="eventTypeCustom">Personaliséiert</string>
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
   <string name="eventTypeBirthday">Gebuertsdag</string>
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
   <string name="eventTypeAnniversary">Joresdag</string>
+  <!-- Label for other events  [CHAR LIMIT=20] -->
   <string name="eventTypeOther">Aner</string>
+  <!-- Custom email type -->
   <string name="emailTypeCustom">Personaliséiert</string>
+  <!-- Home email type -->
   <string name="emailTypeHome">Doheem</string>
+  <!-- Work email type -->
   <string name="emailTypeWork">Aarbecht</string>
+  <!-- Other email type -->
   <string name="emailTypeOther">Aner</string>
+  <!-- Mobile email type -->
   <string name="emailTypeMobile">Mobil</string>
+  <!-- Custom postal address type -->
   <string name="postalTypeCustom">Personaliséiert</string>
+  <!-- Home postal address type -->
   <string name="postalTypeHome">Doheem</string>
+  <!-- Work postal address type -->
   <string name="postalTypeWork">Aarbecht</string>
+  <!-- Other postal address type -->
   <string name="postalTypeOther">Aner</string>
+  <!-- Custom IM address type -->
   <string name="imTypeCustom">Personaliséiert</string>
+  <!-- Home IM address type -->
   <string name="imTypeHome">Doheem</string>
+  <!-- Work IM address type -->
   <string name="imTypeWork">Aarbecht</string>
+  <!-- Other IM address type -->
   <string name="imTypeOther">Aner</string>
+  <!-- Custom IM protocol type -->
   <string name="imProtocolCustom">Personaliséiert</string>
+  <!-- AIM IM protocol type -->
   <string name="imProtocolAim">AIM</string>
+  <!-- MSN IM protocol type -->
   <string name="imProtocolMsn">Windows Live</string>
+  <!-- Yahoo IM protocol type -->
   <string name="imProtocolYahoo">Yahoo</string>
+  <!-- Skype IM protocol type -->
   <string name="imProtocolSkype">Skype</string>
+  <!-- QQ IM protocol type -->
   <string name="imProtocolQq">QQ</string>
+  <!-- Google Talk IM protocol type -->
   <string name="imProtocolGoogleTalk">Hangouts</string>
+  <!-- ICQ IM protocol type -->
   <string name="imProtocolIcq">ICQ</string>
+  <!-- Jabber IM protocol type -->
   <string name="imProtocolJabber">Jabber</string>
+  <!-- NetMeeting IM protocol type -->
   <string name="imProtocolNetMeeting">NetMeeting</string>
+  <!-- Work organization type -->
   <string name="orgTypeWork">Aarbecht</string>
+  <!-- Other organization type -->
   <string name="orgTypeOther">Aner</string>
+  <!-- Custom organization type -->
   <string name="orgTypeCustom">Personaliséiert</string>
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
   <string name="relationTypeCustom">Personaliséiert</string>
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeAssistant">Assistent</string>
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeBrother">Brudder</string>
+  <!-- Child relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeChild">Kand</string>
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeDomesticPartner">Liewenspartner</string>
+  <!-- Father relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeFather">Papp</string>
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeFriend">Frënd</string>
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeManager">Manager</string>
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeMother">Mamm</string>
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeParent">Elterendeel</string>
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
   <string name="relationTypePartner">Partner</string>
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeReferredBy">Recommandéiert vu(n)</string>
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeRelative">Verwandten</string>
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeSister">Schwëster</string>
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeSpouse">Éierpartner</string>
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
   <string name="sipAddressTypeCustom">Personaliséiert</string>
+  <!-- Home SIP address type. Same context as Home phone type. -->
   <string name="sipAddressTypeHome">Doheem</string>
+  <!-- Work SIP address type. Same context as Work phone type. -->
   <string name="sipAddressTypeWork">Aarbecht</string>
+  <!-- Other SIP address type. Same context as Other phone type. -->
   <string name="sipAddressTypeOther">Aner</string>
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
   <string name="quick_contacts_not_available">Keng Applikatioun fonnt fir dëse Kontakt unzekucken.</string>
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_code">PIN-Code aginn</string>
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_puk_code">PUK an neie PIN-Code aginn</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">PUK-Code</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">Neie PIN-Code</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">Drécke fir d\'Passwuert anzeginn</font></string>
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_password_code">Passwuert agi fir z\'entspären</string>
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_password_code">PIN agi fir z\'entspären</string>
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
   <string name="keyguard_password_wrong_pin_code">Falsche PIN-Code.</string>
+  <!-- Instructions telling the user how to unlock the phone. -->
   <string name="keyguard_label_text">Menü an dann 0 drécke fir z\'entspären.</string>
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
   <string name="emergency_call_dialog_number_for_display">Noutruffnummer</string>
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">Kee Service.</string>
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <string name="lockscreen_screen_locked">Schierm gespaart.</string>
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
   <string name="lockscreen_instructions_when_pattern_enabled">Menü drécke fir z\'entspären oder en Noutruff ze maachen.</string>
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="lockscreen_instructions_when_pattern_disabled">Menü drécke fir z\'entspären.</string>
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
   <string name="lockscreen_pattern_instructions">Muster zeechne fir z\'entspären</string>
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
   <string name="lockscreen_return_to_call">Zréck bei d\'Gespréich</string>
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
   <string name="lockscreen_pattern_correct">Korrekt!</string>
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
   <string name="lockscreen_pattern_wrong">Probéier nees</string>
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
   <string name="lockscreen_password_wrong">Probéier nees</string>
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
   <string name="faceunlock_multiple_failures">Maximal Versich fir mam Gesiicht z\'entspären iwwerschratt</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message_short">Keng SIM-Kaart</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="tablet">Keng SIM-Kaart am Tablet.</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="tv">Keng Sim-Kaart an der Tëlee.</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="default">Keng SIM-Kaart am Telefon.</string>
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
   <string name="lockscreen_missing_sim_instructions">SIM-Kaart asetzen.</string>
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
   <string name="lockscreen_missing_sim_instructions_long">D\'SIM-Kaart feelt oder ass net liesbar. Setz eng SIM-Kaart an.</string>
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
   <string name="lockscreen_permanent_disabled_sim_message_short">Onbenotzbar SIM-Kaart.</string>
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
   <string name="lockscreen_permanent_disabled_sim_instructions">Deng SIM-Kaart gouf permanent ausgeschalt.\n
 Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
   <string name="lockscreen_transport_prev_description">Viregen Titel</string>
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
   <string name="lockscreen_transport_next_description">Nächsten Titel</string>
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
   <string name="lockscreen_transport_pause_description">Paus</string>
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
   <string name="lockscreen_transport_play_description">Ofspillen</string>
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
   <string name="lockscreen_transport_stop_description">Stopp</string>
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
   <string name="lockscreen_transport_rew_description">Zréckspullen</string>
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
   <string name="lockscreen_transport_ffw_description">Virspullen</string>
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
   <string name="emergency_calls_only" msgid="2485604591272668370">Just Noutriff</string>
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
   <string name="lockscreen_network_locked_message">Netzwierk gespaart</string>
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
   <string name="lockscreen_sim_puk_locked_message">SIM-Kaart ass PUK-gespaart.</string>
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
   <string name="lockscreen_sim_puk_locked_instructions">D\'Benotzerhandbuch ukucken oder de Clientsservice kontaktéieren.</string>
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
   <string name="lockscreen_sim_locked_message">D\'SIM-Kaart ass gespaart.</string>
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
   <string name="lockscreen_sim_unlock_progress_dialog_message">D\'SIM-Kaart gëtt entspaart\u2026</string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
   <string name="lockscreen_too_many_failed_attempts_dialog_message">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
   <string name="lockscreen_too_many_failed_password_attempts_dialog_message">Du hues däi Passwuert <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
   <string name="lockscreen_too_many_failed_pin_attempts_dialog_message">Du hues däi PIN <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="tablet">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gezeechent. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich muss du däin Tablet mat denge Login-Date vu Google entspären.\n\nProbéier a(n) <xliff:g id="number">%d</xliff:g> Sekonnen nees.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="tv">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>mol- falsch gezeechent. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich muss du deng Tëlee mat denge Login-Date vu Google entspären.\n\nProbéier a(n) <xliff:g id="number">%d</xliff:g> Sekonnen nees.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="default">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gezeechent. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich muss du däin Telefon mat denge Login-Date vu Google entspären.\n\nProbéier a(n) <xliff:g id="number">%d</xliff:g> Sekonnen nees.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Tablet op d\'Wierksastellungen zréckgesat an all d\'Benotzerdate gi verluer.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv">Du hues <xliff:g id="number">%d</xliff:g> mol ouni Erfolleg versicht d\'Tëlee z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt deng Tëlee op d\'Wierksastellungen zréckgesat an all d\'Benotzerdate gi verluer.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Tablet op d\'Wierksastellungen zréckgesat an all d\'Benotzerdate gi verluer.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. E gëtt elo op d\'Wierksastellungen zréckgesat.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="tv">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht d\'Tëlee z\'entspären. E gëtt elo op d\'Wierksastellungen zréckgesat.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. E gëtt elo op d\'Wierksastellungen zréckgesat.</string>
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
   <string name="lockscreen_too_many_failed_attempts_countdown">Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
   <string name="lockscreen_forgot_pattern_button_text">Muster vergiess?</string>
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
   <string name="lockscreen_glogin_forgot_pattern">Kont-Entspärung</string>
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
   <string name="lockscreen_glogin_too_many_attempts">Ze vill Musterversich</string>
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
   <string name="lockscreen_glogin_instructions">Fir z\'entspären, mell dech mat dengem Google-Kont un.</string>
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_username_hint">Benotzernumm (E-Mail)</string>
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_password_hint">Passwuert</string>
+  <!-- Button to try to unlock the phone using username and password -->
   <string name="lockscreen_glogin_submit_button">Aloggen</string>
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
   <string name="lockscreen_glogin_invalid_input">Ongëltege Benotzernumm oder Passwuert.</string>
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
   <string name="lockscreen_glogin_account_recovery_hint">Benotzernumm oder Passwuert vergiess\?\nBesich <b>google.com/accounts/recovery</b>.</string>
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
   <string name="lockscreen_glogin_checking_password">Iwwerpréiwung\u2026</string>
+  <!-- Displayed on lock screen's left tab - unlock -->
   <string name="lockscreen_unlock_label">Entspären</string>
+  <!-- Displayed on lock screen's right tab - turn sound on -->
   <string name="lockscreen_sound_on_label">Toun un</string>
+  <!-- Displayed on lock screen's right tab - turn sound off -->
   <string name="lockscreen_sound_off_label">Toun aus</string>
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_start">Muster ugefaangen</string>
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_cleared">Muster geläscht</string>
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
   <string name="lockscreen_access_pattern_cell_added">Zell dobäigesat</string>
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_detected">Muster ofgeschloss</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="lockscreen_access_pattern_area" msgid="">Musterberäich.</string>
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_changed">%1$s. Widget %2$d vu(n) %3$d.</string>
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_add_widget">Widget dobäisetzen.</string>
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_empty_slot">Eidel</string>
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_unlock_area_expanded">Entspärberäich maximéiert.</string>
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_unlock_area_collapsed">Entspärberäich miniméiert.</string>
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget"><xliff:g id="widget_index">%1$s</xliff:g> Widget.</string>
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_user_selector">Benotzerauswiel</string>
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_status">Status</string>
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_camera">Fotoapparat</string>
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
   <string name="keygaurd_accessibility_media_controls">Steierelementer fir Medien</string>
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_reorder_start">Neiuerdnung vun de Widgete gestart.</string>
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_reorder_end">Neiuerdnung vun de Widgete gestoppt.</string>
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_deleted">Widget <xliff:g id="widget_index">%1$s</xliff:g> geläscht.</string>
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_expand_lock_area">Erweider den Entspärberäich.</string>
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_unlock">Entspäre mat Fangerbeweegung.</string>
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_unlock">Entspäre mat Muster.</string>
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_face_unlock">Entspäre mam Gesiicht.</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">Entspäre mat PIN.</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">Entspäre mat Passwuert.</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area">Musterberäich.</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Beräich fir Fangerbeweegung.</string>
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_alpha_key">ABC</string>
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_alt_key">ALT</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_character">Zeechen</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_word">Wuert</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_link">Link</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_line">Zeil</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
   <string name="hour_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="pm">%P</xliff:g>"</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
   <string name="hour_cap_ampm">"<xliff:g id="hour" example="3">%-l</xliff:g><xliff:g id="ampm" example="PM">%p</xliff:g>"</string>
+  <!-- Title of the alert when something went wrong in the factory test. -->
   <string name="factorytest_failed">Wierkstest feelgeschloen</string>
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
   <string name="factorytest_not_system">D\'FACTORY_TEST-Aktioun ass just ënnerstëtzt fir Päck déi am Dossier /system/app installéiert sinn.</string>
+  <!-- Error message displayed when the factory test could not be started. -->
   <string name="factorytest_no_action">Et gouf kee Pak fonnt deen d\'FACTORY_TEST-Aktioun zur Verfügung stellt.</string>
+  <!-- Button to restart the device after the factory test. -->
   <string name="factorytest_reboot">Nei starten</string>
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
   <string name="js_dialog_title">D\'Säit \"<xliff:g id="title">%s</xliff:g>\" seet:</string>
+  <!-- Default title for a javascript dialog -->
   <string name="js_dialog_title_default">JavaScript</string>
+  <!-- Title for the unload javascript dialog -->
   <string name="js_dialog_before_unload_title">Navigatioun bestätegen</string>
+  <!-- Text for the positive button on the unload javascript dialog -->
   <string name="js_dialog_before_unload_positive_button">Dës Säit verloossen</string>
+  <!-- Text for the negative button on the unload javascript dialog -->
   <string name="js_dialog_before_unload_negative_button">Op dëser Säit bleiwen</string>
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
   <string name="js_dialog_before_unload"><xliff:g id="message">%s</xliff:g>\n\nBass du sécher datt s du vun dëser Säit ewechnavigéiere wëlls?</string>
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
   <string name="save_password_label">Bestätegen</string>
+  <!-- Toast for double-tap -->
   <string name="double_tap_toast">Tipp: Zweemol drécke fir eran- an erauszezoomen.</string>
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
   <string name="autofill_this_form">Automatescht Ausfëllen</string>
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
   <string name="setup_autofill">Automatescht Ausfëllen astellen</string>
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
   <string name="autofill_address_name_separator">\u0020</string>
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
   <string name="autofill_address_summary_name_format">$1$2$3</string>
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
   <string name="autofill_address_summary_separator">,\u0020</string>
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
   <string name="autofill_address_summary_format">$1$2$3</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_attention_ignored_re">attention|attn</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_region_ignored_re">province|region|other<!-- es -->|provincia<!-- pt-BR, pt-PT -->|bairro|suburb</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_company_re">company|business|organization|organisation|department<!-- de-DE -->|firma|firmenname<!-- es -->|empresa<!-- fr-FR -->|societe|société<!-- it-IT -->|ragione.?sociale<!-- ja-JP -->|会社<!-- ru -->|название.?компании<!-- zh-CN -->|单位|公司</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_1_re">address.?line|address1|addr1|street<!-- de-DE -->|strasse|straße|hausnummer|housenumber<!-- en-GB -->|house.?name<!-- es -->|direccion|dirección<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所1<!-- pt-BR, pt-PT -->|morada|endereço<!-- ru -->|Адрес<!-- zh-CN -->|地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_1_label_re">address<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所<!-- zh-CN -->|地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_2_re">address.?line2|address2|addr2|street|suite|unit<!-- de-DE -->|adresszusatz|ergänzende.?angaben<!-- es -->|direccion2|colonia|adicional<!-- fr-FR -->|addresssuppl|complementnom|appartement<!-- it-IT -->|indirizzo2<!-- ja-JP -->|住所2</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_3_re">address.?line3|address3|addr3|street|line3<!-- es -->|municipio<!-- fr-FR -->|batiment|residence<!-- it-IT -->|indirizzo3</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_country_re">country|location<!-- ja-JP -->|国<!-- zh-CN -->|国家</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_zip_code_re">zip|postal|post code|pcode|^1z$<!-- de-DE -->|postleitzahl<!-- es -->|cp<!-- fr-FR -->|cdp<!-- it-IT -->|cap<!-- ja-JP -->|郵便番号<!-- pt-BR, pt-PT -->|codigo|codpos|cep<!-- ru -->|Почтовый.?Индекс<!--zh-CN -->|邮政编码|邮编<!-- zh-TW -->|郵遞區號</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_zip_4_re">zip|^-$|post2<!-- pt-BR, pt-PT -->|codpos2</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_city_re">city|town<!-- de-DE -->|ort|stadt<!-- en-AU -->|suburb<!-- es -->|ciudad|provincia|localidad|poblacion<!-- fr-FR -->|ville|commune<!-- it-IT -->|localita<!-- ja-JP -->|市区町村<!-- pt-BR, pt-PT -->|cidade<!-- ru -->|Город<!-- zh-CN -->|市<!-- zh-TW -->|分區</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_state_re">state|county|region|province<!-- de-DE -->|land<!-- en-UK -->|county|principality<!-- ja-JP -->|都道府県<!-- pt-BR, pt-PT -->|estado|provincia<!-- ru -->|область<!-- zh-CN -->|省<!-- zh-TW -->|地區</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_type_same_as_re">same as</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_type_use_my_re">use my</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_billing_designator_re">bill</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_shipping_designator_re">ship</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_email_re">e.?mail<!-- ja-JP -->|メールアドレス<!-- ru -->|Электронной.?Почты<!-- zh-CN -->|邮件|邮箱<!-- zh-TW -->|電郵地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_username_re">user.?name|user.?id<!-- de-DE -->|vollständiger.?name<!-- zh-CN -->|用户名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_re">^name|full.?name|your.?name|customer.?name|firstandlastname<!-- es -->|nombre.*y.*apellidos<!-- fr-FR -->|^nom<!-- ja-JP -->|お名前|氏名<!-- pt-BR, pt-PT -->|^nome<!-- zh-CN -->|姓名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_specific_re">^name<!-- fr-FR -->|^nom<!-- pt-BR, pt-PT -->|^nome</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_first_name_re">irst.*name|initials|fname|first$<!-- de-DE -->|vorname<!-- es -->|nombre<!-- fr-FR -->|forename|prénom|prenom<!-- ja-JP -->|名<!-- pt-BR, pt-PT -->|nome<!-- ru -->|Имя</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_middle_initial_re">middle.*initial|m\\.i\\.|mi$</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_middle_name_re">middle.*name|mname|middle$<!-- es -->|apellido.?materno|lastlastname</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_last_name_re">last.*name|lname|surname|last$<!-- de-DE -->|nachname<!-- es -->|apellidos<!-- fr-FR -->|famille|^nom<!-- it-IT -->|cognome<!-- ja-JP -->|姓<!-- pt-BR, pt-PT -->|morada|apelidos|surename|sobrenome<!-- ru -->|Фамилия</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_re">phone<!-- de-DE -->|telefonnummer<!-- es -->|telefono|teléfono<!-- fr-FR -->|telfixe<!-- ja-JP -->|電話<!-- pt-BR, pt-PT -->|telefone|telemovel<!-- ru -->|телефон<!-- zh-CN -->|电话</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_area_code_re">area.*code|acode|area</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_prefix_re">prefix<!-- fr-FR -->|preselection<!-- pt-BR, pt-PT -->|ddd</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_suffix_re">suffix</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_extension_re">ext<!-- pt-BR, pt-PT -->|ramal</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_on_card_re">card.?holder|name.?on.?card|ccname|owner<!-- de-DE -->|karteninhaber<!-- es -->|nombre.*tarjeta<!-- fr-FR -->|nom.*carte<!-- it-IT -->|nome.*cart<!-- ja-JP -->|名前<!-- ru -->|Имя.*карты<!-- zh-CN -->|信用卡开户名|开户名|持卡人姓名<!-- zh-TW -->|持卡人姓名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_on_card_contextual_re">name</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_cvc_re">verification|card identification|cvn|security code|cvv code|cvc</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_number_re">number|card.?#|card.?no|ccnum<!-- de-DE -->|nummer<!-- es -->|credito|numero|número<!-- fr-FR -->|numéro<!-- ja-JP -->|カード番号<!-- ru -->|Номер.*карты<!-- zh-CN -->|信用卡号|信用卡号码<!-- zh-TW -->|信用卡卡號</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_expiration_month_re">expir|exp.*month|exp.*date|ccmonth<!-- de-DE -->|gueltig|gültig|monat<!-- es -->|fecha<!-- fr-FR -->|date.*exp<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|月</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_expiration_date_re">exp|^/|year<!-- de-DE -->|ablaufdatum|gueltig|gültig|yahr<!-- es -->|fecha<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|年|有效期</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_ignored_re">^card</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_fax_re">fax<!-- fr-FR -->|télécopie|telecopie<!-- ja-JP -->|ファックス<!-- ru -->|факс<!-- zh-CN -->|传真<!-- zh-TW -->|傳真</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_country_code_re">country.*code|ccode|_cc</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_area_code_notext_re">^\\($</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_prefix_separator_re">^-$|^\\)$</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_suffix_separator_re">^-$</string>
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_province">Provënz</string>
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_postal_code">Postleetzuel</string>
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_state">Staat</string>
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_zip_code">Postleetzuel</string>
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_county">Landkrees</string>
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_island">Insel</string>
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_district">Bezierk</string>
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_department">Departement</string>
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_prefecture">Präfektur</string>
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_parish">Gemeng</string>
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_area">Gebitt</string>
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_emirate">Emirat</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_readHistoryBookmarks">Internet-Lieszeechen an däin Historique liesen</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_readHistoryBookmarks">Erlaabt der App, den Historique vun alle Säiten déi s de besicht hues an all dengem Browser seng Liesezeechen ze liesen. Hiwäis: dës Berechtegung gëtt eventuell net vu Browsere vun Drëtthiersteller oder aneren Appe mat Internetfäegkeete berücksichtegt.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_writeHistoryBookmarks">Internet-Lieszeeche schreiwen an den Historique änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_writeHistoryBookmarks" product="tv">Erlaabt der App, den Historique oder d\'Lieszeechen déi vun dengem Browser op der Tëlee gespäichert sinn z\'änneren. Dat kéint der App erméiglechen, d\'Browserdaten z\'änneren oder ze läschen. Wichteg: Dës Berechtegung kéint vu Browseren oder aneren Appe vun Drëtthiersteller net berücksichtegt ginn.</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
   <string name="permlab_setAlarm">Wecker stellen</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
   <string name="permlab_addVoicemail">Mailboxopnamen dobäisetzen</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
   <string name="permdesc_addVoicemail">Erlaabt der App, Messagen op denger Mailbox ze späicheren.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_writeGeolocationPermissions">Geolokaliséierungs-Berechtegunge vum Browser änneren</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_writeGeolocationPermissions">Erlaabt der App, d\'Geolokaliséierungs-Berechtegunge vum Browser z\'änneren. Béisaarteg Appe kéinten dat benotze fir Standuertinformatiounen un arbiträr Websäiten ze schécken.</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
   <string name="save_password_message">Wëlls du datt de Browser dëst Passwuert verhält?</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
   <string name="save_password_notnow">Net elo</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
   <string name="save_password_remember">Erënneren</string>
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
   <string name="save_password_never">Ni</string>
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
   <string name="open_permission_deny">Du hues keng Berechtegung fir dës Säit opzemaachen.</string>
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
   <string name="text_copied">Text an d\'Tëschenoflag kopéiert.</string>
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
   <string name="more_item_label">Méi</string>
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
   <string name="prepend_shortcut_label">Menü+</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
   <string name="menu_space_shortcut_label">Espace</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <string name="menu_enter_shortcut_label">Enter</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">läschen</string>
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">Sichen</string>
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
   <string name="search_hint">Sichen&#8230;</string>
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_search">Sichen</string>
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
   <string name="searchview_description_query">Sichufro</string>
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_clear">Ufro läschen</string>
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_submit">Ufro schécken</string>
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_voice">Stëmmsich</string>
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
   <string name="enable_explore_by_touch_warning_title">Drécken an Entdecken aktivéieren?</string>
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
   <string name="enable_explore_by_touch_warning_message" product="tablet"><xliff:g id="accessibility_service_name">%1$s</xliff:g> wëll \"Drécken an Entdecken\" aktivéieren.
 Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elementer héieren oder gesinn déi ënner dengem Fanger sinn oder iwwer Geste mam Tablet interagéieren.</string>
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
   <string name="enable_explore_by_touch_warning_message" product="default"><xliff:g id="accessibility_service_name">%1$s</xliff:g> wëll \"Drécken an Entdecken\" aktivéieren.
 Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elementer héieren oder gesinn déi ënner dengem Fanger sinn oder iwwer Geste mam Telefon interagéieren.</string>
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
   <string name="oneMonthDurationPast">Virun 1 Mount</string>
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
   <string name="beforeOneMonthDurationPast">Viru méi als 1 Mount</string>
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
   <string name="last_month">Leschte Mount</string>
+  <!-- This is used to express that something happened longer ago than the previous options -->
   <string name="older">Méi al</string>
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
   <string name="preposition_for_date">um <xliff:g id="date" example="May 29">%s</xliff:g></string>
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
   <string name="preposition_for_time">um <xliff:g id="time" example="2:33 am">%s</xliff:g></string>
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
   <string name="preposition_for_year">am Joer <xliff:g id="year" example="2003">%s</xliff:g></string>
+  <!-- Appened to express the value is this unit of time: singular day -->
   <string name="day">Dag</string>
+  <!-- Appened to express the value is this unit of time: plural days -->
   <string name="days">Deeg</string>
+  <!-- Appened to express the value is this unit of time: singular hour -->
   <string name="hour">Stonn</string>
+  <!-- Appened to express the value is this unit of time: plural hours -->
   <string name="hours">Stonnen</string>
+  <!-- Appened to express the value is this unit of time: singular minute -->
   <string name="minute">min</string>
+  <!-- Appened to express the value is this unit of time: plural minutes -->
   <string name="minutes">min</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="second">s</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="seconds">s</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="week">Woch</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="weeks">Wochen</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="year">Joer</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="years">Joer</string>
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <plurals name="duration_seconds">
+    <item quantity="one">1 Sekonn</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> Sekonnen</item>
+  </plurals>
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <plurals name="duration_minutes">
+    <item quantity="one">1 Minutt</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> Minutten</item>
+  </plurals>
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <plurals name="duration_hours">
+    <item quantity="one">1 Stonn</item>
+    <item quantity="other"><xliff:g id="count">%d</xliff:g> Stonnen</item>
+  </plurals>
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
   <string name="VideoView_error_title">Videoproblem</string>
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
   <string name="VideoView_error_text_invalid_progressive_playback">De Video ass net gëlteg fir op dësen Apparat gestreamt ze ginn.</string>
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
   <string name="VideoView_error_text_unknown">Dëse Video kann net ofgespillt ginn.</string>
+  <!-- Button to close error alert when a video cannot be played -->
   <string name="VideoView_error_button">OK</string>
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
   <string name="relative_time">"<xliff:g id="date" example="4 hours ago">%1$s</xliff:g>, <xliff:g id="time" example="11:00 am">%2$s</xliff:g>"</string>
+  <!-- Quoted name for 12pm, lowercase -->
   <string name="noon">"Mëtteg"</string>
+  <!-- Quoted name for 12pm, uppercase first letter -->
   <string name="Noon">"Mëtteg"</string>
+  <!-- Quoted name for 12am, lowercase -->
   <string name="midnight">"Hallefnuecht"</string>
+  <!-- Quoted name for 12am, uppercase first letter -->
   <string name="Midnight">"Hallefnuecht"</string>
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
   <string name="elapsed_time_short_format_mm_ss"><xliff:g id="minutes" example="1">%1$02d</xliff:g>:<xliff:g id="seconds" example="23">%2$02d</xliff:g></string>
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
   <string name="elapsed_time_short_format_h_mm_ss"><xliff:g id="hours" example="1">%1$d</xliff:g>:<xliff:g id="minutes" example="43">%2$02d</xliff:g>:<xliff:g id="seconds" example="33">%3$02d</xliff:g></string>
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
   <string name="selectAll">All auswielen</string>
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
   <string name="cut">Schneiden</string>
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
   <string name="copy">Kopéieren</string>
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
   <string name="paste">Apechen</string>
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
   <string name="replace">Ersetzen\u2026</string>
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
   <string name="delete">Läschen</string>
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
   <string name="copyUrl">URL kopéieren</string>
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
   <string name="selectTextMode">Text auswielen</string>
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
   <string name="textSelectionCABTitle">Textauswiel</string>
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
   <string name="addToDictionary">An den Dictionnaire setzen</string>
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
   <string name="deleteText">Läschen</string>
+  <!-- EditText context menu -->
   <string name="inputMethod">Method fir anzeginn</string>
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
   <string name="editTextMenuTitle">Textaktiounen</string>
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
   <string name="low_internal_storage_view_title">De Späicher huet geschwë keng Plaz méi</string>
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
   <string name="low_internal_storage_view_text">E puer Systemfunktioune funktionéiere vläicht net</string>
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
   <string name="low_internal_storage_view_text_no_boot">Net genuch Späicher fir de System. Stell sécher, datt s de 250MB fräi Späicherplaz hues a start nei.</string>
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
   <string name="app_running_notification_title"><xliff:g id="app_name">%1$s</xliff:g> gëtt ausgeféiert</string>
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
   <string name="app_running_notification_text">Dréck fir méi Informatiounen
         oder fir d\'App unzehalen.</string>
+  <!-- Preference framework strings. -->
   <string name="ok">OK</string>
+  <!-- Preference framework strings. -->
   <string name="cancel">Ofbriechen</string>
+  <!-- Preference framework strings. -->
   <string name="yes">OK</string>
+  <!-- Preference framework strings. -->
   <string name="no">Ofbriechen</string>
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
   <string name="dialog_alert_title">Opgepasst</string>
+  <!-- Text shown by list fragment when waiting for data to display. -->
   <string name="loading">Gëtt gelueden\u2026</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_on">UN</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_off">AUS</string>
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
   <string name="whichApplication">Aktioun duerchféiere mat</string>
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
   <string name="whichApplicationNamed">Aktioun mat %1$s ofschléissen</string>
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
   <string name="whichViewApplication">Opmaache mat</string>
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
   <string name="whichViewApplicationNamed">Opmaache mat %1$s</string>
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
   <string name="whichEditApplication">Ännere mat</string>
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
   <string name="whichEditApplicationNamed">Ännere mat %1$s</string>
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
   <string name="whichSendApplication">Deele mat</string>
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
   <string name="whichSendApplicationNamed">Deele mat %1$s</string>
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
   <string name="whichHomeApplication">Start-App auswielen</string>
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
   <string name="whichHomeApplicationNamed">%1$s als Start-App auswielen</string>
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
   <string name="alwaysUse">Standardméisseg fir dës Aktioun benotzen.</string>
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
   <string name="use_a_different_app">Eng aner App benotzen</string>
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
   <string name="clearDefaultHintMsg">D\'Standardastellunge kënnen ënner \"Astellungen &gt; Appen &gt; Erofgelueden\" geläscht ginn.</string>
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
   <string name="chooseActivity">Wiel eng Aktioun aus</string>
+  <!-- title for the USB activity chooser. -->
   <string name="chooseUsbActivity">Wiel eng App fir den USB-Apparat aus</string>
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
   <string name="noApplications">Dës Aktioun ka vu kenger App duerchgefouert ginn.</string>
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">Leider huet <xliff:g id="application">%1$s</xliff:g> opgehale mat Funktionéieren.</string>
+  <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">Leider gouf de Prozess <xliff:g id="process">%1$s</xliff:g> gestoppt.</string>
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="application">%2$s</xliff:g> äntwert net.\n\nWëlls de d\'App zoumaachen?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_process">D\'Aktivitéit <xliff:g id="activity">%1$s</xliff:g> äntwert net.\n\nWëlls de se zoumaachen?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_application_process"><xliff:g id="application">%1$s</xliff:g> äntwert net.\n\nWëlls de d\'App zoumaachen?</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_process">De Prozess <xliff:g id="activity">%1$s</xliff:g> äntwert net.\n\nWëlls de e zoumaachen?</string>
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
   <string name="force_close">OK</string>
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
   <string name="report">Bericht</string>
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
   <string name="wait">Waart</string>
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
   <string name="webpage_unresponsive">D\'Säit reagéiert net méi.\n\nWëlls de se zoumaachen?</string>
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_title">App ëmgeleet</string>
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_replace"><xliff:g id="app_name">%1$s</xliff:g> leeft elo.</string>
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_original"><xliff:g id="app_name">%1$s</xliff:g> gouf ursprünglech gestart.</string>
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
   <string name="screen_compat_mode_scale">Skaléieren</string>
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
   <string name="screen_compat_mode_show">Ëmmer uweisen</string>
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
   <string name="screen_compat_mode_hint">Reaktivéierung ënner Astellungen &gt; Appen &gt; Erofgelueden.</string>
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
   <string name="smv_application">D\'App <xliff:g id="application">%1$s</xliff:g> (Prozess <xliff:g id="process">%2$s</xliff:g>) huet géint déi selwer operluechte StrictMode-Richtlinne verstouss.</string>
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
   <string name="smv_process">De Prozess <xliff:g id="process">%1$s</xliff:g> huet géint déi selwer operluechte StrictMode-Richtlinne verstouss.</string>
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
   <string name="android_upgrading_title">Android gëtt aktualiséiert\u2026</string>
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
   <string name="android_start_title">Android gëtt gestart\u2026</string>
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
   <string name="android_upgrading_fstrim">Späicher optiméieren.</string>
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
   <string name="android_upgrading_apk">Optiméierung vun der App <xliff:g id="number" example="123">%1$d</xliff:g> / <xliff:g id="number" example="123">%2$d</xliff:g>.</string>
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
   <string name="android_upgrading_starting_apps">Appe gi gestart.</string>
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
   <string name="android_upgrading_complete">Start gëtt ofgeschloss.</string>
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
   <string name="heavy_weight_notification"><xliff:g id="app">%1$s</xliff:g> leeft</string>
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
   <string name="heavy_weight_notification_detail">Drécke fir bei d\'App ze wiesselen</string>
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
   <string name="heavy_weight_switcher_title">Appe wiesselen?</string>
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
   <string name="heavy_weight_switcher_text">Et leeft schonn eng App déi muss gestoppt gi fir eng nei ze starten.</string>
   <string name="old_app_action">Zréck bei <xliff:g id="old_app">%1$s</xliff:g></string>
   <string name="old_app_description">Déi nei App net starten.</string>
   <string name="new_app_action"><xliff:g id="old_app">%1$s</xliff:g> starten</string>
   <string name="new_app_description">Déi al App ouni ze späichere stoppen.</string>
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
   <string name="sendText">Aktioun fir Text auswielen</string>
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
   <string name="volume_ringtone">Schelltounlautstäerkt</string>
+  <!-- Title of the dialog where the user is adjusting the music volume -->
   <string name="volume_music">Medielautstäerkt</string>
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
   <string name="volume_music_hint_playing_through_bluetooth">Iwwer Bluetooth ofspillen</string>
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
   <string name="volume_music_hint_silent_ringtone_selected">Stëlle Schelltoun gesat</string>
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
   <string name="volume_call">Hörerlautstäerkt</string>
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
   <string name="volume_bluetooth_call">Hörerlautstäerkt iwwer Bluetooth</string>
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
   <string name="volume_alarm">Weckerlautstäerkt</string>
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
   <string name="volume_notification">Notifikatiounslautstäerkt</string>
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
   <string name="volume_unknown">Lautstäerkt</string>
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_bluetooth">Bluetooth-Lautstäerkt</string>
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_ringer">Schelltounlautstäerkt</string>
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_incall">Urufflautstäerkt</string>
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_media">Medielautstäerkt</string>
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">Notifikatiounslautstäerkt</string>
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">Standardschelltoun</string>
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <string name="ringtone_default_with_actual">Standard-Schelltoun (<xliff:g id="actual_ringtone">%1$s</xliff:g>)</string>
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
   <string name="ringtone_silent">Keen</string>
+  <!-- The title of the ringtone picker dialog. -->
   <string name="ringtone_picker_title">Schelltéin</string>
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
   <string name="ringtone_unknown">Onbekannte Schelltoun</string>
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <plurals name="wifi_available">
+    <item quantity="one">WLAN-Netzwierk disponibel</item>
+    <item quantity="other">WLAN-Netzwierker disponibel</item>
+  </plurals>
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <plurals name="wifi_available_detailed">
+    <item quantity="one">Oppent WLAN-Netzwierk disponibel</item>
+    <item quantity="other">Oppe WLAN-Netzwierker disponibel</item>
+  </plurals>
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
   <string name="network_available_sign_in_detailed"><xliff:g id="network_ssid">%1$s</xliff:g></string>
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
   <string name="wifi_watchdog_network_disabled">Konnt net mam WLAN connectéieren</string>
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
   <string name="wifi_watchdog_network_disabled_detailed">\u0020huet eng schwaach Internetconnectioun.</string>
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
   <string name="wifi_p2p_dialog_title">Wi-Fi Direct</string>
   <string name="wifi_p2p_turnon_message">Wi-Fi Direct starten. De WLAN-Zougankspunkt gëtt doduerch ausgeschalt.</string>
   <string name="wifi_p2p_failed_message">Konnt Wi-Fi Direct net starten.</string>
@@ -905,83 +1959,219 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <string name="wifi_p2p_frequency_conflict_message" product="tablet">Den Tablet gëtt kuerzzäiteg vum WLAN deconnectéiert während e mat <xliff:g id="device_name">%1$s</xliff:g> verbonnen ass</string>
   <string name="wifi_p2p_frequency_conflict_message" product="tv">D\'Tëlee gëtt kuerzzäiteg vum WLAN deconnectéiert während e mat <xliff:g id="device_name">%1$s</xliff:g> verbonnen ass</string>
   <string name="wifi_p2p_frequency_conflict_message" product="default">Den Telefon gëtt kuerzzäiteg vum WLAN deconnectéiert während e mat <xliff:g id="device_name">%1$s</xliff:g> verbonnen ass</string>
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">Zeechen aginn</string>
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">SMS-Messagë gi geschéckt</string>
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_control_message">&lt;b&gt;<xliff:g id="app_name">%1$s</xliff:g>&lt;/b&gt; verschéckt eng grouss Zuel vun SMSen. Wëlls du der App erlabe weider Messagen ze verschécken?</string>
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_yes">Erlaben</string>
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">Verweigeren</string>
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">&lt;b&gt;<xliff:g id="app_name">%1$s</xliff:g>&lt;/b&gt; wëll e Message un &lt;b&gt;<xliff:g id="dest_address">%2$s</xliff:g>&lt;/b&gt; schécken.</string>
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_details">Doduerch <b>kënne Käschten op denger Mobilrechnung</b> entstoen.</string>
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
   <string name="sms_premium_short_code_details"><b>Doduerch entsti Käschten op dengem Mobilabo.</b></string>
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_allow">Schécken</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_deny">Ofbriechen</string>
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="sms_short_code_remember_choice">Mäi Choix verhalen</string>
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
   <string name="sms_short_code_remember_undo_instruction">Du kanns dat méi spéit ënner Astellungen\u00A0&gt;\u00A0Appen änneren</string>
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_always_allow">Ëmmer erlaben</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">Ni erlaben</string>
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">SIM-Kaart erausgeholl</string>
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
   <string name="sim_removed_message">D\'Mobilnetzwierk ass net disponibel bis de eng gëlteg SIM-Kaart asetz an nei starts.</string>
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
   <string name="sim_done_button">Fäerdeg</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_added_title">SIM-Kaart dobäigesat</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
   <string name="sim_added_message">Start den Handy nei fir op d\'Mobilnetz zouzegräifen.</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
   <string name="sim_restart_button">Nei starten</string>
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
   <string name="time_picker_dialog_title">Zäit setzen</string>
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
   <string name="date_picker_dialog_title">Datum setzen</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_set">Setzen</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_done">Fäerdeg</string>
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
   <string name="perms_new_perm_prefix"><font size="12" fgcolor="#ff33b5e5">NEI: </font></string>
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
   <string name="perms_description_app">Zur Verfügung gestallt vu(n) <xliff:g id="app_name">%1$s</xliff:g>.</string>
+  <!-- Shown for an application when it doesn't require any permission grants. -->
   <string name="no_permissions">Keng Berechtegungen néideg</string>
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
   <string name="perm_costs_money">dëst kéint dech Sue kaschten</string>
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
   <string name="usb_storage_activity_title">USB-Massespäicher</string>
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
   <string name="usb_storage_title">USB connectéiert</string>
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_message" product="nosdcard">Du hues den Apparat iwwer USB un däi Computer ugeschloss. Dréck de Knäppchen hei drënner wann s du Fichieren tëscht dengem Computer an dem USB-Späicher vun dengem Android-Apparat wëlls kopéieren.</string>
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_message" product="default">Du hues den Apparat iwwer USB un däi Computer ugeschloss. Dréck de Knäppchen hei drënner wann s du Fichieren tëscht dengem Computer an der SD-Kaart vun dengem Android-Apparat wëlls kopéieren.</string>
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
   <string name="usb_storage_button_mount">USB-Späicher aktivéieren</string>
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_error_message" product="nosdcard">Beim Versuch däin USB-Späicher als USB-Massespäicher ze benotze gouf et e Problem.</string>
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
   <string name="usb_storage_error_message" product="default">Beim Versuch deng SD-Kaart als USB-Massespäicher ze benotze gouf et e Problem.</string>
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
   <string name="usb_storage_notification_title">USB connectéiert</string>
+  <!-- See USB_STORAGE. This is the message. -->
   <string name="usb_storage_notification_message">Dréck fir Fichiere vum/op de Computer ze kopéieren.</string>
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
   <string name="usb_storage_stop_notification_title">USB-Späicher desaktivéieren</string>
+  <!-- See USB_STORAGE. This is the message. -->
   <string name="usb_storage_stop_notification_message">Dréck fir den USB-Späicher auszeschalten.</string>
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
   <string name="usb_storage_stop_title">USB-Späicher gëtt benotzt</string>
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_stop_message" product="nosdcard">Ier s de den USB-Späicher ausschalts, trenn (\"ejectéieren\") dengem Android säin USB-Späicher vum Computer.</string>
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
   <string name="usb_storage_stop_message" product="default">Ier s de den USB-Späicher ausschalts, trenn (\"ejectéieren\") dengem Android seng SD-Kaart vum Computer.</string>
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
   <string name="usb_storage_stop_button_mount">USB-Späicher desaktivéieren</string>
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
   <string name="usb_storage_stop_error_message">Et gouf e Problem beim Ausschalte vum USB-Späicher. Kontrolléier datt den USB-Host getrennt gouf a probéier nees.</string>
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
   <string name="dlg_confirm_kill_storage_users_title">USB-Späicher aktivéieren</string>
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
   <string name="dlg_confirm_kill_storage_users_text">Wann s du den USB-Späicher uschalts kéinte verschidden Appen ophale mat funktionéiere bis de den USB-Späicher nees ausschalts.</string>
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
   <string name="dlg_error_title">USB-Operatioun feelgeschloen</string>
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
   <string name="dlg_ok">OK</string>
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <string name="usb_charging_notification_title">USB fir ze lueden</string>
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
   <string name="usb_accessory_notification_title">Als USB-Accessoire verbonnen</string>
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
   <string name="adb_active_notification_title">USB-Debugging verbonnen</string>
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
   <string name="adb_active_notification_message">Dréck fir USB-Debugging auszeschalten.</string>
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
   <string name="select_input_method">Tastatur wiesselen</string>
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
   <string name="configure_input_methods">Tastaturen auswielen</string>
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
   <string name="show_ime">Method fir anzeginn uweisen</string>
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
   <string name="hardware">Hardware</string>
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <string name="select_keyboard_layout_notification_title">Tastaturlayout auswielen</string>
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <string name="select_keyboard_layout_notification_message">Dréck fir den Tastaturlayout auszewielen.</string>
   <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>Kandidaten</u></string>
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
   <string name="ext_media_status_checking">Iwwerpréiwung\u2026</string>
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
   <string name="activity_list_empty">Keng passend Aktivitéit fonnt.</string>
-  <string name="permlab_route_media_output">Medienausgab ëmleeden</string>
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
   <string name="permdesc_route_media_output">Erlaabt der App, d\'Medienausgab un extern Apparater weiderzeleeden.</string>
-  <string name="permlab_readInstallSessions">Installatiounssëtzunge liesen</string>
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
   <string name="permdesc_readInstallSessions">Erlaabt der App, Installatiounssëtzungen ze liesen. Dat erméiglecht der App, Detailer iwwer Päck ze gesinn, déi grad installéiert ginn.</string>
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
   <string name="tutorial_double_tap_to_zoom_message_short">Zweemol drécke fir d\'Zoomastellungen</string>
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
   <string name="gadget_host_error_inflating">Konnt de Widget net dobäisetzen.</string>
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
   <string name="ime_action_go">Lass</string>
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
   <string name="ime_action_search">Sichen</string>
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
   <string name="ime_action_send">Schécken</string>
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
   <string name="ime_action_next">Weider</string>
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
   <string name="ime_action_done">Fäerdeg</string>
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
   <string name="ime_action_previous">Zréck</string>
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <string name="ime_action_default">Ausféieren</string>
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using">Nummer\nmat <xliff:g id="number" example="555">%s</xliff:g> auswielen</string>
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <string name="create_contact_using">Neie Kontakt\nmat <xliff:g id="number" example="555">%s</xliff:g> erstellen</string>
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
   <string name="grant_credentials_permission_message_header">Dës Appe brauchen eng Berechtegung fir elo an an Zukunft op däi Kont zouzegräifen.</string>
   <string name="grant_credentials_permission_message_footer">Wëlls du dës Ufro erlaben?</string>
   <string name="grant_permissions_header_text">Zougrëffsufro</string>
@@ -989,338 +2179,794 @@ Wann \"Drécken an Endecken\" aktivéiert ass, kanns du Beschreiwunge vun Elemen
   <string name="deny">Verweigeren</string>
   <string name="permission_request_notification_title">Erlaabnesufro</string>
   <string name="permission_request_notification_with_subtitle">Erlaabnes ugefrot\nfir de Kont <xliff:g id="account" example="foo@gmail.com">%s</xliff:g>.</string>
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
   <string name="forward_intent_to_owner">Du benotz dës App ausserhalb vun dengem Aarbechtsprofil</string>
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
   <string name="forward_intent_to_work">Du benotz dës App an dengem Aarbechtsprofil</string>
+  <!-- Label to show for a service that is running because it is an input method. -->
   <string name="input_method_binding_label">Method fir anzeginn</string>
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
   <string name="sync_binding_label">Sync</string>
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
   <string name="accessibility_binding_label">Accessibilitéit</string>
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
   <string name="wallpaper_binding_label">Hannergrondbild</string>
+  <!-- Dialog title for user to select a different wallpaper from service list -->
   <string name="chooser_wallpaper">Hannergrondbild änneren</string>
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
   <string name="notification_listener_binding_label">Notifikatiouns-Nolauschterer</string>
+  <!-- Label to show for a service that is running because it is providing conditions. -->
   <string name="condition_provider_service_binding_label">Konditiounsubidder</string>
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
   <string name="vpn_title">VPN aktivéiert</string>
+  <!-- The title of the notification when VPN is active with an application name. -->
   <string name="vpn_title_long">VPN ass aktivéiert vum <xliff:g id="app" example="FooVPN client">%s</xliff:g></string>
+  <!-- The text of the notification when VPN is active. -->
   <string name="vpn_text">Dréck fir d\'Netzwierk ze geréieren.</string>
+  <!-- The text of the notification when VPN is active with a session name. -->
   <string name="vpn_text_long">Verbonne mat <xliff:g id="session" example="office">%s</xliff:g>. Dréck fir d\'Netzwierk ze geréieren.</string>
+  <!-- Notification title when connecting to lockdown VPN. -->
   <string name="vpn_lockdown_connecting">Permanent aktive VPN gëtt connectéiert\u2026</string>
+  <!-- Notification title when connected to lockdown VPN. -->
   <string name="vpn_lockdown_connected">Permanent aktive VPN connectéiert</string>
+  <!-- Notification title when error connecting to lockdown VPN. -->
   <string name="vpn_lockdown_error">Feeler beim permanent aktive VPN</string>
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
   <string name="vpn_lockdown_config">Dréck fir anzestellen</string>
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
   <string name="upload_file">Fichier auswielen</string>
+  <!-- Label for the file upload control when no file has been chosen yet -->
   <string name="no_file_chosen">Kee Fichier ausgewielt</string>
+  <!-- Label for <input type="reset"> button in html -->
   <string name="reset">Zrécksetzen</string>
+  <!-- Label for <input type="submit"> button in html -->
   <string name="submit">Schécken</string>
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
   <string name="car_mode_disable_notification_title">Automodus aktivéiert</string>
   <string name="car_mode_disable_notification_message">Dréck fir den Automodus auszemaachen.</string>
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
   <string name="tethered_notification_title">Tethering oder Zougankspunkt aktiv</string>
   <string name="tethered_notification_message">Fir ze setzen drécken.</string>
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
   <string name="back_button_label">Zréck</string>
   <string name="next_button_label">Weider</string>
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
   <string name="skip_button_label">Iwwersprangen</string>
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
   <string name="no_matches">Keng Treffer</string>
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
   <string name="find_on_page">Op der Säit fannen</string>
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <plurals name="matches_found">
+    <!-- Case of one match -->
+    <item quantity="one">1 Treffer</item>
+    <!-- Case of multiple total matches -->
+    <item quantity="other"><xliff:g id="index" example="2">%d</xliff:g> vu(n) <xliff:g id="total" example="137">%d</xliff:g></item>
+  </plurals>
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
   <string name="action_mode_done">Fäerdeg</string>
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
   <string name="progress_erasing" product="nosdcard">Den USB-Späicher gëtt geläscht\u2026</string>
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
   <string name="progress_erasing" product="default">SD-Kaart gëtt geläscht\u2026</string>
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
   <string name="share">Deelen</string>
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
   <string name="find">Sichen</string>
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
   <string name="websearch">Websich</string>
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
   <string name="find_next">Weidersichen</string>
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
   <string name="find_previous">Resultat virdrun</string>
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
   <string name="gpsNotifTicker">Standuertoffro vu(n) <xliff:g id="name">%s</xliff:g></string>
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
   <string name="gpsNotifTitle">Standuertoffro</string>
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
   <string name="gpsNotifMessage">Ugefrot vum <xliff:g id="name">%1$s</xliff:g> (<xliff:g id="service" example="SUPL-service">%2$s</xliff:g>)</string>
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
   <string name="gpsVerifYes">Jo</string>
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
   <string name="gpsVerifNo">Nee</string>
+  <!-- Error message when the sync tried to delete too many things -->
   <string name="sync_too_many_deletes">Läschlimitt erreecht</string>
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
   <string name="sync_too_many_deletes_desc">Et ginn <xliff:g id="number_of_deleted_items">%1$d</xliff:g> geläschten Elementer fir <xliff:g id="type_of_sync">%2$s</xliff:g>, Kont <xliff:g id="account_name">%3$s</xliff:g>. Wat wëlls du maachen?</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
   <string name="sync_really_delete">Elementer läschen</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
   <string name="sync_undo_deletes">Läschen zrécksetzen</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
   <string name="sync_do_nothing">Am Moment näischt maachen</string>
+  <!-- Choose Account Activity label -->
   <string name="choose_account_label">E Kont auswielen</string>
   <string name="add_account_label">"E Kont dobäisetzen"</string>
+  <!-- List item to add an account [CHAR LIMIT=20] -->
   <string name="add_account_button_label">Kont dobäisetzen</string>
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_button">Eropsetzen</string>
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
   <string name="number_picker_decrement_button">Erofsetzen</string>
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_scroll_mode"><xliff:g id="value" example="3">%s</xliff:g> drécken an unhalen.</string>
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_scroll_action">Eropwësche fir z\'erhéijen, erofwësche fir ze reduzéieren.</string>
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_minute_button">Minutt eropsetzen</string>
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_minute_button">Minutt erofsetzen</string>
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_hour_button">Stonn eropsetzen</string>
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_hour_button">Stonn erofsetzen</string>
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_set_pm_button">PM-Wäert setzen</string>
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_set_am_button">AM-Wäert setzen</string>
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_month_button">Mount eropsetzen</string>
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_month_button">Mount erofsetzen</string>
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_day_button">Dag eropsetzen</string>
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_day_button">Dag erofsetzen</string>
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_year_button">Joer eropsetzen</string>
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_year_button">Joer erofsetzen</string>
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_alt">Alt</string>
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_cancel">Ofbriechen</string>
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Läschen</string>
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_done">Fäerdeg</string>
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_mode_change">Modusännerung</string>
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_shift">Shift</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_enter">Enter</string>
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
   <string name="activitychooserview_choose_application">App auswielen</string>
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
   <string name="activitychooserview_choose_application_error">Konnt <xliff:g id="application_name" example="Acme">%s</xliff:g> net starten</string>
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
   <string name="shareactionprovider_share_with">Deele mat</string>
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
   <string name="shareactionprovider_share_with_application">Deele mat <xliff:g id="application_name" example="Bluetooth">%s</xliff:g></string>
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="content_description_sliding_handle">"Wëschgrëff. Drécken an halen."</string>
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
   <string name="description_target_unlock_tablet">Wësche fir z\'entspären.</string>
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
   <string name="keyboard_headset_required_to_hear_password">Schléiss en Headset u fir d\'Passwuerttaste virgelies ze kréien.</string>
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
   <string name="keyboard_password_character_no_headset">Punkt.</string>
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
   <string name="action_bar_home_description">Heem navigéieren</string>
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
   <string name="action_bar_up_description">Erop navigéieren</string>
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
   <string name="action_menu_overflow_description">Méi Optiounen</string>
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
   <string name="action_bar_home_description_format">%1$s. %2$s</string>
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
   <string name="action_bar_home_subtitle_description_format">%1$s, %2$s. %3$s</string>
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
   <string name="storage_internal">Interne Späicher</string>
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
   <string name="storage_sd_card">SD-Kaart</string>
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
   <string name="storage_usb">USB-Späicher</string>
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_warning_title">Dateverbrauchswarnung</string>
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_warning_body">Drécke fir Verbrauch an Astellungen unzeweisen.</string>
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_3g_limit_title">2G/3G Datelimitt erreecht</string>
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_4g_limit_title">4G Datelimitt erreecht</string>
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_mobile_limit_title">Mobil Datelimitt erreecht</string>
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_wifi_limit_title">WLAN-Datelimitt erreecht</string>
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
   <string name="data_usage_limit_body">Date pauséiert fir de Rescht vum Zyklus</string>
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_3g_limit_snoozed_title">2G- an 3G-Datelimitt iwwerschratt</string>
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_4g_limit_snoozed_title">4G-Datelimitt iwwerschratt</string>
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_mobile_limit_snoozed_title">Mobil Datelimitt iwwerschratt</string>
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_wifi_limit_snoozed_title">Wi-Fi-Datelimitt iwwerschratt</string>
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_limit_snoozed_body"><xliff:g id="size" example="3.8GB">%s</xliff:g> iwwer der definéierter Limitt.</string>
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
   <string name="data_usage_restricted_title">Hannergronddaten ageschränkt</string>
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
   <string name="data_usage_restricted_body">Drécke fir d\'Restriktiounen opzehiewen.</string>
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
   <string name="ssl_certificate">Sécherheetszertifikat</string>
+  <!-- Message on an SSL Certificate dialog -->
   <string name="ssl_certificate_is_valid">Dëst Zertifikat ass gëlteg.</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_to">Ausgestallt fir:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="common_name">Allgemengen Numm:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="org_name">Organisatioun:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="org_unit">Eenheet an der Organisatioun:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_by">Ausgestallt vun:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="validity_period">Gëltegkeet:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_on">Ausgestallt den:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="expires_on">Leeft of den:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="serial_number">Seriennummer:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="fingerprints">Fangerofdréck:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="sha256_fingerprint">SHA-256-Fangerofdrock:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="sha1_fingerprint">SHA-1-Fangerofdrock:</string>
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
   <string name="activity_chooser_view_see_all">All uweisen</string>
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
   <string name="activity_chooser_view_dialog_title_default">Aktivitéit auswielen</string>
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
   <string name="share_action_provider_share_with">Deele mat</string>
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
   <string name="list_delimeter">", "</string>
+  <!-- STK sending DTMF, SMS, USSD, SS -->
   <string name="sending">Gëtt geschéckt\u2026</string>
+  <!-- STK launch Browser -->
   <string name="launchBrowserDefault">Browser starten?</string>
+  <!-- STK setup Call -->
   <string name="SetupCallDefault">Uruff unhuelen?</string>
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_always">Ëmmer</string>
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_once">Just eemol</string>
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
   <string name="activity_resolver_work_profiles_support">%1$s ënnerstëtzt keen Aarbechtsprofil</string>
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="tablet">Tablet</string>
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="tv">Tëlee</string>
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="default">Telefon</string>
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name_headphones">Kopfhörer</string>
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name_dock_speakers">Dock-Lautsprecher</string>
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
   <string name="default_media_route_name_hdmi">HDMI</string>
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
   <string name="default_audio_route_category_name">System</string>
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
   <string name="bluetooth_a2dp_audio_route_name">Bluetooth-Audio</string>
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
   <string name="wireless_display_route_description">Kabellose Schierm</string>
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
   <string name="media_route_button_content_description">Iwwerdroen</string>
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
   <string name="media_route_chooser_title">Mat Apparat verbannen</string>
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
   <string name="media_route_chooser_title_for_remote_display">Schierm op Apparat iwwerdroen</string>
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
   <string name="media_route_chooser_searching">Et gëtt no Apparater gesicht\u2026</string>
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
   <string name="media_route_chooser_extended_settings">Astellungen</string>
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
   <string name="media_route_controller_disconnect">Deconnectéieren</string>
+  <!-- Status message for remote routes attempting to scan/determine availability -->
   <string name="media_route_status_scanning">Gëtt gescannt...</string>
+  <!-- Status message for a remote route attempting to connect -->
   <string name="media_route_status_connecting">Gëtt connectéiert...</string>
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
   <string name="media_route_status_available">Disponibel</string>
+  <!-- Status message for remote routes that are not available for connection right now -->
   <string name="media_route_status_not_available">Net disponibel</string>
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
   <string name="media_route_status_in_use">Gëtt benotzt</string>
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
   <string name="display_manager_built_in_display_name">Agebaute Schierm</string>
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
   <string name="display_manager_hdmi_display_name">HDMI-Schierm</string>
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
   <string name="display_manager_overlay_display_name">Overlay #<xliff:g id="id">%1$d</xliff:g></string>
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
   <string name="display_manager_overlay_display_title"><xliff:g id="name">%1$s</xliff:g>: <xliff:g id="width">%2$d</xliff:g>x<xliff:g id="height">%3$d</xliff:g>, <xliff:g id="dpi">%4$d</xliff:g> dpi</string>
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
   <string name="display_manager_overlay_display_secure_suffix">, sécher</string>
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">Muster vergiess</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">Falscht Muster</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">Falscht Passwuert</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">Falsche PIN</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown">Probéier nees a(n) <xliff:g id="number">%1$d</xliff:g> Sekonnen.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">Mol däi Muster</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">SIM-PIN aginn</string>
+  <!-- Instructions for using the PIN unlock screen -->
   <string name="kg_pin_instructions">PIN aginn</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">Passwuert aginn</string>
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint">D\'SIM ass elo desaktivéiert. Gëff e PUK-Code a fir weiderzemaachen. Kontaktéier däi Provider fir Detailer.</string>
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
   <string name="kg_puk_enter_pin_hint">Gëff de gewënschte PIN-Code an</string>
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
   <string name="kg_enter_confirm_pin_hint">Bestäteg de gewënschte PIN-Code</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">D\'SIM-Kaart gëtt entspaart\u2026</string>
+  <!-- Message shown when the user enters the wrong PIN code -->
   <string name="kg_password_wrong_pin_code">Falsche PIN-Code.</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">Gëff e PIN an, deen tëscht 4 an 8 Zifferen huet.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
   <string name="kg_invalid_sim_puk_hint">De PUK-Code sollt 8 Ziffere laang sinn.</string>
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">Gëff de korrekte PUK-Code nees an. Bei widderhuelende Versich gëtt d\'SIM permanent desaktivéiert.</string>
+  <!-- String shown in PUK screen when PIN codes don't match -->
   <string name="kg_invalid_confirm_pin_hint" product="default">D\'PIN-Codë stëmmen net iwwereneen</string>
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
   <string name="kg_login_too_many_attempts">Zevill Muster-Versich</string>
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
   <string name="kg_login_instructions">Fir z\'entspären, mell dech mat dengem Google-Kont un.</string>
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_username_hint">Benotzernumm (E-Mail)</string>
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_password_hint">Passwuert</string>
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
   <string name="kg_login_submit_button">Aloggen</string>
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
   <string name="kg_login_invalid_input">Ongëltege Benotzernumm oder Passwuert.</string>
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
   <string name="kg_login_account_recovery_hint">Benotzernumm oder Passwuert vergiess\?\nBesich <b>google.com/accounts/recovery</b>.</string>
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
   <string name="kg_login_checking_password">Kont gëtt iwwerpréift\u2026</string>
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
   <string name="kg_too_many_failed_pin_attempts_dialog_message">Du hues däi PIN <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
   <string name="kg_too_many_failed_password_attempts_dialog_message">Du hues däi Passwuert <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
   <string name="kg_too_many_failed_pattern_attempts_dialog_message">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Tablet op d\'Wierksastellungen zréckgesat an all d\'Benotzerdate gi verluer.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="tv">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht d\'Tëlee z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Telefon op d\'Wierksastellungen zréckgesat an all d\'Benotzerdate gi verluer.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Telefon op d\'Wierksastellungen zréckgesat an all d\'Benotzerdate gi verluer.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. E gëtt elo op d\'Wierksastellungen zréckgesat.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="tv">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht d\'Tëlee z\'entspären. E gëtt elo op d\'Wierksastellungen zréckgesat.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. E gëtt elo op d\'Wierksastellungen zréckgesat.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tablet">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gezeechent. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëss de gefrot däin Tablet mat engem E-Mail-Kont z\'entspären.\n\nProbéier a(n) <xliff:g id="number">%d</xliff:g> Sekonnen nees.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tv">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt. No <xliff:g id="number">%d</xliff:g> weidere feelsgeschloene Versich gëss du gefrot deng Tëlee duerch en E-Mail-Kont z\'entspären. Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="default">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gezeechent. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëss de gefrot däin Telefon mat engem E-Mail-Kont z\'entspären.\n\nProbéier a(n) <xliff:g id="number">%d</xliff:g> Sekonnen nees.</string>
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
   <string name="kg_text_message_separator" product="default">" \u2014 "</string>
+  <!-- The delete-widget drop target button text -->
   <string name="kg_reordering_delete_drop_target_text">Ewechhuelen</string>
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
   <string name="safe_media_volume_warning" product="default">D\'Lautstäerkt iwwer de recommandéierten Niveau erhéijen?\n\nIwwer laang Periode bei héijer Lautstäerkt Musek lauschtere kéint däi Gehéier schiedegen.</string>
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
   <string name="continue_to_enable_accessibility">Mat zwee Fangeren drécke fir d\'Benotzungshëllefen z\'aktivéieren.</string>
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
   <string name="accessibility_enabled">Accessibilitéit aktivéiert.</string>
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
   <string name="enable_accessibility_canceled">Accessibilitéit ofgebrach.</string>
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
   <string name="user_switched">Aktuelle Benotzer <xliff:g id="name" example="Bob">%1$s</xliff:g>.</string>
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
   <string name="user_switching_message">Wiesselen op de Benotzer <xliff:g id="name" example="Bob">%1$s</xliff:g>\u2026</string>
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
   <string name="owner_name" msgid="3879126011135546571">Besëtzer</string>
+  <!-- Error message title [CHAR LIMIT=35] -->
   <string name="error_message_title">Feeler</string>
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
   <string name="error_message_change_not_allowed">Dës Ännerung ass duerch däin Administrateur net erlaabt</string>
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
   <string name="app_not_found">Et gouf keng Applikatioun fonnt fir dës Aktioun auszeféieren</string>
   <string name="revoke">Zréckzéien</string>
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
   <string name="mediasize_iso_a0">ISO A0</string>
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
   <string name="mediasize_iso_a1">ISO A1</string>
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
   <string name="mediasize_iso_a2">ISO A2</string>
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
   <string name="mediasize_iso_a3">ISO A3</string>
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
   <string name="mediasize_iso_a4">ISO A4</string>
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
   <string name="mediasize_iso_a5">ISO A5</string>
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
   <string name="mediasize_iso_a6">ISO A6</string>
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
   <string name="mediasize_iso_a7">ISO A7</string>
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
   <string name="mediasize_iso_a8">ISO A8</string>
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
   <string name="mediasize_iso_a9">ISO A9</string>
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
   <string name="mediasize_iso_a10">ISO A10</string>
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
   <string name="mediasize_iso_b0">ISO B0</string>
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
   <string name="mediasize_iso_b1">ISO B1</string>
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
   <string name="mediasize_iso_b2">ISO B2</string>
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
   <string name="mediasize_iso_b3">ISO B3</string>
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
   <string name="mediasize_iso_b4">ISO B4</string>
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
   <string name="mediasize_iso_b5">ISO B5</string>
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
   <string name="mediasize_iso_b6">ISO B6</string>
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
   <string name="mediasize_iso_b7">ISO B7</string>
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
   <string name="mediasize_iso_b8">ISO B8</string>
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
   <string name="mediasize_iso_b9">ISO B9</string>
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
   <string name="mediasize_iso_b10">ISO B10</string>
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
   <string name="mediasize_iso_c0">ISO C0</string>
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
   <string name="mediasize_iso_c1">ISO C1</string>
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
   <string name="mediasize_iso_c2">ISO C2</string>
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
   <string name="mediasize_iso_c3">ISO C3</string>
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
   <string name="mediasize_iso_c4">ISO C4</string>
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
   <string name="mediasize_iso_c5">ISO C5</string>
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
   <string name="mediasize_iso_c6">ISO C6</string>
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
   <string name="mediasize_iso_c7">ISO C7</string>
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
   <string name="mediasize_iso_c8">ISO C8</string>
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
   <string name="mediasize_iso_c9">ISO C9</string>
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
   <string name="mediasize_iso_c10">ISO C10</string>
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
   <string name="mediasize_na_letter">Letter</string>
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
   <string name="mediasize_na_gvrnmt_letter">Government Letter</string>
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
   <string name="mediasize_na_legal">Legal</string>
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
   <string name="mediasize_na_junior_legal">Junior Legal</string>
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
   <string name="mediasize_na_ledger">Ledger</string>
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
   <string name="mediasize_na_tabloid">Tabloid</string>
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
   <string name="mediasize_na_index_3x5">Index Card 3x5</string>
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
   <string name="mediasize_na_index_4x6">Index Card 4x6</string>
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
   <string name="mediasize_na_index_5x8">Index Card 5x8</string>
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
   <string name="mediasize_na_monarch">Monarch</string>
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
   <string name="mediasize_na_quarto">Quarto</string>
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
   <string name="mediasize_na_foolscap">Foolscap</string>
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
   <string name="mediasize_chinese_roc_8k">ROC 8K</string>
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
   <string name="mediasize_chinese_roc_16k">ROC 16K</string>
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
   <string name="mediasize_chinese_prc_1">PRC 1</string>
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
   <string name="mediasize_chinese_prc_2">PRC 2</string>
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
   <string name="mediasize_chinese_prc_3">PRC 3</string>
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
   <string name="mediasize_chinese_prc_4">PRC 4</string>
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
   <string name="mediasize_chinese_prc_5">PRC 5</string>
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
   <string name="mediasize_chinese_prc_6">PRC 6</string>
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
   <string name="mediasize_chinese_prc_7">PRC 7</string>
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
   <string name="mediasize_chinese_prc_8">PRC 8</string>
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
   <string name="mediasize_chinese_prc_9">PRC 9</string>
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
   <string name="mediasize_chinese_prc_10">PRC 10</string>
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_prc_16k">PRC 16K</string>
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_om_pa_kai">Pa Kai</string>
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_dai_pa_kai">Dai Pa Kai</string>
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_jurro_ku_kai">Jurro Ku Kai</string>
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
   <string name="mediasize_japanese_jis_b10">JIS B10</string>
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
   <string name="mediasize_japanese_jis_b9">JIS B9</string>
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
   <string name="mediasize_japanese_jis_b8">JIS B8</string>
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
   <string name="mediasize_japanese_jis_b7">JIS B7</string>
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
   <string name="mediasize_japanese_jis_b6">JIS B6</string>
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
   <string name="mediasize_japanese_jis_b5">JIS B5</string>
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
   <string name="mediasize_japanese_jis_b4">JIS B4</string>
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
   <string name="mediasize_japanese_jis_b3">JIS B3</string>
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
   <string name="mediasize_japanese_jis_b2">JIS B2</string>
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
   <string name="mediasize_japanese_jis_b1">JIS B1</string>
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
   <string name="mediasize_japanese_jis_b0">JIS B0</string>
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
   <string name="mediasize_japanese_jis_exec">JIS Exec</string>
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
   <string name="mediasize_japanese_chou4">Chou4</string>
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
   <string name="mediasize_japanese_chou3">c</string>
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
   <string name="mediasize_japanese_chou2">Chou2</string>
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
   <string name="mediasize_japanese_hagaki">Hagaki </string>
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
   <string name="mediasize_japanese_oufuku">Oufuku </string>
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
   <string name="mediasize_japanese_kahu">Kahu</string>
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
   <string name="mediasize_japanese_kaku2">Kaku2</string>
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
   <string name="mediasize_japanese_you4">You4</string>
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
   <string name="mediasize_unknown_portrait">Onbekannt Héichformat</string>
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
   <string name="mediasize_unknown_landscape">Onbekannt Queeschformat</string>
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
   <string name="write_fail_reason_cancelled">Ofgebrach</string>
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
   <string name="write_fail_reason_cannot_write">Feeler beim Schreiwe vum Inhalt</string>
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
   <string name="reason_unknown">onbekannt</string>
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
   <string name="reason_service_unavailable">Dréck-Service net aktivéiert</string>
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
   <string name="print_service_installed_title"><xliff:g id="name" example="Cloud Print">%s</xliff:g> Service installéiert</string>
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
   <string name="print_service_installed_message">Dréck fir z\'aktivéieren</string>
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_admin_pin">Administrateur-PIN aginn</string>
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_pin">PIN aginn</string>
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
   <string name="restr_pin_incorrect">Inkorrekt</string>
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_old_pin">Aktuell PIN</string>
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_new_pin">Nei PIN</string>
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
   <string name="restr_pin_confirm_pin">Nei PIN bestätegen</string>
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
   <string name="restr_pin_create_pin">PIN fir d\'Ännerung vun Aschränkungen uleeën</string>
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
   <string name="restr_pin_error_doesnt_match">D\'PINe stëmmen net iwwereneen. Probéier nees w.e.g..</string>
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
   <string name="restr_pin_error_too_short">De PIN ass ze kuerz. E muss mindestens 4 Zifferen hunn.</string>
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <plurals name="restr_pin_countdown">
+    <item quantity="one">Probéier nees an 1 Sekonn</item>
+    <item quantity="other">Probéier nees a(n) <xliff:g id="count">%d</xliff:g> Sekonnen</item>
+  </plurals>
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
   <string name="restr_pin_try_later">Probéier méi spéit nees</string>
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
   <string name="done_label">Fäerdeg</string>
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
   <string name="hour_picker_description">Kreesfërmege Regeler fir Stonnen</string>
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
   <string name="minute_picker_description">Kreesfërmege Regeler fir Minutten</string>
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
   <string name="select_hours">Stonnen auswielen</string>
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
   <string name="select_minutes">Minutten auswielen</string>
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
   <string name="select_day">Mount an Dag auswielen</string>
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
   <string name="select_year">Joer auswielen</string>
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
   <string name="deleted_key"><xliff:g id="key" example="4">%1$s</xliff:g> geläscht</string>
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
   <string name="managed_profile_label_badge"><xliff:g id="label" example="Email">%1$s</xliff:g> (Aarbecht)</string>
+  <!-- DO NOT TRANSLATE -->
   <string name="time_placeholder">--</string>
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
   <string name="lock_to_app_toast">Hal \"Zréck\" an \"Iwwersiicht\" matenee gedréckt fir dëse Schierm fräizeginn.</string>
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
   <string name="lock_to_app_toast_accessible">Hal \"Iwwersiicht\" gedréckt fir dëse Schierm fräizeginn.</string>
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
   <string name="lock_to_app_start">Schierm fixéiert</string>
+  <!-- Exting lock-to-app indication. -->
   <string name="lock_to_app_exit">Schierm fräiginn</string>
+  <!-- Lock-to-app unlock pin string -->
   <string name="lock_to_app_unlock_pin">E PIN froe fir e Schierm fräizeginn</string>
+  <!-- Lock-to-app unlock pattern string -->
   <string name="lock_to_app_unlock_pattern">En Entspärmuster froe fir e Schierm fräizeginn</string>
+  <!-- Lock-to-app unlock password string -->
   <string name="lock_to_app_unlock_password">E Passwuert froe fir e Schierm fräizeginn</string>
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
   <string name="battery_saver_description">Den Energiespuermodus schount den Akku, andeem en d\'Leeschtung vum Apparat reduzéiert, d\'Vibratioun limitéiert an déi meescht Hannergronddatenaktivitéiten aschränkt. E-Mail, Messagen an aner Appen, déi op dengem Apparat synchroniséieren, gi méiglecherweis eréischt nom Opmaachen aktualiséiert.\n\nDen Energiespuermodus gëtt automatesch desaktivéiert, wann däin Apparat opgeluede gëtt.</string>
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_minutes_summary">
+    <item quantity="one">Fir eng Minutt (bis <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    <item quantity="other">Fir %1$d Minutten (bis <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+  </plurals>
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_hours_summary">
+    <item quantity="one">Fir eng Stonn (bis <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+    <item quantity="other">Fir %1$d Stonnen (bis <xliff:g id="formattedTime" example="10:00 PM">%2$s</xliff:g>)</item>
+  </plurals>
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_minutes">
+    <item quantity="one">Fir eng Minutt</item>
+    <item quantity="other">Fir %d Minutten</item>
+  </plurals>
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <plurals name="zen_mode_duration_hours">
+    <item quantity="one">Fir eng Stonn</item>
+    <item quantity="other">Fir %d Stonnen</item>
+  </plurals>
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
   <string name="zen_mode_until">Bis <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g></string>
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
   <string name="toolbar_collapse_description">Zouklappen</string>
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
   <string name="zen_mode_feature_name">Net stéieren</string>
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
   <string name="muted_by">Roueg gestallt duerch <xliff:g id="third_party">%1$s</xliff:g></string>
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
   <string name="system_error_wipe_data">Mat dengem Apparat ass en interne Problem opgetrueden. Wann e sech instabil behuelt muss du en op d\'Wierksastellungen zrécksetzen.</string>
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
   <string name="system_error_manufacturer">Mat dengem Apparat ass en interne Problem opgetrueden. Kontaktéier däin Hiersteller fir méi Detailer.</string>
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
   <string name="stk_cc_ussd_to_dial">D\'USSD-Ufro gouf an eng DIAL-Ufro ëmgewandelt.</string>
   <string name="stk_cc_ussd_to_ss">D\'USSD-Ufro gouf an eng SS-Ufro ëmgewandelt.</string>
   <string name="stk_cc_ussd_to_ussd">D\'USSD-Ufro gouf an eng nei USSD-Ufro ëmgewandelt.</string>
   <string name="stk_cc_ss_to_dial">D\'SS-Ufro gouf an eng DIAL-Ufro ëmgewandelt.</string>
   <string name="stk_cc_ss_to_ussd">D\'SS-Ufro gouf an eng USSD-Ufro ëmgewandelt.</string>
   <string name="stk_cc_ss_to_ss">D\'SS-Ufro gouf an eng nei SS-Ufro ëmgewandelt.</string>
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
   <string name="floating_toolbar_open_overflow_description">Méi Optiounen</string>
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
 </resources>
diff --git a/core/res/res/values-lo-rLA/cm_strings.xml b/core/res/res/values-lo-rLA/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-lo-rLA/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-lt/cm_strings.xml b/core/res/res/values-lt/cm_strings.xml
index b4877ac..d30676f 100644
--- a/core/res/res/values-lt/cm_strings.xml
+++ b/core/res/res/values-lt/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Ekrano kopija</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">gauti apsaugotus SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Leidžia programai gauti įeinančius apsaugotus SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">keisti apsaugotų SMS sąrašą</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Leidžia programai keisti apsaugotų SMS adresų sąrašą.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sauga</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Leidimai susiję su įrenginio saugumo informacija.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">skaityti telefono juodąjį sąrašą</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Leidžia programai skaityti informaciją apie telefono numerius kurie yra užblokuoti dėl įeinančių skambučių ar pranešimų.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">pakeisti telefono juodąjį sąrašą</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Leidžia programai keisti telefono numerius kurie yra užblokuoti dėl įeinančių skambučių ar pranešimų.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">nustatyti klaviatūros apsaugos foną</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Leidžia programai pakeisti ekrano užrakto foną.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Paleisti iš naujo</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Dabartinis</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Paleisti iš naujo</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Atkūrimo režimas</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Atsisiuntimo režimas</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Paleisti iš naujo OS</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Paleisti iš naujo</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Jūsų planšetinis kompiuteris bus paleistas iš naujo.</string>
   <string name="reboot_confirm" product="default">Jūsų telefonas bus paleistas iš naujo.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Paleidžiama iš naujo\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Programa priverstinai uždaryta</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">USB derinimas per tinklą įgalintas</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USB derinimas per USB ir tinklą įgalintas</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Palieskite, kad neleistumėte derinimo.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB ir tinklas</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Tinklas</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">perimti programos paleidimą</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s neįdiegta</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritetas</string>
   <string name="silent_mode_none">Joks</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wi-Fi saitvietė išjungta dėl SIM prenumeratos kaitos</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Išjunkite „Wi-Fi“</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">įgalinti arba neleisti privatumo saugos</string>
   <string name="permdesc_changePrivacyGuardState">Leisti programai keisti, kai kita programa veikia su privatumo sauga. Kai programa veikia su privatumo sauga ji neturės prieigos prie asmeninių duomenų pvz., kontaktų, skambučių žurnalų ar pranešimų.</string>
   <string name="privacy_guard_notification">Privatumo sauga aktyvi</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> negalės prieiti prie asmeninių duomenų</string>
   <string name="privacy_guard_dialog_title">Privatumo sauga</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> norėtu <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Prisiminti mano pasirinkimą</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">pasiekti fotoaparatą</string>
   <string name="app_ops_access_location">pasiekti jūsų vietą</string>
   <string name="app_ops_access_notifications">skaityti jūsų pranešimus</string>
@@ -111,19 +149,22 @@
   <string name="app_ops_write_mms">rašyti MMS pranešimą</string>
   <string name="app_ops_write_sms">rašyti SMS pranešimą</string>
   <string name="app_ops_su">gauti „Root“ prieigą</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Kad atsegtumėte šį ekraną palieskite ir laikykite mygtuką atgal.</string>
-  <string name="live_display_auto">Automatinis</string>
-  <string name="live_display_auto_summary">Automatiškai sureguliuoti ekrano spalvos temperatūrą po saulėlydžio ir saulėtekio</string>
-  <string name="live_display_off">Išjungta</string>
-  <string name="live_display_off_summary">Neleisti visų reguliavimų</string>
-  <string name="live_display_day">Diena</string>
-  <string name="live_display_day_summary">Naudoti tik dienos nustatymus</string>
-  <string name="live_display_night">Naktis</string>
-  <string name="live_display_night_summary">Naudoti tik nakties nustatymus</string>
-  <string name="live_display_outdoor">Laukas (ryški saulė)</string>
-  <string name="live_display_outdoor_summary">Naudoti tik lauko nustatymus</string>
-  <string name="live_display_hint">„LiveDisplay“ gali padėti sumažinti akių įtampą ir padėti jums užmigti naktį. Spauskite čia, kad jį išbandyti!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nėra prijungto įrenginio</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> prijungtas įrenginys</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> prijungti įrenginiai</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">Nustatyti iš naujo akumuliatoriaus statistiką</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Leidžia programai nustatyti iš naujo dabartinio žemo lygio akumuliatoriaus naudojimo duomenis.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-lv/cm_strings.xml b/core/res/res/values-lv/cm_strings.xml
index b350009..feda39b 100644
--- a/core/res/res/values-lv/cm_strings.xml
+++ b/core/res/res/values-lv/cm_strings.xml
@@ -17,40 +17,78 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Ekrānattēls</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">saņemt aizsargātu īsziņu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Ļauj lietotnēm saņemt aizsargātu ienākošo īsziņu.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">mainīt aizsargāto īsziņu sarakstu</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Ļauj lietotnei mainīt aizsargāto īsziņu adrešu sarakstu.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Drošība</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Atļaujas saistītas ar iekārtas drošības informāciju.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">lasīt telefona melno sarakstu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Ļauj lietotnei lasīt informāciju  par bloķētajiem ienākošo zvanu un ziņu telefona numuriem.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">mainīt telefona melno sarakstu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Ļauj lietotnei mainīt bloķēto saņemto zvanu vai īsziņu telefona numurus.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">iestatīt taustiņslēga tapeti</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Ļauj lietotnei manīt slēgekrāna tapeti.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Pārsāknēt</string>
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Pārsāknēt</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Atjaunošana</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Sāknētājs</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Lejuplādēt</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Programmātiskā pārsāknēšana</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Restartēt</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Jūsu planšete pārsāknēsies.</string>
   <string name="reboot_confirm" product="default">Jūsu telefons pārsāknēsies.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Pārsāknē\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Lietotne izbeigta</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB pa tīklu ieslēgts</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB pa USB &amp; tīklu ieslēgts</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Pieskarieties, lai atslēgtu atkļūdošanu.</string>
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Ieslēgt vai atslēgt Privātuma sargu</string>
   <string name="permdesc_changePrivacyGuardState">Ļauj lietotnei mainīties pat ja cita lietotne lieto Privātuma Sargu. Kad lietotne darbojas ar privātuma sargu, tai nebūs pieejas personīgajiem datiem, kā kontakti, zvanu saraksts, vai īsziņas.</string>
   <string name="privacy_guard_notification">Privātuma Sargs ir aktīvs</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> nevarēs piekļūt personīgajiem datiem</string>
   <string name="privacy_guard_dialog_title">Privātuma sargs</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app"> %1$s </xliff:g> vēlētos <xliff:g id="op"> %2$s </xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Atcerēties manu izvēli</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">piekļuve kamerai</string>
   <string name="app_ops_access_location">piekļeve jūsu atrašanās vietai</string>
   <string name="app_ops_access_notifications">lasīt jūsu ziņas</string>
@@ -99,7 +137,19 @@
   <string name="app_ops_write_mms">rakstīt multivides ziņu</string>
   <string name="app_ops_write_sms">rakstīt īsziņu</string>
   <string name="app_ops_su">saņemt root piekļuvi</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nav pievienota ierīce</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> pievienota ierīce</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s </xliff:g> pievienotas ierīces</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-mk-rMK/cm_strings.xml b/core/res/res/values-mk-rMK/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-mk-rMK/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-ml-rIN/cm_strings.xml b/core/res/res/values-ml-rIN/cm_strings.xml
new file mode 100644
index 0000000..3262d4c
--- /dev/null
+++ b/core/res/res/values-ml-rIN/cm_strings.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">സ്ക്രീൻഷോട്ട്</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_receiveProtectedSms">പരിരക്ഷിത SMS സ്വീകരിക്കുക</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">ഇൻകമിംഗ് പരിരക്ഷിത SMS സ്വീകരിക്കുവാന്‍ ആപ്ലിക്കേഷനെ അനുവദിക്കുന്നു.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">പരിരക്ഷിത SMS ലിസ്റ്റ് പരിഷ്ക്കരിക്കുക</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">പരിരക്ഷിത SMS വിലാസങ്ങളുടെ ലിസ്റ്റ് പരിഷ്ക്കരിക്കാൻ ആപ്ലിക്കേഷനെ അനുവദിക്കുന്നു.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_security">സുരക്ഷ</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">ഉപകരണ സുരക്ഷാ വിവരങ്ങളുമായി ബന്ധപ്പെട്ട അനുമതികൾ.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">ഫോൺ ബ്ലാക്ക്‌ലിസ്റ്റ് റീഡ് ചെയ്യുക</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">ഇന്‍കമിംഗ് കോളുകള്‍ അല്ലെങ്കില്‍ സന്ദേശങ്ങള്‍ക്ക് വേണ്ടി തടയപ്പെട്ട ഫോണ്‍ നമ്പറുകളെക്കുറിച്ചുള്ള വിവരങ്ങള്‍ റീഡ് ചെയ്യാന്‍ ആപ്ലിക്കേഷനെ അനുവദിക്കുന്നു.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">ഫോൺ ബ്ലാക്ക്‌ലിസ്റ്റ് മാറ്റുക</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">ഇന്‍കമിംഗ് കോളുകള്‍ അല്ലെങ്കില്‍ സന്ദേശങ്ങള്‍ക്ക് വേണ്ടി തടയപ്പെട്ട ഫോണ്‍ നമ്പറുകള്‍ മാറ്റാന്‍ ആപ്ലിക്കേഷനെ അനുവദിക്കുന്നു.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">കീഗാര്‍ഡ് വാൾപേപ്പർ സജ്ജമാക്കി</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">ലോക്ക് സ്ക്രീൻ വാൾപേപ്പർ മാറ്റാന്‍ ഒരു ആപ്ലിക്കേഷനെ അനുവദിക്കുന്നു.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">റീബൂട്ട് ചെയ്യുക</string>
+  <!-- label for current user in phone options dialog -->
+  <string name="global_action_current_user">നിലവിൽ</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">റീബൂട്ട് ചെയ്യുക</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">റിക്കവറി</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">ബൂട്ട്ലോഡര്‍</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">ഡൗൺലോഡുചെയ്യുക</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">മൃദു റീബൂട്ട്</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">റീബൂട്ട് ചെയ്യുക</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">നിങ്ങളുടെ ടാബ്ലറ്റ് റീബൂട്ട് ചെയ്യുന്നതാണ്.</string>
+  <string name="reboot_confirm" product="default">നിങ്ങളുടെ ഫോൺ റീബൂട്ട് ചെയ്യുന്നതാണ്.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">റീബൂട്ട് ചെയ്യുന്നു.....</string>
+  <!-- Long-press back kill application -->
+  <string name="app_killed_message">ആപ്ലിക്കേഷനെ നശിപ്പിച്ചു</string>
+  <!-- ADB over network notification -->
+  <string name="adb_net_active_notification_title">നെറ്റ്‌വർക്കിലൂടെയുള്ള ADB പ്രാപ്തമാക്കി</string>
+  <!-- ADB over USB and network notification -->
+  <string name="adb_both_active_notification_title">USB &amp; നെറ്റ്‌വർക്കിലൂടെയുള്ള ADB പ്രാപ്തമാക്കി</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">ഡീബഗ്ഗിംഗ് അപ്രാപ്തമാക്കാൻ സ്‌പർശിക്കുക.</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB &amp; നെറ്റ്‌വർക്ക്</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">നെറ്റ്‌വർക്ക്</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">ആപ്ലിക്കേഷൻ ആരംഭിക്കുന്നത് തടസപ്പെടുത്തുക</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s ഇൻസ്റ്റാൾ ചെയ്തിട്ടില്ല</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">മുന്‍‌ഗണന</string>
+  <string name="silent_mode_none">ആരിൽ നിന്നും വേണ്ട</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">SIM സബ്സ്ക്രിപ്ഷൻ മാറ്റം കാരണം Wi-Fi ഹോട്ട്സ്പോട്ട് അപ്രാപ്തമാക്കി</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Wi-Fi ഓഫ് ചെയ്യുക</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">പ്രൈവസി ഗാർഡ് അപ്രാപ്തമാക്കുക അല്ലെങ്കില്‍ അപ്രാപ്തമാക്കുക</string>
+  <string name="permdesc_changePrivacyGuardState">മറ്റൊരു ആപ്ലിക്കേഷന്‍ സ്വകാര്യത ഗാർഡില്‍ പ്രവര്‍ത്തിക്കുന്നെങ്കില്‍ മാറ്റുന്നതിന് ആപ്ലിക്കേഷനെ അനുവദിക്കുന്നു. ഒരു ആപ്ലിക്കേഷൻ സ്വകാര്യത ഗാർഡ് ഉപയോഗിച്ച് പ്രവർത്തിക്കുമ്പോൾ, കോണ്‍ടാക്റ്റുകള്‍, കോൾ ലോഗുകള്‍, അല്ലെങ്കിൽ സന്ദേശങ്ങൾ പോലുള്ള സ്വകാര്യ ഡാറ്റയില്‍ പ്രവേശനം ഉണ്ടായിരിക്കില്ല.</string>
+  <string name="privacy_guard_notification">സ്വകാര്യത ഗാർഡ് സജീവമാണ്</string>
+  <string name="privacy_guard_notification_detail">സ്വകാര്യത ഡാറ്റ പ്രവേശനം ചെയ്യാന്‍ <xliff:g id="app">%1$s</xliff:g> ന് കഴിയില്ല</string>
+  <string name="privacy_guard_dialog_title">സ്വകാര്യത ഗാർഡ്</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g>, <xliff:g id="op">%1$s</xliff:g> ആഗ്രഹിക്കുന്നു.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">എന്റെ ചോയ്‌സ് ഓർമ്മിക്കുക</string>
+  <!-- App ops requests -->
+  <string name="app_ops_access_camera">ക്യാമറ ആക്സസ് ചെയ്യുക</string>
+  <string name="app_ops_access_location">നിങ്ങളുടെ സ്ഥാനം ആക്സസ് ചെയ്യുക</string>
+  <string name="app_ops_access_notifications">നിങ്ങളുടെ അറിയിപ്പുകൾ വായിക്കുക</string>
+  <string name="app_ops_activate_vpn">ഒരു VPN സജീവമാക്കുക</string>
+  <string name="app_ops_auto_start">പവര്‍ ലഭിക്കുമ്പോള്‍ ആരംഭിക്കുക</string>
+  <string name="app_ops_delete_call_log">നിങ്ങളുടെ കോൾ ലോഗ് ഇല്ലാതാക്കുക</string>
+  <string name="app_ops_delete_contacts">നിങ്ങളുടെ കോണ്‍ടാക്റ്റുകള്‍ ഇല്ലാതാക്കുക</string>
+  <string name="app_ops_delete_mms">നിങ്ങളുടെ MMS സന്ദേശങ്ങൾ ഇല്ലാതാക്കുക</string>
+  <string name="app_ops_delete_sms">നിങ്ങളുടെ SMS സന്ദേശങ്ങൾ ഇല്ലാതാക്കുക</string>
+  <string name="app_ops_draw_on_top">വിന്‍ഡോകള്‍ മുകളിൽ വരയ്ക്കുക</string>
+  <string name="app_ops_get_usage_stats">ആപ്ലിക്കേഷൻ ഉപയോഗ സ്ഥിതിവിവരക്കണക്കുകൾ നേടുക</string>
+  <string name="app_ops_keep_device_awake">നിങ്ങളുടെ ഉപകരണം സജീവമായി നിലനിര്‍ത്തുക</string>
+  <string name="app_ops_make_phone_call">ഒരു ഫോൺ കോൾ ചെയ്യുക</string>
+  <string name="app_ops_modify_calendar">നിങ്ങളുടെ കലണ്ടർ കാലികമാക്കുക</string>
+  <string name="app_ops_modify_call_log">കോൾ ലോഗ് കാലികമാക്കുക</string>
+  <string name="app_ops_modify_clipboard">ക്ലിപ്ബോർഡ് പരിഷ്ക്കരിക്കുക</string>
+  <string name="app_ops_modify_contacts">നിങ്ങളുടെ സമ്പര്‍‌ക്കങ്ങള്‍‌ കാലികമാക്കുക</string>
+  <string name="app_ops_modify_settings">സിസ്റ്റം ക്രമീകരണങ്ങൾ കാലികമാക്കുക</string>
+  <string name="app_ops_mute_unmute_microphone">മൈക്രോഫോൺ നിശ്ശബ്ദമാക്കുക / ശബ്ദമുള്ളതാക്കുക</string>
+  <string name="app_ops_play_audio">ഓഡിയോ പ്ലേ ചെയ്യുക</string>
+  <string name="app_ops_post_notification">ഒരു അറിയിപ്പ് പോസ്റ്റ് ചെയ്യുക</string>
+  <string name="app_ops_project_media">പ്രോജക്റ്റ് മീഡിയ</string>
+  <string name="app_ops_read_calendar">നിങ്ങളുടെ കലണ്ടർ റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_read_call_log">കോൾ ലോഗ് റീഡുചെയ്യുക</string>
+  <string name="app_ops_read_clipboard">ക്ലിപ്ബോര്‍ഡ് റീഡ് ചെയ്യുക</string>
+  <string name="app_ops_read_contacts">നിങ്ങളുടെ കോൺടാക്റ്റുകൾ റീഡുചെയ്യുക</string>
+  <string name="app_ops_read_mms">നിങ്ങളുടെ MMS സന്ദേശങ്ങൾ വായിക്കുക</string>
+  <string name="app_ops_read_sms">നിങ്ങളുടെ SMS സന്ദേശങ്ങൾ വായിക്കുക</string>
+  <string name="app_ops_receive_sms">ഒരു SMS സന്ദേശം സ്വീകരിക്കുക</string>
+  <string name="app_ops_record_audio">ഓഡിയോ റെക്കോർഡ് ചെയ്യുക</string>
+  <string name="app_ops_send_mms">ഒരു MMS സന്ദേശം അയയ്ക്കുക</string>
+  <string name="app_ops_send_sms">ഒരു SMS സന്ദേശം അയയ്ക്കുക</string>
+  <string name="app_ops_start_at_bootup">പവര്‍ ലഭിക്കുമ്പോള്‍ ആരംഭിക്കുക</string>
+  <string name="app_ops_toast_window">ടോസ്റ്റ് സന്ദേശങ്ങൾ ഡിസ്പ്ലേ ചെയ്യുക</string>
+  <string name="app_ops_toggle_bluetooth">ടോഗിള്‍ Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">സെല്ലുലാർ ഡാറ്റ ഓൺ ചെയ്യുക</string>
+  <string name="app_ops_toggle_nfc">NFC ടോഗിൾ</string>
+  <string name="app_ops_toggle_wifi">Wi-Fi ഓണ്‍ ആക്കുക</string>
+  <string name="app_ops_use_alarm_volume">അലാറം വോളിയം നിയന്ത്രിക്കുക</string>
+  <string name="app_ops_use_audio_focus">ഓഡിയോ ഫോക്കസ് നിയന്ത്രിക്കുക</string>
+  <string name="app_ops_use_bluetooth_volume">Bluetooth വോളിയം നിയന്ത്രിക്കുക</string>
+  <string name="app_ops_use_master_volume">മാസ്റ്റര്‍ വോളിയം നിയന്ത്രിക്കുക</string>
+  <string name="app_ops_use_media_buttons">മീഡിയ ബട്ടണുകൾ ഉപയോഗിക്കുക</string>
+  <string name="app_ops_use_media_volume">മീഡിയ വോളിയം നിയന്ത്രിക്കുക</string>
+  <string name="app_ops_use_notification_volume">അറിയിപ്പ് വോളിയം നിയന്ത്രിക്കുക</string>
+  <string name="app_ops_use_ring_volume">റിംഗ്ടോൺ വോളിയം നിയന്ത്രിക്കുക</string>
+  <string name="app_ops_use_vibrate">സ്പര്‍ശന പ്രതികരണം ഉപയോഗിക്കുക</string>
+  <string name="app_ops_use_voice_volume">വോയ്സ് കോൾ വോളിയം നിയന്ത്രിക്കുക</string>
+  <string name="app_ops_write_mms">MMS സന്ദേശം റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_write_sms">ഒരു SMS സന്ദേശം റൈറ്റ് ചെയ്യുക</string>
+  <string name="app_ops_use_fingerprint">വിരലടയാളം ഉപയോഗിക്കുക</string>
+  <string name="app_ops_add_voicemail">ഒരു വോയ്സ്മെയിൽ ചേർക്കുക</string>
+  <string name="app_ops_read_phone_state">ഫോണിന്‍റെ സ്ഥിതി ഉപയോഗിക്കുക</string>
+  <string name="app_ops_scan_wifi">സ്കാൻ Wi-Fi നെറ്റ്വർക്കുകൾ</string>
+  <string name="app_ops_change_wallpaper">വാൾപേപ്പർ മാറ്റാൻ</string>
+  <string name="app_ops_assist_structure">use assist structure</string>
+  <string name="app_ops_assist_screenshot">ഒരു സ്ക്രീൻഷോട്ട് എടുക്കുക</string>
+  <string name="app_ops_use_body_sensors">ശരീരം സെൻസറുകൾ ഉപയോഗിക്കാൻ</string>
+  <string name="app_ops_read_cell_broadcasts">ഫോണ്‍ പ്രക്ഷേപണങ്ങള്‍ വായിക്കുക</string>
+  <string name="app_ops_mock_location">നിങ്ങളുടെ സ്ഥാനം വ്യാജമാക്കുക</string>
+  <string name="app_ops_read_external_storage">ബാഹ്യ സംഭരണം വായിക്കാൻ</string>
+  <string name="app_ops_write_external_storage">ബാഹ്യ സംഭരണം എഴുതാൻ</string>
+  <string name="app_ops_turn_on_screen">സ്ക്രീന്‍ ഓണാക്കുക</string>
+  <string name="app_ops_get_accounts">get device accounts</string>
+  <string name="app_ops_wifi_change">വൈഫിയുടെ സ്ഥിതി മാറ്റുക</string>
+  <string name="app_ops_su">റൂട്ട് പ്രവേശനം നേടുക</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">ഈ സ്ക്രീൻ വേര്‍തിരിക്കുക ചെയ്യുന്നതിന്, പിന്നിലേക്ക് ബട്ടൺ അമര്‍ത്തിപ്പിടിക്കുക.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">ബന്ധിപ്പിച്ച ഉപകരണം ഇല്ല</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ബന്ധിപ്പിച്ച ഉപകരണം</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> ബന്ധിപ്പിച്ച ഉപകരണങ്ങൾ</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">പ്രോഗ്രാം തുറക്കുന്നത് തടഞ്ഞിരിക്കുന്നു</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> തുറക്കുന്നത് തടഞ്ഞിരിക്കുന്നു. സാധുവാക്കി തുറക്കുവാൻ സ്പർശിക്കുക.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">ബാറ്ററി പൂർണ്ണമായും ചാർജ് ചെയ്തു</string>
+  <string name="notify_battery_fully_charged_text">ബാറ്ററി ആയുർദൈർഘ്യം മെച്ചപ്പെടുത്താൻ ചാർജർ നിന്നും നിങ്ങളുടെ ഉപകരണം വിച്ഛേദിക്കുക.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">ബാറ്ററി സ്ഥിതിവിവരക്കണക്ക് പുനക്രമീകരിക്കുക</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">നിലവിലെ ലോ-ലെവല്‍ ബാറ്ററി ഉപയോഗ ഡാറ്റ പുനഃക്രമീകരിക്കാൻ ഒരു ആപ്ലിക്കേഷനെ അനുവദിക്കുന്നു.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-mn-rMN/cm_strings.xml b/core/res/res/values-mn-rMN/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-mn-rMN/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-mr-rIN/cm_strings.xml b/core/res/res/values-mr-rIN/cm_strings.xml
new file mode 100644
index 0000000..86845d9
--- /dev/null
+++ b/core/res/res/values-mr-rIN/cm_strings.xml
@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">स्क्रीनशॉट</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_receiveProtectedSms">संरक्षित SMS प्राप्त झाला</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">अॅप ला एक इनकमिंग संरक्षित SMS प्राप्त करण्याची परवानगी देते.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">संरक्षित SMS यादी सुधारित करा</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">अॅप संरक्षित SMS पत्ता यादी सुधारित करण्याची परवानगी देते.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_security">सुरक्षितता</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">डिव्हाइस सुरक्षा माहितीशी संबंधित परवानग्या.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">फोन काळी यादी वाचा</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">इनकमिंग कॉल्स किंवा संदेशांसाठी अवरोधित केलेल्या फोन नंबर्सविषयी माहिती अॅप वाचू देते.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">फोन काळी यादी बदला</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">इनकमिंग कॉल्स किंवा संदेशांसाठी अवरोधित केलेले फोन नंबर्स अनुप्रयोगाला बदलण्याची परवानगी देते.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">कीगार्ड वॉलपेपर सेट करा</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">अनुप्रयोगाला लॉक स्क्रीन वॉलपेपर बदलण्याची परवानगी देते.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">रीबूट करा</string>
+  <!-- label for current user in phone options dialog -->
+  <string name="global_action_current_user">वर्तमान</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">रीबूट करा</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">पुर्नप्राप्ती</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">बूटलोडर</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">डाउनलोड करा</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">सॉफ्ट रीबूट</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">रीबूट करा</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">तुमचा टॅब्लेट रीबूट होईल.</string>
+  <string name="reboot_confirm" product="default">तुमचा फोन रीबूट होईल.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">रीबूट करत आहे\u2026</string>
+  <!-- Long-press back kill application -->
+  <string name="app_killed_message">अॅप बंद केला</string>
+  <!-- ADB over network notification -->
+  <string name="adb_net_active_notification_title">नेटवर्कवर ADB सक्षम केले</string>
+  <!-- ADB over USB and network notification -->
+  <string name="adb_both_active_notification_title">नेटवर्कवर आणि USB वर ADB सक्षम केले</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">डिबगिंग अक्षम करण्यासाठ स्पर्श करा.</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB आणि नेटवर्क</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">नेटवर्क</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">अनुप्रयोग सुरू कराला अटकाव करा</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s स्थापित केलेले नाही</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">प्राधान्य</string>
+  <string name="silent_mode_none">काहीही नाही</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">सिम सदस्यत्व बदलामुळे अक्षम केलेला Wi-Fi हॉटस्पॉट</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Wi-Fi बंद करा</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">गुप्तता रक्षक सक्षम किंवा अक्षम करा</string>
+  <string name="permdesc_changePrivacyGuardState">गुप्तता रक्षकासह दुसरा अनुप्रयोग चालतो का ते अॅप बदलण्याची परवानगी देते. जेव्हा गुप्तता रक्षकासह एखादा अनुप्रयोग चालू असेल तेव्हा, त्याला वैयक्तिक डेटामध्ये ऍक्सेस नसेल, जसे की संपर्क, कॉल लॉग्ज किंवा संदेश.</string>
+  <string name="privacy_guard_notification">गुप्तता रक्षक सक्रिय</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> ला वैयक्तिक डेटामध्ये ऍक्सेस करता येणार नाही</string>
+  <string name="privacy_guard_dialog_title">गुप्तता रक्षक</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> ला <xliff:g id="op">%2$s</xliff:g>चे आहे.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">माझी आवड लक्षात ठेवा</string>
+  <!-- App ops requests -->
+  <string name="app_ops_access_camera">कॅमेरा ऍक्सेस करा</string>
+  <string name="app_ops_access_location">तुमचे स्थान ऍक्सेस करा</string>
+  <string name="app_ops_access_notifications">तुमच्या सूचना वाचा</string>
+  <string name="app_ops_activate_vpn">एक VPN सक्रिय करा</string>
+  <string name="app_ops_auto_start">पॉवर अपला सुरू करा</string>
+  <string name="app_ops_delete_call_log">तुमचे कॉल लॉग हटवा</string>
+  <string name="app_ops_delete_contacts">तुमचे संपर्क हटवा</string>
+  <string name="app_ops_delete_mms">तुमचे MMS संदेश हटवा</string>
+  <string name="app_ops_delete_sms">तुमचे SMS संदेश हटवा</string>
+  <string name="app_ops_draw_on_top">शीर्षावर विंडोज रेखाटा</string>
+  <string name="app_ops_get_usage_stats">अॅप वापर आकडेवारी मिळवा</string>
+  <string name="app_ops_keep_device_awake">तुमचे डिव्हाइस सक्रिय ठेवा</string>
+  <string name="app_ops_make_phone_call">फोन कॉल करा</string>
+  <string name="app_ops_modify_calendar">तुमची दिनदर्शिका अपडेट करा</string>
+  <string name="app_ops_modify_call_log">कॉल लॉग अपडेट करा</string>
+  <string name="app_ops_modify_clipboard">क्लिपबोर्ड सुधारित करा</string>
+  <string name="app_ops_modify_contacts">तुमचे संपर्क अपडेट करा</string>
+  <string name="app_ops_modify_settings">सिस्टिम सेटिंग्ज अपडेट करा</string>
+  <string name="app_ops_mute_unmute_microphone">मायक्रोफोन निःशब्द/सशब्द करा</string>
+  <string name="app_ops_play_audio">ऑडिओ प्ले करा</string>
+  <string name="app_ops_post_notification">सूचना पोस्ट करा</string>
+  <string name="app_ops_project_media">प्रोजेक्‍ट मीडिया</string>
+  <string name="app_ops_read_calendar">तुमची दिनदर्शिका वाचा</string>
+  <string name="app_ops_read_call_log">कॉल लॉग वाचा</string>
+  <string name="app_ops_read_clipboard">क्लिपबोर्ड वाचा</string>
+  <string name="app_ops_read_contacts">आपले संपर्क वाचा</string>
+  <string name="app_ops_read_mms">तुमचे MMS संदेश वाचा</string>
+  <string name="app_ops_read_sms">तुमचे SMS संदेश वाचा</string>
+  <string name="app_ops_receive_sms">SMS संदेश प्राप्त करा</string>
+  <string name="app_ops_record_audio">ऑडिओ रेकॉर्ड करा</string>
+  <string name="app_ops_send_mms">MMS संदेश पाठवा</string>
+  <string name="app_ops_send_sms">SMS संदेश पाठवा</string>
+  <string name="app_ops_start_at_bootup">पॉवर अपला सुरू करा</string>
+  <string name="app_ops_toast_window">टोस्ट संदेश प्रदर्शित करा</string>
+  <string name="app_ops_toggle_bluetooth">Bluetooth टॉगल करा</string>
+  <string name="app_ops_toggle_mobile_data">मोबाईल डेटा टॉगल करा</string>
+  <string name="app_ops_toggle_nfc">NFC टॉगल करा</string>
+  <string name="app_ops_toggle_wifi">Wi-Fi टॉगल करा</string>
+  <string name="app_ops_use_alarm_volume">अलार्म ध्वनी नियंत्रित करा</string>
+  <string name="app_ops_use_audio_focus">ऑडिओ फोकस नियंत्रित करा</string>
+  <string name="app_ops_use_bluetooth_volume">Bluetooth ध्वनी नियंत्रित करा</string>
+  <string name="app_ops_use_master_volume">प्रमुख ध्वनी नियंत्रित करा</string>
+  <string name="app_ops_use_media_buttons">मिडिया बटणे वापरा</string>
+  <string name="app_ops_use_media_volume">मिडिया ध्वनी नियंत्रित करा</string>
+  <string name="app_ops_use_notification_volume">सूचना ध्वनी नियंत्रित करा</string>
+  <string name="app_ops_use_ring_volume">रींग टोन ध्वनी नियंत्रित करा</string>
+  <string name="app_ops_use_vibrate">हॅप्टिक फीडबॅक वापरा</string>
+  <string name="app_ops_use_voice_volume">व्हॉइस कॉल ध्वनी नियंत्रित करा</string>
+  <string name="app_ops_write_mms">MMS संदेश लिहा</string>
+  <string name="app_ops_write_sms">SMS संदेश लिहा</string>
+  <string name="app_ops_use_fingerprint">बोटाचा ठसा वापरा</string>
+  <string name="app_ops_add_voicemail">व्हॉइसमेल जोडा</string>
+  <string name="app_ops_read_phone_state">फोन आकडेवारी ऍक्सेस करा</string>
+  <string name="app_ops_scan_wifi">Wi-Fi नेटवर्क्स स्कॅन करा</string>
+  <string name="app_ops_change_wallpaper">वॉलपेपर बदला</string>
+  <string name="app_ops_assist_structure">सहाय्यक रचना वापरा</string>
+  <string name="app_ops_assist_screenshot">स्क्रीनशॉट घ्या</string>
+  <string name="app_ops_use_body_sensors">शरीर सेन्सर्स वापरा</string>
+  <string name="app_ops_read_cell_broadcasts">सेल ब्रॉडकास्ट्स वाचा</string>
+  <string name="app_ops_mock_location">तुमचे स्थान खोटे करा</string>
+  <string name="app_ops_read_external_storage">बाह्य संग्रह वाचा</string>
+  <string name="app_ops_write_external_storage">अंतर्गत संग्रह लिहा</string>
+  <string name="app_ops_turn_on_screen">स्क्रीन चालू करा</string>
+  <string name="app_ops_get_accounts">डिव्हाइस खाती मिळवा</string>
+  <string name="app_ops_wifi_change">Wi-Fi आकडेवारी बदला</string>
+  <string name="app_ops_su">रूट ऍक्सेस मिळवा</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">हा स्क्रीन अनपिन करण्यासाठी, मागे बटण दाबून धरा.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">कनेक्टेड डिव्हाइस नाही</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> कनेक्टेड डिव्हाइस</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> कनेक्टेड डिव्हाइसेस</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">कार्यकलाप सुरू करा अवरोधित केले</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> सुरू होण्यापासून संरक्षित आहे. प्रमाणित करण्यासाठी टॅप करा आणि अॅप सुरू करा.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">बॅटरी पूर्णपणे चार्ज</string>
+  <string name="notify_battery_fully_charged_text">बॅटरी फार काळ टिकवण्यासाठी चार्जर मधून आपले डिव्हाइस डिस्कनेक्ट करा.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">बॅटरी आकडेवारी रीसेट करा</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">अॅपला चालू कमी-पातळी बॅटरी वापर डेटा रीसेट करण्याची परवानगी देते.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">सिम कार्डे बदलली</string>
+  <string name="uicc_hot_swapped_event_text">सिम कार्ड मुलभूत प्राधान्ये सेट करण्यासाठी टॅप</string>
+</resources>
diff --git a/core/res/res/values-ms-rMY/cm_strings.xml b/core/res/res/values-ms-rMY/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-ms-rMY/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-my-rMM/cm_strings.xml b/core/res/res/values-my-rMM/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-my-rMM/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-nb/cm_strings.xml b/core/res/res/values-nb/cm_strings.xml
index 791d6ce..d1cfdaf 100644
--- a/core/res/res/values-nb/cm_strings.xml
+++ b/core/res/res/values-nb/cm_strings.xml
@@ -17,54 +17,92 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Skjermbilde</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">motta beskyttet SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Lar programmet motta innkommende beskyttede SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">endre beskyttede SMS-listen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Lar programmet endre adresselisten for beskyttede SMS.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Sikkerhet</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Tillatelser knyttet til enhetens sikkerhetsinformasjon.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">les telefonens svarteliste</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Tillater en app å lese informasjon om telefonnummer som er blokkert for innkommende samtaler eller meldinger.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">endre telefonens svarteliste</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Tillater en app å endre telefonnummer som er blokkert for innkommende samtaler eller meldinger.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Angi tastaturbakgrunn</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Tillat en app å endre låseskjermsbakgrunn.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Start på nytt</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Nåværende</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Start på nytt</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Gjenoppretting</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Myk omstart</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Omstart</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Nettbrettet startes på nytt.</string>
   <string name="reboot_confirm" product="default">Telefonen startes på nytt.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Starter på nytt\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">App stoppet</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB over nettverk aktivert</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB over USB &amp; nettverk aktivert</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Trykk for å deaktivere feilsøking.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB – <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB og nettverk</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Nettverk</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">avbryt app start</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s er ikke installert</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritet</string>
   <string name="silent_mode_none">Ingen</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Deaktivert Wi-Fi hotspot på grunn av endring i SIM-abbonement</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Deaktiver Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">aktivere eller deaktivere personvernvakt</string>
   <string name="permdesc_changePrivacyGuardState">Lar appen endre om en annen app kjører med personlighetsvern. Når en app kjører med personlighetsvern vil den ikke ha tilgang til personlig data som kontakter, samtalelogg eller meldinger.</string>
   <string name="privacy_guard_notification">Personvernvakt aktiv</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> vil ikke få tilgang til personlige data</string>
   <string name="privacy_guard_dialog_title">Personvernvakt</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> vil gjerne <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Husk mitt valg</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">tilgang til kameraet</string>
   <string name="app_ops_access_location">tilgang til din plassering</string>
-  <string name="app_ops_access_notifications">lese dine notifikasjoner</string>
+  <string name="app_ops_access_notifications">lese dine varsler</string>
   <string name="app_ops_activate_vpn">aktiver en VPN</string>
   <string name="app_ops_auto_start">start under oppstart</string>
   <string name="app_ops_delete_call_log">Slett samtaleloggen</string>
@@ -96,9 +134,10 @@
   <string name="app_ops_send_sms">sende en tekstmelding</string>
   <string name="app_ops_start_at_bootup">starte under oppstart</string>
   <string name="app_ops_toast_window">vis toast meldinger</string>
-  <string name="app_ops_toggle_bluetooth">aktivere/deaktivere bluetooth</string>
-  <string name="app_ops_toggle_nfc">NFC av/på</string>
-  <string name="app_ops_toggle_wifi">veksle Wi-Fi</string>
+  <string name="app_ops_toggle_bluetooth">slå av/på Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">slå av/på mobildata</string>
+  <string name="app_ops_toggle_nfc">slå av/på NFC</string>
+  <string name="app_ops_toggle_wifi">slå av/på Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">styre alarmvolum</string>
   <string name="app_ops_use_audio_focus">styre lydfokus</string>
   <string name="app_ops_use_bluetooth_volume">styre bluetooth volum</string>
@@ -127,21 +166,28 @@
   <string name="app_ops_get_accounts">hente enhetskontoer</string>
   <string name="app_ops_wifi_change">endre Wi-Fi-tilstand</string>
   <string name="app_ops_su">få root-tilgang</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">For å unpin denne skjermen, trykk og hold tilbake-knappen.</string>
-  <string name="live_display_auto">Automatisk</string>
-  <string name="live_display_auto_summary">Juster fargetemperatur på skjermen etter solnedgang og soloppgang</string>
-  <string name="live_display_off">Av</string>
-  <string name="live_display_off_summary">Deaktivere alle justeringer</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Bruk kun dag innstillinger</string>
-  <string name="live_display_night">Natt</string>
-  <string name="live_display_night_summary">Bruk kun natt instillinger</string>
-  <string name="live_display_outdoor">Utendørs (sterkt sollys)</string>
-  <string name="live_display_outdoor_summary">Bruk kun utendørs innstillinger</string>
-  <string name="live_display_hint">LiveDisplay kan hjelpe deg med å redusere belastningen på øynene og hjelpe deg med å sove om natten. Trykk her for å prøve det ut!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ingen tilkoblede enheter</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> tilkoblet enhet</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> tilkoblede enheter</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Aktivitets oppstart blokkert</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> er beskyttet mot oppstart. Trykk for å godkjenne og starte programmet.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batteriet er fullt oppladet</string>
+  <string name="notify_battery_fully_charged_text">Koble enheten fra laderen for å forbedre batteri levetid.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">tilbakestill batteristatistikk</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Tillater at et program kan tilbakestille nåværende bruksdata om lavt batteri.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM-kort er endret</string>
+  <string name="uicc_hot_swapped_event_text">Tappe for å angi standardinnstillinger for SIM-kortet</string>
 </resources>
diff --git a/core/res/res/values-ne-rNP/cm_strings.xml b/core/res/res/values-ne-rNP/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-ne-rNP/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-nl/cm_strings.xml b/core/res/res/values-nl/cm_strings.xml
index 6d72bbd..9ef6871 100644
--- a/core/res/res/values-nl/cm_strings.xml
+++ b/core/res/res/values-nl/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Screenshot</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">beschermd sms-bericht ontvangen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Hiermee kan de app een inkomend beschermd sms-bericht ontvangen.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">beschermde sms-berichtenlijst wijzigen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Hiermee kan de app de lijst van beschermde sms-adressen wijzigen.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Beveiliging</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Machtigingen gerelateerd aan beveiligingsinformatie van het apparaat.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">zwarte lijst lezen</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Hiermee kan de app informatie lezen over telefoonnummers waarvan inkomende oproepen of berichten zijn geblokkeerd.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">zwarte lijst aanpassen</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Hiermee kan de app telefoonnummers aanpassen waarvan inkomende oproepen of berichten zijn geblokkeerd.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">achtergrond van vergrendelingsscherm instellen</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Hiermee kan de app de achtergrond van het vergrendelingsscherm aanpassen.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Herstarten</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Huidige</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Herstarten</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Soft reboot</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Herstarten</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Uw tablet wordt herstart.</string>
   <string name="reboot_confirm" product="default">Uw telefoon wordt herstart.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Herstarten\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">App afgesloten</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB over netwerk ingeschakeld</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB over USB &amp; netwerk ingeschakeld</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Tik om foutopsporing uit te schakelen.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; netwerk</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Netwerk</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Openen van app onderscheppen</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s is niet geïnstalleerd</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioriteit</string>
   <string name="silent_mode_none">Geen</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wifi-hotspot uitgeschakeld door een SIM-abonnementwijziging</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Wifi uitschakelen</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Privacybescherming in- of uitschakelen</string>
   <string name="permdesc_changePrivacyGuardState">Hiermee kan de app bepalen of een andere app start met Privacybescherming. Als een app start met Privacybescherming, zal het geen toegang hebben tot persoonsgegevens zoals contacten, berichten of gespreksstatistieken.</string>
   <string name="privacy_guard_notification">Privacybescherming actief</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> zal geen toegang hebben tot persoonsgegevens</string>
   <string name="privacy_guard_dialog_title">Privacybescherming</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> wil <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Keuze onthouden</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">toegang tot camera</string>
   <string name="app_ops_access_location">toegang tot uw locatie</string>
   <string name="app_ops_access_notifications">meldingen lezen</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">apparaataccounts opvragen</string>
   <string name="app_ops_wifi_change">wifi-status aanpassen</string>
   <string name="app_ops_su">root-toegang krijgen</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Blijf de Terug-knop aanraken om dit scherm los te maken.</string>
-  <string name="live_display_auto">Automatisch</string>
-  <string name="live_display_auto_summary">Automatisch kleurtemperatuur van scherm aanpassen na zonsopkomst en -ondergang</string>
-  <string name="live_display_off">Uit</string>
-  <string name="live_display_off_summary">Alle aanpassingen uitschakelen</string>
-  <string name="live_display_day">Overdag</string>
-  <string name="live_display_day_summary">Alleen instellingen voor overdag gebruiken</string>
-  <string name="live_display_night">\'s Nachts</string>
-  <string name="live_display_night_summary">Alleen instellingen voor \'s nachts gebruiken</string>
-  <string name="live_display_outdoor">Buitenshuis (felle zon)</string>
-  <string name="live_display_outdoor_summary">Alleen instellingen voor buitenshuis gebruiken</string>
-  <string name="live_display_hint">LiveDisplay kan oogvermoeidheid verminderen en helpt u om \'s nachts te slapen. Tik hier om het uit te proberen</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Geen aangesloten apparaat</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> aangesloten apparaat</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> aangesloten apparaten</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Starten van activiteit geblokkeerd</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> is beschermd tegen opstarten. Tik om aan te melden en de app te starten.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Accu volledig opgeladen</string>
   <string name="notify_battery_fully_charged_text">Ontkoppel uw apparaat van de oplader om de levensduur van de accu te verlengen.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">accustatistieken opnieuw instellen</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Hiermee kan de app de huidige accustatistieken over het gebruik opnieuw instellen.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Simkaarten zijn veranderd</string>
+  <string name="uicc_hot_swapped_event_text">Tik om standaardinstellingen van simkaart in te stellen</string>
 </resources>
diff --git a/core/res/res/values-oc-rFR/cm_strings.xml b/core/res/res/values-oc-rFR/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-oc-rFR/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-oc-rFR/strings.xml b/core/res/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-oc-rFR/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-or-rIN/cm_strings.xml b/core/res/res/values-or-rIN/cm_strings.xml
new file mode 100644
index 0000000..a591a62
--- /dev/null
+++ b/core/res/res/values-or-rIN/cm_strings.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">ସ୍କ୍ରିନସଟ୍</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_receiveProtectedSms">ସୁରଷିତ SMS ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">ଆସୁଥିବା ସୁରଷିତ SMSକୁ ଗ୍ରହଣ କରିବା ପାଇଁ ଆପ୍ଲିକେସ‌ନକୁ ଅ୍ନୁମତି ଦିଏ।</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">ସୁ୍ରଷିତ SMS ତାଲିକା ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">ସୁରଷିତ SMS ଠିକଣା ତାଲିକା ସମ୍ପାଦନା କରିବା ପାଇଁ ଆପ୍ଲିକେସ‌ନକୁ ଅ୍ନୁମତି ଦିଏ।</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_security">ସୁରକ୍ଷା</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">ଡିଭାଇସ୍‍ ସୁରଷା ସୂଚନା ସମ୍ବଧିତ ଅନୁମତି।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">ଫୋନ୍‍ ବ୍ଲା‌କ୍‍ଲିଷ୍ଟ ପଢନ୍ତୁ</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">ଯେଉଁ ଫୋନ୍‍ ନମ୍ବର ପାଇଁ ଆସୁଥିବା କଲ୍‍ ଓ ବାର୍ତ୍ତା ଅବରୁଧ ହୋ‌ଇଛି, ସେହି ବିଷୟରେ ସୂଚନା ପଢିବା ପାଇଁ ଆପ୍ଲିକେସ‌୍କୁ ଅନୁମତି ଦିଏ।</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">ଫୋନ୍‍ ବ୍ଲା‌ଲିଷ୍ଟ ପରିବର୍ତ୍ତନ ମ୍କରନ୍ତୁ</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">ଯେଉଁ ଫୋନ୍‍ ନମ୍ବର ପାଇଁ ଆସୁଥିବା କଲ୍‍ ଓ ବାର୍ତ୍ତା ଅବରୁଧ ହୋ‌ଇଛି, ସେହି ବିଷୟରେ ସୂଚନା ପଢିବା ପାଇଁ ଆପ୍ଲିକେସ‌୍କୁ ଅନୁମତି ଦିଏ।</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">କୀଗାର୍ଡ ୱା‌‍ଲ୍ପେପର୍‍ ସେଟ୍‍ କରନ୍ତୁ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ୱାଲ୍‍ପେପର୍‍ ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଏକ ଆପ୍ଲିକେସନ୍‍କୁ ଅନୁମତି ଇଦେ।</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">ରିବୁଟ୍</string>
+  <!-- label for current user in phone options dialog -->
+  <string name="global_action_current_user">ସମ୍ପ୍ରତି</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">ରିବୁଟ୍</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">ପୁନଃପ୍ରାପ୍ତ କରିବା</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">ବୁଟ୍‍ଲୋଡର୍‍</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">ଡାଉନ‌ଲୋଡ୍</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">ସଫ୍ଟ ରିବୁଟ୍‍</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">ରିବୁଟ୍</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">ଆପଣଙ୍କ ଟା‌ବଲେଟ୍‍ ରିବୁଟ୍‍ ହେବ।</string>
+  <string name="reboot_confirm" product="default">ଆପଣଙ୍କ ଫୋନ୍ ରିବୁଟ୍ ହେବ।</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">ରିବୁଟ୍ କରୁଛି\u2026</string>
+  <!-- Long-press back kill application -->
+  <string name="app_killed_message">ଆପ୍ଲିକେସନ୍‍ କଟାଯାଇଛି</string>
+  <!-- ADB over network notification -->
+  <string name="adb_net_active_notification_title">ନେଟ୍‍ୱା‌ର୍କ୍‍ରେ ADB ସଷମ କରାଯାଇଛି</string>
+  <!-- ADB over USB and network notification -->
+  <string name="adb_both_active_notification_title">USB ଓ ନେଟ୍‍ୱା‌ର୍କ୍‍ରେ ADB ସଷମ କରାଯାଇଛି</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">ଡିବଗିଙ୍ଗ ଅଷମ କରିବା ପାଇଁ ସ୍ପର୍ଶ ଅକରନ୍ତୁ।</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB ଓ ନେଟ୍‍ୱାର୍କ୍‍</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">ନେଟୱାର୍କ୍</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">ଆପ୍ଲିକେସନ୍‍ ଲଞ୍ଚ ଇଣ୍ଟରସେପ୍ଟ କରନ୍ତୁ</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s ସଂ‍ସ୍ଥାପିତ ହୋଇନାହିଁ</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">ଅଗ୍ରାଧିକାର</string>
+  <string name="silent_mode_none">କିଛି ନୁହେଁ</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">SIM ଗ୍ରହୀତା‍ ପରିବର୍ତ୍ତନ କାରଣରୁ Wi-Fi ହଟ୍‍ସ୍ପଟ୍‍ ଅଷମ କରାଯାଇଛି</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Wi-Fi ଅଫ୍‍ କରନ୍ତୁ</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">ପ୍ରାଇଭେସି ଗାର୍ଡ ସଷମ ବା ଅଷମ କରନ୍ତୁ</string>
+  <string name="permdesc_changePrivacyGuardState">ପ୍ରାଇଭେସି ଗାର୍ଡ ସହିତ ଅନ୍ୟ ଏକ ଆପ୍ଲିକେସ‌‌ନ୍‍ ର‌ନ୍‍ କରିପାରିବ କି ନାହିଁ ତାହା ପରିବର୍ତ୍ତନ କରିବା ପାଇଁ ଏକ ଆପ୍ଲିକେସ‌କୁ ଅନୁମତି ଦିଏ। ଯେତେବେଳେ ପ୍ରାଇଭେସି ଗାର୍ଡ ସହିତ ଏକ ଆପ୍ଲିକେସନ୍‍ ଚାଳନା କରାଯାଉଥାଏ, ଏହା ବ୍ୟକ୍ତିଗତ ତଥ୍ୟ ଯଥା ସମ୍ପର୍କ, କଲ୍‍ ସୂୀ, ବା ସନ୍ଦେଶଗୁ୍ଡିକ ଆକ୍‍ସେସ୍‍ କରିପାରିବ ନାହିଁ।</string>
+  <string name="privacy_guard_notification">ପ୍ରାଇଭେସି ଗାର୍ଡ ଆକ୍ଟିଭ୍‍</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> ବ୍ୟକ୍ତିଗତ ତଥ୍ୟ ଆକ୍‍ସେସ୍‍ କରିବା ପାଇଁ ସଷମ ହେବ ନାହିଁ</string>
+  <string name="privacy_guard_dialog_title">ପ୍ରାଇଭେସି ଗାର୍ଡ</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$Sଚାହିଁବ</xliff:g> ଚାହିଁବ <xliff:g id="op">%2$s</xliff:g>।</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">ମୋ ପସନ୍ଦ ମନେରଖନ୍ତୁ</string>
+  <!-- App ops requests -->
+  <string name="app_ops_access_camera">କ୍ୟାମେରା ଆ‌କ୍‍ସେସ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_access_location">ଆପଣଙ୍କ ଅବସ୍ଥାନ ଆକ୍‍ସେସ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_access_notifications">ଆପଣଙ୍କ ସୂଚନାବଳି ପଢନ୍ତୁ</string>
+  <string name="app_ops_activate_vpn">ଏକ VPN ସକ୍ରିୟ କରନ୍ତୁ</string>
+  <string name="app_ops_auto_start">ପାୱା‌ର୍‍ ଅପ୍‍ ସମୟରେ ଆ୍ର‍ମ୍ଭ କରନ୍ତୁ</string>
+  <string name="app_ops_delete_call_log">ଆପଣଙ୍କ କଲ୍‍ ସୂଚୀ ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="app_ops_delete_contacts">ଆପଣଙ୍କ ସମ୍ପର୍କଗୁଡିକ ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="app_ops_delete_mms">ଆପଣଙ୍କ MMS ସନ୍ଦେଶ ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="app_ops_delete_sms">ଆପଣଙ୍କ SMS ସନ୍ଦେଶ ବିଲୋପ କରନ୍ତୁ</string>
+  <string name="app_ops_draw_on_top">ଶୀଷରେ ୱିଣ୍ଡୋଜ୍‍ ଆଙ୍କନ୍ତୁ</string>
+  <string name="app_ops_get_usage_stats">ଆପ୍ଲିକେସନ୍‍ ବ୍ୟବହାରର ପରିସଂଖ୍ୟାନ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_keep_device_awake">ଆପଣଙ୍କ ଡିଭାଇ‌ସ୍‍କୁ ଜାଗ୍ରତ ରଖନ୍ତୁ</string>
+  <string name="app_ops_make_phone_call">ଏକ ଫୋନ୍‍ କଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_modify_calendar">ଆପଣଙ୍କ କ୍ୟାଲେନ୍ଡର ଅଦ୍ୟତନ କରନ୍ତୁ</string>
+  <string name="app_ops_modify_call_log">କଲ୍‍ ସୂଚୀ ଅଦ୍ୟତନ କରନ୍ତୁ</string>
+  <string name="app_ops_modify_clipboard">କ୍ଲି‌ପ୍‍ବୋର୍ଡ୍‍ ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <string name="app_ops_modify_contacts">ଆପଣଙ୍କ ସମ୍ପର୍କଗୁଡିକ ଅଦ୍ୟତନ କରନ୍ତୁ</string>
+  <string name="app_ops_modify_settings">ସିଷ୍ଟମ୍‍ ସେଟିଂଗୁଡିକ ଅଦ୍ୟତନ କରନ୍ତୁ</string>
+  <string name="app_ops_mute_unmute_microphone">ମାଇକ୍ରୋଫୋନ୍‍ ମ୍ୟୁଟ୍‍/ଅନ୍‍ମ୍ୟୁଟ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_play_audio">ଅଡିଓ ବଜାନ୍ତୁ</string>
+  <string name="app_ops_post_notification">ଏକ ନୋଟିଫିକେସନ୍‍ ପୋଷ୍ଟ କରନ୍ତୁ</string>
+  <string name="app_ops_project_media">ପ୍ରୋଜେକ୍ଟ ମିଡିଆ</string>
+  <string name="app_ops_read_calendar">ଆପଣଙ୍କ କ୍ୟା୍ଲେଣ୍ଡର ପଢନ୍ତୁ</string>
+  <string name="app_ops_read_call_log">କଲ୍‍ ସୂଚୀ ପଢନ୍ତୁ</string>
+  <string name="app_ops_read_clipboard">କ୍ଲିପ୍‍ବୋର୍ଡ ପଢନ୍ତୁ</string>
+  <string name="app_ops_read_contacts">ଆପଣଙ୍କ ସମ୍ପର୍କଗୁଡିକ ପଢନ୍ତୁ</string>
+  <string name="app_ops_read_mms">ଆପଣଙ୍କ MMS ସନ୍ଦେଶ ପଢନ୍ତୁ</string>
+  <string name="app_ops_read_sms">ଆପଣଙ୍କ SMS ସନ୍ଦେଶ ପଢନ୍ତୁ</string>
+  <string name="app_ops_receive_sms">ଏକ SMS ସନ୍ଦେଶ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <string name="app_ops_record_audio">ଅଡିଓ ରେକର୍ଡ କରନ୍ତୁ</string>
+  <string name="app_ops_send_mms">ଏକ MMS ସନ୍ଦେଶ ପଠାନ୍ତୁ</string>
+  <string name="app_ops_send_sms">ଏକ SMS ସନ୍ଦେଶ ପଠାନ୍ତୁ</string>
+  <string name="app_ops_start_at_bootup">ପାୱା‌ର୍‍ ଅପ୍‍ ସମୟରେ ଆ୍ର‍ମ୍ଭ କରନ୍ତୁ</string>
+  <string name="app_ops_toast_window">ଟୋଷ୍ଟ ସନ୍ଦେଶ ପ୍ରଦର୍ଶନ କରନ୍ତୁ</string>
+  <string name="app_ops_toggle_bluetooth">ବ୍ଲୁଟୁଥ୍‍ ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_toggle_mobile_data">ଡାଟା ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_toggle_nfc">NFC ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_toggle_wifi">WiFi ଟୋଗଲ୍‍ କରନ୍ତୁ</string>
+  <string name="app_ops_use_alarm_volume">ଆଲାର୍ମ୍‍ ଭୋଲ୍ୟୁମ୍‍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_use_audio_focus">ଅଡିଓ ଫୋକସ୍‍‍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_use_bluetooth_volume">ବ୍ଲୁଟୁଥ୍‍ ଭୋଲ୍ୟୁମ୍‍‍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_use_master_volume">ମାଷ୍ଟର୍‍ ଭୋଲ୍ୟୁମ୍‍‍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_use_media_buttons">ମିଡିଆ ବଟ‌ନ୍‍ଗୁଡିକ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_use_media_volume">ମିଡିଆ ଭୋଲ୍ୟୁମ୍‍‍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_use_notification_volume">ନୋଟିଫିକେସନ୍‍ ଭୋଲ୍ୟୁମ୍‍‍‍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_use_ring_volume">ରିଙ୍ଗ୍‍ଟୋନ୍‍ ଭୋଲ୍ୟୁମ୍‍‍‍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_use_vibrate">ହାପ୍‍ଟିକ୍‍ ଫିଡ୍‍ବ୍ୟାକ୍‍ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_use_voice_volume">ସ୍ୱର କଲ୍‍ ଭୋଲ୍ୟୁମ୍‍‍‍ ନିୟନ୍ତ୍ରଣ କରନ୍ତୁ</string>
+  <string name="app_ops_write_mms">ଏକ MMS ସନ୍ଦେଶ ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_write_sms">ଏକ SMS ସନ୍ଦେଶ ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_use_fingerprint">ଫିଙ୍ଗର୍‍ପ୍ରିଣ୍ଟ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_add_voicemail">ଭଏସମେଲ୍ ଯୋଗ କରନ୍ତୁ</string>
+  <string name="app_ops_read_phone_state">ଆକ୍ସେସ୍ ଫୋନ୍ ସ୍ଟେଟ</string>
+  <string name="app_ops_scan_wifi">ସ୍କାନ୍ Wi-Fi ନେଟୱାର୍କ</string>
+  <string name="app_ops_change_wallpaper">ୱାଲପେପର୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
+  <string name="app_ops_assist_structure">ନିର୍ମାଣର ସହାୟତା ପାଇଁ ବ୍ୟବହାର</string>
+  <string name="app_ops_assist_screenshot">ସ୍କ୍ରିନ୍‍ସଟ୍‍ ନିଅନ୍ତୁ</string>
+  <string name="app_ops_use_body_sensors">ବଡି ସେନସର୍ ବ୍ୟବହାର କରନ୍ତୁ</string>
+  <string name="app_ops_read_cell_broadcasts">ସେଲ୍ ପ୍ରସାରଣ ପଢ</string>
+  <string name="app_ops_mock_location"> ଆପଣଙ୍କ ନକଲି ଅବସ୍ଥାନ</string>
+  <string name="app_ops_read_external_storage">ବାହ୍ୟ ଷ୍ଟୋରେଜ୍ ପଢନ୍ତୁ</string>
+  <string name="app_ops_write_external_storage">ବାହ୍ୟ ଷ୍ଟୋରେଜ୍ ଲେଖନ୍ତୁ</string>
+  <string name="app_ops_turn_on_screen">ସ୍କ୍ରିନ୍‍ ଅନ କରନ୍ତୁ</string>
+  <string name="app_ops_get_accounts">ଡିଭାଇସ୍ ଆକାଉଣ୍ଟ ମିଳିଲା</string>
+  <string name="app_ops_wifi_change">Wi-Fi ସ୍ତିତି ପରିବର୍ତ୍ତନ କରନ୍ତୁ</string>
+  <string name="app_ops_su">ରୁଟ୍‍ ପ୍ରବେଶ ପ୍ରାପ୍ତ କରନ୍ତୁ</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">ଏହି ସ୍କ୍ରିନ୍‍ ଅନ୍‍ପିନ୍‍ କରିବା ପାଇଁ, ବ୍ୟାକ୍‍ ବଟନ୍‍ ସ୍ପର୍ଶ କରନ୍ତୁ ଓ ଧରିରଖନ୍ତୁ।</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">ସଂଯୋଗ ହୋଇଥିବା କିଛି ଡିଭାଇସ୍‍ ନା୍ହିଁ</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ସଂଯୋଗ ହୋଇଥିବା ଡିଭାଇସ୍</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> ସଂଯୋଗ ହୋଇଥିବା ଡିଭାଇସ୍ଗୁଡିକ</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">ଉନ୍ମୋଚନ କରିବା ପାଇଁ ଅବରୋଧ</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g>ଆରମ୍ଭ କରିବାରୁ ସୁରକ୍ଷିତ | ପ୍ରମାଣିତ ଏବଂ ଆବେଦନ ପାଇଁ ଟ୍ୟାପ୍ କରନ୍ତୁ |</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">ବ୍ୟାଟେରୀ ସମ୍ପୁର୍ଣ ଚାରଜ୍ ହୋଇସାରିଛି</string>
+  <string name="notify_battery_fully_charged_text">ଚାରଜରୁ ଡିଭାଇସ୍ ଅଲଗାକରନ୍ତୁ ବ୍ୟାଟେରୀର ଦୀର୍ଘାୟୁ କରିବା ପାଇଁ</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">ବ୍ୟାଟେରୀ ପରିସଂଖ୍ୟାନ ରିସେଟ୍‍ କରନ୍ତୁ</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">ସମ୍ପ୍ରତି ଲୋ-ଲେବେଲ୍‍ ବ୍ୟାଟେରୀ ବ୍ୟବହାର ତଥ୍ୟକୁ ରିସେଟ୍‍ କରିବା ପାଇଁ ଏକ ଆପ୍ଲିକେସନ୍‍କୁ ଅନୁମତି ଦିଏ।</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-or-rIN/strings.xml b/core/res/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..58b884b
--- /dev/null
+++ b/core/res/res/values-or-rIN/strings.xml
@@ -0,0 +1,1627 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
+  <!-- Suffix added to a number to signify size in kilobytes. -->
+  <!-- Suffix added to a number to signify size in megabytes. -->
+  <!-- Suffix added to a number to signify size in gigabytes. -->
+  <!-- Suffix added to a number to signify size in terabytes. -->
+  <!-- Suffix added to a number to signify size in petabytes. -->
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
+  <!-- How to display the lack of a phone number -->
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
+  <!-- Displayed when a phone feature such as call barring was activated. -->
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
+  <!-- Displayed when a SIM password was entered incorrectly. -->
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
+  <!-- Displayed when a SIM PUK password is too short. -->
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, Data -->
+  <!-- Example: Service was enabled for: Voice, FAX -->
+  <!-- Example: Service was enabled for: Voice, SMS -->
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
+  <!-- Displayed when the call forwarding query was forwarded. -->
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
+  <!-- Displayed when a web request failed with a generic network error. -->
+  <!-- Displayed when a web request failed because the URL could not be found. -->
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
+  <!-- Displayed when a web request failed because the authentication failed. -->
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
+  <!-- Displayed when a web request failed because there was a connection error. -->
+  <!-- Displayed when a web request failed because there was an input or output error. -->
+  <!-- Displayed when a web request failed because the request timed out -->
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
+  <!-- Displayed when a request failed because we failed to open the file. -->
+  <!-- Displayed when a request failed because the file wasn't found. -->
+  <!-- Displayed when a request failed because there are too many requests right now. -->
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
+  <!-- Button to lock the screen, within the Phone Options dialog -->
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
+  <!-- label for item that locks the phone in the phone options dialog -->
+  <!-- label for item that turns off power in phone options dialog -->
+  <!-- label for item that generates a bug report in the phone options dialog -->
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
+  <!-- status message in phone options dialog for when silent mode is enabled -->
+  <!-- status message in phone options dialog for when silent mode is disabled -->
+  <!-- label for item that toggles airplane mode -->
+  <!-- status message in phone options dialog for when airplane mode is on -->
+  <!-- status message in phone options dialog for when airplane mode is off -->
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
+  <!-- Label for the Android system components when they are shown to the user. -->
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to wipe primary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
+  <!-- Custom phone number type -->
+  <!-- Home phone number type -->
+  <!-- Mobile phone number type -->
+  <!-- Work phone number type -->
+  <!-- Work fax phone number type -->
+  <!-- Home fax phone number type -->
+  <!-- Pager phone number type -->
+  <!-- Other phone number type -->
+  <!-- Callback phone number type -->
+  <!-- Car phone number type -->
+  <!-- Company main phone number type -->
+  <!-- ISDN phone number type -->
+  <!-- Main phone number type -->
+  <!-- Other fax phone number type -->
+  <!-- Radio phone number type -->
+  <!-- Telex phone number type -->
+  <!-- TTY TDD phone number type -->
+  <!-- Work mobile phone number type -->
+  <!-- Work pager phone number type -->
+  <!-- Assistant phone number type -->
+  <!-- MMS phone number type -->
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
+  <!-- Label for other events  [CHAR LIMIT=20] -->
+  <!-- Custom email type -->
+  <!-- Home email type -->
+  <!-- Work email type -->
+  <!-- Other email type -->
+  <!-- Mobile email type -->
+  <!-- Custom postal address type -->
+  <!-- Home postal address type -->
+  <!-- Work postal address type -->
+  <!-- Other postal address type -->
+  <!-- Custom IM address type -->
+  <!-- Home IM address type -->
+  <!-- Work IM address type -->
+  <!-- Other IM address type -->
+  <!-- Custom IM protocol type -->
+  <!-- AIM IM protocol type -->
+  <!-- MSN IM protocol type -->
+  <!-- Yahoo IM protocol type -->
+  <!-- Skype IM protocol type -->
+  <!-- QQ IM protocol type -->
+  <!-- Google Talk IM protocol type -->
+  <!-- ICQ IM protocol type -->
+  <!-- Jabber IM protocol type -->
+  <!-- NetMeeting IM protocol type -->
+  <!-- Work organization type -->
+  <!-- Other organization type -->
+  <!-- Custom organization type -->
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
+  <!-- Child relationship type [CHAR LIMIT=20] -->
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Father relationship type [CHAR LIMIT=20] -->
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
+  <!-- Home SIP address type. Same context as Home phone type. -->
+  <!-- Work SIP address type. Same context as Work phone type. -->
+  <!-- Other SIP address type. Same context as Other phone type. -->
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user how to unlock the phone. -->
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
+  <!-- Button to try to unlock the phone using username and password -->
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
+  <!-- Displayed on lock screen's left tab - unlock -->
+  <!-- Displayed on lock screen's right tab - turn sound on -->
+  <!-- Displayed on lock screen's right tab - turn sound off -->
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
+  <!-- Title of the alert when something went wrong in the factory test. -->
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
+  <!-- Error message displayed when the factory test could not be started. -->
+  <!-- Button to restart the device after the factory test. -->
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
+  <!-- Default title for a javascript dialog -->
+  <!-- Title for the unload javascript dialog -->
+  <!-- Text for the positive button on the unload javascript dialog -->
+  <!-- Text for the negative button on the unload javascript dialog -->
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
+  <!-- Toast for double-tap -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Do not translate. Regex used by AutoFill. -->
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
+  <!-- This is used to express that something happened longer ago than the previous options -->
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
+  <!-- Appened to express the value is this unit of time: singular day -->
+  <!-- Appened to express the value is this unit of time: plural days -->
+  <!-- Appened to express the value is this unit of time: singular hour -->
+  <!-- Appened to express the value is this unit of time: plural hours -->
+  <!-- Appened to express the value is this unit of time: singular minute -->
+  <!-- Appened to express the value is this unit of time: plural minutes -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Appened to express the value is this unit of time. -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
+  <!-- Button to close error alert when a video cannot be played -->
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
+  <!-- Quoted name for 12pm, lowercase -->
+  <!-- Quoted name for 12pm, uppercase first letter -->
+  <!-- Quoted name for 12am, lowercase -->
+  <!-- Quoted name for 12am, uppercase first letter -->
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
+  <!-- EditText context menu -->
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- Preference framework strings. -->
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
+  <!-- Text shown by list fragment when waiting for data to display. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Default text for a button that can be toggled on and off. -->
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
+  <!-- title for the USB activity chooser. -->
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
+  <!-- Title of the dialog where the user is adjusting the music volume -->
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
+  <!-- The title of the ringtone picker dialog. -->
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
+  <!-- Shown for an application when it doesn't require any permission grants. -->
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
+  <!-- See USB_STORAGE. This is the message. -->
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
+  <!-- Dialog title for user to select a different wallpaper from service list -->
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
+  <!-- The title of the notification when VPN is active with an application name. -->
+  <!-- The text of the notification when VPN is active. -->
+  <!-- The text of the notification when VPN is active with a session name. -->
+  <!-- Notification title when connecting to lockdown VPN. -->
+  <!-- Notification title when connected to lockdown VPN. -->
+  <!-- Notification title when error connecting to lockdown VPN. -->
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
+  <!-- Label for the file upload control when no file has been chosen yet -->
+  <!-- Label for <input type="reset"> button in html -->
+  <!-- Label for <input type="submit"> button in html -->
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
+  <!-- Error message when the sync tried to delete too many things -->
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
+  <!-- Choose Account Activity label -->
+  <!-- List item to add an account [CHAR LIMIT=20] -->
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
+  <!-- Message on an SSL Certificate dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Label for an information field on an SSL Certificate Dialog -->
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
+  <!-- STK sending DTMF, SMS, USSD, SS -->
+  <!-- STK launch Browser -->
+  <!-- STK setup Call -->
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
+  <!-- Status message for remote routes attempting to scan/determine availability -->
+  <!-- Status message for a remote route attempting to connect -->
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
+  <!-- Status message for remote routes that are not available for connection right now -->
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters the wrong PIN code -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- The delete-widget drop target button text -->
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
+  <!-- Error message title [CHAR LIMIT=35] -->
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
+</resources>
diff --git a/core/res/res/values-pa-rIN/cm_strings.xml b/core/res/res/values-pa-rIN/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-pa-rIN/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-pl/cm_strings.xml b/core/res/res/values-pl/cm_strings.xml
index f9706fc..c0edab4 100644
--- a/core/res/res/values-pl/cm_strings.xml
+++ b/core/res/res/values-pl/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Zrzut ekranu</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">odbieranie chronionych SMS-ów</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Umożliwia aplikacji odbieranie przychodzących chronionych SMS-ów.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">Modyfikowanie listy chronionych SMS-ów</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Umożliwia aplikacji modyfikowanie listy chronionych SMS-ów.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Zabezpieczenia</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Uprawnienia związane z informacjami o bezpieczeństwie urządzenia.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">odczytywanie czarnej listy</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Umożliwia aplikacji odczytywanie informacji o numerach telefonów, od których przychodzące połączenia i wiadomości są blokowane.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">edytowanie czarnej listy</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Umożliwia aplikacji zmianę numerów telefonów, od których przychodzące połączenia i wiadomości są blokowane.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Ustawianie tła ekranu blokady</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Umożliwia aplikacji zmianę tła ekranu blokady.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Uruchom ponownie</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Bieżący</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Uruchom ponownie</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Uruchom w trybie Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Uruchom w trybie Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Uruchom w trybie Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Miękki restart</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Uruchom ponownie</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tablet zostanie uruchomiony ponownie.</string>
   <string name="reboot_confirm" product="default">Telefon zostanie uruchomiony ponownie.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Ponowne uruchamianie\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplikacja została zamknięta</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB przez sieć włączone</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB przez USB &amp; sieć włączone</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Dotknij, aby wyłączyć debugowanie.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; sieć</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Sieć</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">przechwytywanie uruchamiania aplikacji</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">Nie zainstalowano aplikacji %s</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Priorytet</string>
   <string name="silent_mode_none">Brak</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wyłączono hotspot WiFi z powodu zmiany karty SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Wyłącz Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">włącz/wyłącz Ochronę Prywatności</string>
   <string name="permdesc_changePrivacyGuardState">Pozwala aplikacji decydować, kiedy inna aplikacja zostanie uruchomiona w trybie ochrony prywatności. W trybie tym aplikacje nie mają dostępu do osobistych danych użytkownika, takich jak kontakty, historia połączeń czy wiadomości.</string>
   <string name="privacy_guard_notification">Ochrona prywatności aktywna</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> nie będzie mieć dostępu do osobistych danych</string>
   <string name="privacy_guard_dialog_title">Ochrona prywatności</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> czy chciałbyś <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Zapamiętaj mój wybór</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">dostęp do kamery</string>
   <string name="app_ops_access_location">dostęp do lokalizacji</string>
   <string name="app_ops_access_notifications">czytanie powiadomień</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">dostęp do kont urządzenia</string>
   <string name="app_ops_wifi_change">zmiana stanu Wi-Fi</string>
   <string name="app_ops_su">dostęp do roota</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Aby odpiąć ekran, dotknij i przytrzymaj przycisk Wstecz.</string>
-  <string name="live_display_auto">Automatycznie</string>
-  <string name="live_display_auto_summary">Automatycznie dostosuj temperaturę kolorów ekranu po zachodzie i wschodzie słońca</string>
-  <string name="live_display_off">Wyłączony</string>
-  <string name="live_display_off_summary">Wyłącz wszystkie zmiany</string>
-  <string name="live_display_day">Dzień</string>
-  <string name="live_display_day_summary">Używaj tylko ustawień na dzień</string>
-  <string name="live_display_night">Noc</string>
-  <string name="live_display_night_summary">Używaj ustawień tylko w nocy</string>
-  <string name="live_display_outdoor">Na zewnątrz (jasne światło)</string>
-  <string name="live_display_outdoor_summary">Używaj ustawienia tylko na zewnątrz</string>
-  <string name="live_display_hint">LiveDisplay może pomóc w zredukowaniu efektu zmęczenia oczu oraz pomaga zasnąć w nocy. Kliknij tutaj, aby wypróbować!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Brak podłączonego urządzenia</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> podłączone urządzenie</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s </xliff:g> podłączone urządzenia</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Aktywność uruchamiania zablokowana</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s </xliff:g> jest chroniony(a) przed uruchomieniem. Kliknij, aby uwierzytelnić i uruchomić tę aplikację.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Bateria naładowana</string>
   <string name="notify_battery_fully_charged_text">Odłącz urządzenie od ładowarki, aby poprawić żywotność baterii.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">resetowanie statystyk baterii</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Umożliwia aplikacji na zresetowanie statystyk użycia baterii.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Karty SIM zostały zamienione</string>
+  <string name="uicc_hot_swapped_event_text">Dotknij, aby ustawić domyślne preferencje karty SIM</string>
 </resources>
diff --git a/core/res/res/values-pt-rBR/cm_strings.xml b/core/res/res/values-pt-rBR/cm_strings.xml
index 622e01a..9957b78 100644
--- a/core/res/res/values-pt-rBR/cm_strings.xml
+++ b/core/res/res/values-pt-rBR/cm_strings.xml
@@ -17,64 +17,102 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="global_action_screenshot">Capturar tela</string>
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">Captura de tela</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">receber SMS protegido</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Permite ao aplicativo receber um SMS protegido.</string>
-  <string name="permlab_modifyProtectedSmsList">modifica a lista de SMS protegidos</string>
-  <string name="permdesc_modifyProtectedSmsList">Permite ao aplicativo modificar a lista de endereço de SMS protegido.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">modificar lista de SMS protegidos</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">Permite ao aplicativo modificar a lista de endereços de SMS protegido.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Segurança</string>
-  <string name="permgroupdesc_security">Permissões relacionadas com as informações de segurança do aparelho.</string>
-  <string name="permlab_readPhoneBlacklist">Ler a lista negra do telefone</string>
-  <string name="permdesc_readPhoneBlacklist">Permite que um aplicativo leia informações sobre números de telefone bloqueados para efetuar chamadas ou enviar mensagens.</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">Permissões relacionadas às informações de segurança do aparelho.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">ler a lista negra do telefone</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">Permite que um aplicativo leia informações sobre números de telefone bloqueados para receber chamadas ou mensagens.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">alterar a lista negra do telefone</string>
-  <string name="permdesc_changePhoneBlacklist">Permite que um aplicativo altere os números de telefone bloqueados para efetuar chamadas ou enviar mensagens.</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">Permite que um aplicativo altere os números de telefone bloqueados para receber chamadas ou enviar mensagens.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">definir papel de parede da tela de bloqueio</string>
-  <string name="permdesc_setKeyguardWallpaper">Permite um aplicativo a trocar o papel de parede da tela de bloqueio.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">Permite que um aplicativo mude o papel de parede da tela de bloqueio.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reiniciar</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Atual</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reiniciar</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recuperação</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Reiniciar via software</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reiniciar</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Seu tablet irá reiniciar.</string>
   <string name="reboot_confirm" product="default">Seu telefone irá reiniciar.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Reiniciando\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplicativo encerrado</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB sobre rede ativado</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ABD sobre USB e rede ativado</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Toque para desativar a depuração.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB e rede</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Rede</string>
-  <string name="permlab_interceptPackageLaunch">interceptar inicialização de app</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">interceptar início de aplicativo</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s não está instalado</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioridade</string>
   <string name="silent_mode_none">Nenhum</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Hotspot Wi-Fi desativado devido a mudança de assinatura do SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Desligar Wi-Fi</string>
-  <string name="permlab_changePrivacyGuardState">ativar ou desativar a Proteção da Privacidade</string>
-  <string name="permdesc_changePrivacyGuardState">Permite ao aplicativo alterar se outra aplicação executa com Proteção à Privacidade. Quando um aplicativo estiver executando com Proteção à Privacidade, ela será capaz de acessar dados pessoais como contatos, registro de chamadas, ou mensagens.</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">ativar ou desativar a Proteção à Privacidade</string>
+  <string name="permdesc_changePrivacyGuardState">Permite ao aplicativo alterar se outro aplicativo é executado com Proteção à Privacidade. Quando um aplicativo estiver sendo executado com Proteção à Privacidade, ele não terá acesso a dados pessoais como contatos, registro de chamadas ou mensagens.</string>
   <string name="privacy_guard_notification">Proteção à Privacidade ativa</string>
-  <string name="privacy_guard_notification_detail"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="app">%1$s</xliff:g> não será capaz de acessar dados pessoais</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> não terá acesso a dados pessoais</string>
   <string name="privacy_guard_dialog_title">Proteção à Privacidade</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> gostaria de <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Lembrar minha escolha</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">acessar a câmera</string>
   <string name="app_ops_access_location">acessar sua localização</string>
   <string name="app_ops_access_notifications">ler suas notificações</string>
   <string name="app_ops_activate_vpn">ativar uma VPN</string>
   <string name="app_ops_auto_start">iniciar ao ligar</string>
-  <string name="app_ops_delete_call_log">excluir seu registro de chamadas</string>
-  <string name="app_ops_delete_contacts">excluir seus contatos</string>
-  <string name="app_ops_delete_mms">excluir suas mensagens MMS</string>
-  <string name="app_ops_delete_sms">excluir suas mensagens SMS</string>
+  <string name="app_ops_delete_call_log">deletar seu registro de chamadas</string>
+  <string name="app_ops_delete_contacts">deletar seus contatos</string>
+  <string name="app_ops_delete_mms">deletar suas mensagens MMS</string>
+  <string name="app_ops_delete_sms">deletar suas mensagens SMS</string>
   <string name="app_ops_draw_on_top">desenhar janelas em primeiro plano</string>
-  <string name="app_ops_get_usage_stats">obter estatísticas de uso do aplicativo</string>
+  <string name="app_ops_get_usage_stats">obter estatísticas de uso de aplicativo</string>
   <string name="app_ops_keep_device_awake">manter seu dispositivo acordado</string>
-  <string name="app_ops_make_phone_call">realizar uma chamada telefônica</string>
+  <string name="app_ops_make_phone_call">fazer uma chamada telefônica</string>
   <string name="app_ops_modify_calendar">atualizar seu calendário</string>
   <string name="app_ops_modify_call_log">atualizar o registro de chamadas</string>
   <string name="app_ops_modify_clipboard">modificar a área de transferência</string>
@@ -82,8 +120,8 @@
   <string name="app_ops_modify_settings">atualizar configurações de sistema</string>
   <string name="app_ops_mute_unmute_microphone">ligar/desligar o microfone</string>
   <string name="app_ops_play_audio">reproduzir áudio</string>
-  <string name="app_ops_post_notification">postar uma notificação</string>
-  <string name="app_ops_project_media">projetar multimídia</string>
+  <string name="app_ops_post_notification">exibir uma notificação</string>
+  <string name="app_ops_project_media">projetar mídia</string>
   <string name="app_ops_read_calendar">ler seu calendário</string>
   <string name="app_ops_read_call_log">ler o registro de chamadas</string>
   <string name="app_ops_read_clipboard">ler a área de transferência</string>
@@ -94,21 +132,21 @@
   <string name="app_ops_record_audio">gravar áudio</string>
   <string name="app_ops_send_mms">enviar uma mensagem MMS</string>
   <string name="app_ops_send_sms">enviar uma mensagem SMS</string>
-  <string name="app_ops_start_at_bootup">iniciar na inicialização</string>
-  <string name="app_ops_toast_window">exibir mensagens flutuantes na tela</string>
+  <string name="app_ops_start_at_bootup">iniciar ao ligar</string>
+  <string name="app_ops_toast_window">exibir mensagens de aviso na tela</string>
   <string name="app_ops_toggle_bluetooth">alternar Bluetooth</string>
   <string name="app_ops_toggle_mobile_data">alternar dados de celular</string>
   <string name="app_ops_toggle_nfc">alternar NFC</string>
   <string name="app_ops_toggle_wifi">alternar Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">controlar volume do alarme</string>
   <string name="app_ops_use_audio_focus">controlar o foco do áudio</string>
-  <string name="app_ops_use_bluetooth_volume">controlar o volume de Bluetooth</string>
+  <string name="app_ops_use_bluetooth_volume">controlar o volume do Bluetooth</string>
   <string name="app_ops_use_master_volume">controlar o volume principal</string>
   <string name="app_ops_use_media_buttons">usar os botões de mídia</string>
   <string name="app_ops_use_media_volume">controlar o volume de mídia</string>
-  <string name="app_ops_use_notification_volume">controlar o volume de notificação</string>
-  <string name="app_ops_use_ring_volume">controlar o volume de campainha</string>
-  <string name="app_ops_use_vibrate">controlar reposta ao toque</string>
+  <string name="app_ops_use_notification_volume">controlar o volume da notificação</string>
+  <string name="app_ops_use_ring_volume">controlar o volume do toque</string>
+  <string name="app_ops_use_vibrate">usar reposta ao toque</string>
   <string name="app_ops_use_voice_volume">controlar o volume de chamadas de voz</string>
   <string name="app_ops_write_mms">escrever uma mensagem MMS</string>
   <string name="app_ops_write_sms">escrever uma mensagem SMS</string>
@@ -123,28 +161,33 @@
   <string name="app_ops_read_cell_broadcasts">ler transmissões da rede de celular</string>
   <string name="app_ops_mock_location">simular a sua localização</string>
   <string name="app_ops_read_external_storage">ler o armazenamento externo</string>
-  <string name="app_ops_write_external_storage">escrever no armazenamento externo</string>
+  <string name="app_ops_write_external_storage">gravar no armazenamento externo</string>
   <string name="app_ops_turn_on_screen">ligar a tela</string>
   <string name="app_ops_get_accounts">obter as contas do dispositivo</string>
   <string name="app_ops_wifi_change">alterar o estado do Wi-Fi</string>
   <string name="app_ops_su">obter acesso super usuário</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Para desafixar esta tela, toque e segure o botão Voltar.</string>
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Ajusta automaticamente a temperatura de cor da tela após o pôr do sol e nascer do sol</string>
-  <string name="live_display_off">Desligado</string>
-  <string name="live_display_off_summary">Desativar todos os ajustes</string>
-  <string name="live_display_day">Dia</string>
-  <string name="live_display_day_summary">Usar apenas configurações de dia</string>
-  <string name="live_display_night">Noite</string>
-  <string name="live_display_night_summary">Use apenas configurações de noite</string>
-  <string name="live_display_outdoor">Ao ar livre (sol forte)</string>
-  <string name="live_display_outdoor_summary">Usar apenas configurações de ao ar livre</string>
-  <string name="live_display_hint">LiveDisplay pode ajudar a reduzir o cansaço visual e ajudá-lo a dormir à noite. Clique aqui para experimentá-lo!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nenhum dispositivo conectado</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo conectado</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivos conectados</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Início de atividade foi bloqueado</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> está protegido de ser iniciado. Toque para autenticar e iniciar o aplicativo.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Bateria totalmente carregada</string>
   <string name="notify_battery_fully_charged_text">Desconecte seu dispositivo do carregador para aumentar a vida útil da bateria.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">redefinir estatísticas da bateria</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permite a um aplicativo redefinir os dados de baixo nível de uso da bateria.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Os cartões SIM foram alterados</string>
+  <string name="uicc_hot_swapped_event_text">Toque para definir as preferências do cartão SIM</string>
 </resources>
diff --git a/core/res/res/values-pt-rPT/cm_strings.xml b/core/res/res/values-pt-rPT/cm_strings.xml
index 53f81eb..db3a1d5 100644
--- a/core/res/res/values-pt-rPT/cm_strings.xml
+++ b/core/res/res/values-pt-rPT/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Captura de ecrã</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">receber SMS protegida</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Permite que a aplicação receba uma SMS protegida.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modificar a lista de SMS protegidas</string>
-  <string name="permdesc_modifyProtectedSmsList">Permite que a aplicação modifique a lista de endereços de SMS protegidas.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">Permite que uma aplicação modifique a lista de endereços de SMS protegidas.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Segurança</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Permissões relacionadas com as informações de segurança do dispositivo.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">Ler a lista negra do telefone</string>
-  <string name="permdesc_readPhoneBlacklist">Permite a uma aplicação ler informações sobre números de telefone que são bloqueados para chamadas ou mensagens de entrada.</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">Permite que uma aplicação leia informações sobre números de telefone que são bloqueados para chamadas ou mensagens de entrada.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">Alterar a lista negra do telefone</string>
-  <string name="permdesc_changePhoneBlacklist">Permite a uma aplicação alterar os números de telefone que são bloqueados para chamadas ou mensagens de entrada.</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">Permite que uma aplicação altere os números de telefone que são bloqueados para chamadas ou mensagens de entrada.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Definir a imagem de fundo do ecrã de bloqueio</string>
-  <string name="permdesc_setKeyguardWallpaper">Permite a uma aplicação trocar a imagem de fundo do ecrã de bloqueio.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">Permite que uma aplicação troque a imagem de fundo do ecrã de bloqueio.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reiniciar</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Atual</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reiniciar</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recuperação</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Reinicialização suave</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reiniciar</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">O seu tablet vai reiniciar.</string>
-  <string name="reboot_confirm" product="default">O seu telemóvel irá reiniciar.</string>
+  <string name="reboot_confirm" product="default">O seu telefone irá reiniciar.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">A reiniciar\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplicação terminada</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB através da rede ativado</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ABD através de USB e da rede ativado</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Toque para desativar a depuração.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB e rede</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Rede</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Intercetar a inicialização de uma aplicação</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s não está instalada</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioridade</string>
   <string name="silent_mode_none">Nenhum</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Zona Wi-Fi portátil desligada devido à alteração da assinatura SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Desligar Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">ativar ou desativar a Proteção da Privacidade</string>
   <string name="permdesc_changePrivacyGuardState">Permite à aplicação escolher se outra aplicação corre com Proteção da Privacidade. Quando uma aplicação corre com Proteção da Privacidade, não terá acesso a dados pessoais como contactos, registo de chamadas ou mensagens.</string>
   <string name="privacy_guard_notification">Proteção da Privacidade ativa</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> não poderá aceder a dados pessoais</string>
   <string name="privacy_guard_dialog_title">Proteção da Privacidade</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="aplicação">%1$s</xliff:g> gostaria de <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Memorizar a minha escolha</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">aceder à câmara</string>
   <string name="app_ops_access_location">aceder à sua localização</string>
   <string name="app_ops_access_notifications">ler as suas notificações</string>
@@ -96,7 +134,7 @@
   <string name="app_ops_send_sms">Enviar uma mensagem SMS</string>
   <string name="app_ops_start_at_bootup">iniciar no arranque</string>
   <string name="app_ops_toast_window">exibir avisos no ecrã</string>
-  <string name="app_ops_toggle_bluetooth">alternar bluetooth</string>
+  <string name="app_ops_toggle_bluetooth">ligar/desligar o bluetooth</string>
   <string name="app_ops_toggle_mobile_data">alternar o estado dos dados móveis</string>
   <string name="app_ops_toggle_nfc">alternar NFC</string>
   <string name="app_ops_toggle_wifi">alternar Wi-Fi</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">obter contas do dispositivo</string>
   <string name="app_ops_wifi_change">alterar o estado do Wi-Fi</string>
   <string name="app_ops_su">obter acesso root</string>
-  <string name="lock_to_app_toast_no_navbar">Para soltar este ecrã, toque e segure o botão Voltar.</string>
-  <string name="live_display_auto">Automático</string>
-  <string name="live_display_auto_summary">Ajusta automaticamente a temperatura de cor do ecrã após o pôr do sol e o nascer do sol</string>
-  <string name="live_display_off">Desligado</string>
-  <string name="live_display_off_summary">Desativar todos os ajustes</string>
-  <string name="live_display_day">Dia</string>
-  <string name="live_display_day_summary">Usar apenas as definições de dia</string>
-  <string name="live_display_night">Noite</string>
-  <string name="live_display_night_summary">Usar apenas as definições de noite</string>
-  <string name="live_display_outdoor">Exterior (sol brilhante)</string>
-  <string name="live_display_outdoor_summary">Usar apenas as definições de exterior</string>
-  <string name="live_display_hint">LiveDisplay pode ajudar a reduzir a fadiga ocular e ajudar-te a dormir à noite. Clique aqui para experimentar!</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">Para soltar este ecrã, toque e segure o botão Anterior.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nenhum dispositivo conectado</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivo conectado</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> dispositivos conectados</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Início de atividades bloqueado</string>
   <string name="notify_package_component_protected_text">A abertura de <xliff:g id="app_name">%1$s</xliff:g> está protegida. Toque para se autenticar e poder iniciar a aplicação.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Bateria completamente carregada</string>
   <string name="notify_battery_fully_charged_text">Desligue o carregador do dispositivo para aumentar a vida útil da bateria.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">reiniciar estatísticas da bateria</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permite que uma aplicação reinicie os dados de utilização de baixo nível da bateria.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Os cartões SIM foram alterados</string>
+  <string name="uicc_hot_swapped_event_text">Toque para definir as preferências do cartão SIM</string>
 </resources>
diff --git a/core/res/res/values-rm/cm_strings.xml b/core/res/res/values-rm/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-rm/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-ro/cm_strings.xml b/core/res/res/values-ro/cm_strings.xml
index 2640c3f..1587713 100644
--- a/core/res/res/values-ro/cm_strings.xml
+++ b/core/res/res/values-ro/cm_strings.xml
@@ -17,50 +17,88 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Captură de ecran</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">primește SMS-uri protejate</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Permite aplicației să primească un SMS protejat.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">modifică lista de SMS-uri protejate</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Permite aplicației să modifice lista adreselor SMS protejate.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Securitate</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Permisiunile legate de informațiile de securitate ale dispozitivului.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">citește lista neagră a telefonului</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Permite unei aplicații să citească informații despre numerele de telefon care sunt blocate pentru primirea de apeluri sau de mesaje.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">schimbă lista neagră a telefonului</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Permite unei aplicații să schimbe numere de telefon care sunt blocate pentru primirea de apeluri sau mesaje.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">setare fundal ecran de blocare</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Permite unei aplicații să schimbe imaginea de fundal a ecranului de blocare.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Repornire</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Actual</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Repornire</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Descărcare</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Repornirea sistemului</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Repornire</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tableta va reporni.</string>
   <string name="reboot_confirm" product="default">Telefonul dvs. va reporni.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Repornire\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplicație oprită</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB prin rețea activ</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB prin USB &amp; rețea activ</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Apasă pentru dezactivarea depanării.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; rețea</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Rețea</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">interceptează lansarea aplicației</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s nu este instalată</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritate</string>
   <string name="silent_mode_none">Nimic</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Oprește Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">activează sau dezactivează Privacy Guard</string>
   <string name="permdesc_changePrivacyGuardState">Permite aplicației să stabilească dacă o altă aplicație rulează cu garda de confidențialitate. Când o aplicație rulează cu garda de confidențialitate, nu va avea acces la date personale, cum ar fi contacte, jurnalul de apeluri sau mesaje.</string>
   <string name="privacy_guard_notification">Protejarea datelor activată</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> nu va putea accesa datele personale</string>
   <string name="privacy_guard_dialog_title">Privacy Guard</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> dorește să <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Memorează alegerea mea</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">accesează camera</string>
   <string name="app_ops_access_location">accesează locația</string>
   <string name="app_ops_access_notifications">citește notificările</string>
@@ -127,22 +165,25 @@
   <string name="app_ops_get_accounts">obține conturile dispozitivului</string>
   <string name="app_ops_wifi_change">schimbă starea Wi-Fi</string>
   <string name="app_ops_su">obțină acces root</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Pentru a anula fixarea acestui ecran, atingeți și țineți apăsat butonul Înapoi.</string>
-  <string name="live_display_auto">Automat</string>
-  <string name="live_display_auto_summary">Reglează automat temperatura de culoare de pe ecran după apus și răsărit</string>
-  <string name="live_display_off">Oprit</string>
-  <string name="live_display_off_summary">Dezactivează toate ajustările</string>
-  <string name="live_display_day">Zi</string>
-  <string name="live_display_day_summary">Utilizați numai setările de zi</string>
-  <string name="live_display_night">Noapte</string>
-  <string name="live_display_night_summary">Utilizați numai setările de noapte</string>
-  <string name="live_display_outdoor">În aer liber (soare strălucitor)</string>
-  <string name="live_display_outdoor_summary">Utilizați numai setările în aer liber</string>
-  <string name="live_display_hint">LiveDisplay poate reduce oboseala ochilor și vă poate ajuta să dormiți noaptea. Apăsați aici pentru a-l încerca!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Niciun dispozitiv conectat</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> dispozitiv conectat</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s </xliff:g> dispozitive conectate</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Lansarea activității blocată</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Acumulator încărcat complet</string>
   <string name="notify_battery_fully_charged_text">Deconectați aparatul de la încărcător pentru a îmbunătăți longevitatea bateriei.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">resetează statisticile bateriei</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Permite unei aplicații să reseteze datele curente de utilizare a bateriei.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-ru/cm_strings.xml b/core/res/res/values-ru/cm_strings.xml
index 34278d0..38f6a59 100644
--- a/core/res/res/values-ru/cm_strings.xml
+++ b/core/res/res/values-ru/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Скриншот</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">Получение защищённых SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Приложение сможет получать входящие защищённые SMS-сообщения.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">Изменение списка защищённых SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Приложение сможет изменять список адресатов защищённых SMS-сообщений.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Безопасность</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Разрешения, относящиеся к безопасности данных на устройстве.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">Просмотр чёрного списка</string>
-  <string name="permdesc_readPhoneBlacklist">Приложение сможет считывать информацию о списке абонентов, от которых заблокированы входящие звонки или сообщения.</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">Приложение сможет считывать информацию о списке абонентов, от которых заблокированы входящие вызовы или сообщения.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">Изменение чёрного списка</string>
-  <string name="permdesc_changePhoneBlacklist">Приложение сможет изменять список абонентов, от которых заблокированы входящие звонки или сообщения.</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">Приложение сможет изменять список абонентов, от которых заблокированы входящие вызовы или сообщения.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">Установка обоев экрана блокировки</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Приложение сможет изменять обои экрана блокировки устройства.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Перезагрузить</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Текущий</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Перезагрузка</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Режим восстановления</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Загрузчик</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Режим обновления ПО</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Перезапуск интерфейса</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Перезагрузка</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Ваш планшет будет перезагружен.</string>
   <string name="reboot_confirm" product="default">Ваш телефон будет перезагружен.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Перезагрузка\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Приложение закрыто</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">Отладка по сети разрешена</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">Отладка по сети и USB разрешена</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Нажмите, чтобы отключить отладку.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">Отладка <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">по сети и USB</string>
   <string name="adb_active_custom_tile_usb">по USB</string>
   <string name="adb_active_custom_tile_net">по сети</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Перехват запуска приложений</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">«%s» не установлено</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Важные</string>
   <string name="silent_mode_none">Нет</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Точка доступа Wi-Fi отключена из-за переключения SIM-карты</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Выключить Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Включение или выключение защищённого режима</string>
   <string name="permdesc_changePrivacyGuardState">Приложение сможет изменять состояние защищённого режима для других приложений. Когда приложение запущено в защищённом режиме, оно не получает доступ к персональным данным, таким как контакты, сообщения или журнал звонков.</string>
   <string name="privacy_guard_notification">Защищённый режим включён</string>
   <string name="privacy_guard_notification_detail">У «<xliff:g id="app">%1$s</xliff:g>» нет доступа к персональным данным</string>
   <string name="privacy_guard_dialog_title">Защищённый режим</string>
   <string name="privacy_guard_dialog_summary">Приложение «<xliff:g id="app">%1$s</xliff:g>» пытается <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Запомнить разрешение</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">получить доступ к камере</string>
   <string name="app_ops_access_location">получить доступ к местоположению устройства</string>
   <string name="app_ops_access_notifications">получить доступ к уведомлениям</string>
@@ -99,7 +137,7 @@
   <string name="app_ops_toggle_bluetooth">переключить состояние Bluetooth</string>
   <string name="app_ops_toggle_mobile_data">переключить состояние мобильного интернета</string>
   <string name="app_ops_toggle_nfc">переключить состояние модуля NFC</string>
-  <string name="app_ops_toggle_wifi">включить или выключить Wi-Fi</string>
+  <string name="app_ops_toggle_wifi">переключить состояние Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">получить управление громкостью будильника</string>
   <string name="app_ops_use_audio_focus">получить управление аудиофокусом</string>
   <string name="app_ops_use_bluetooth_volume">получить управление громкостью Bluetooth-устройств</string>
@@ -122,29 +160,34 @@
   <string name="app_ops_use_body_sensors">использовать нательные датчики</string>
   <string name="app_ops_read_cell_broadcasts">прочитать сообщения оповещения населения</string>
   <string name="app_ops_mock_location">предоставить фиктивные сведения о местоположении</string>
-  <string name="app_ops_read_external_storage">прочитать данные с внешнего запоминающего устройства</string>
+  <string name="app_ops_read_external_storage">прочитать данные с внешнего накопителя</string>
   <string name="app_ops_write_external_storage">записать данные на внешнее запоминающее устройство</string>
   <string name="app_ops_turn_on_screen">включить экран</string>
   <string name="app_ops_get_accounts">получить информацию об аккаунтах</string>
   <string name="app_ops_wifi_change">изменить состояние Wi-Fi</string>
   <string name="app_ops_su">получить права суперпользователя</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Чтобы открепить экран, нажмите и удерживайте кнопку «Назад».</string>
-  <string name="live_display_auto">Автоматически</string>
-  <string name="live_display_auto_summary">Автоматическая подстройка цветовой температуры экрана после заката и восхода солнца</string>
-  <string name="live_display_off">Отключить</string>
-  <string name="live_display_off_summary">Отключить автоподстройку</string>
-  <string name="live_display_day">День</string>
-  <string name="live_display_day_summary">Только дневные настройки</string>
-  <string name="live_display_night">Ночь</string>
-  <string name="live_display_night_summary">Только ночные настройки</string>
-  <string name="live_display_outdoor">На улице (яркое солнце)</string>
-  <string name="live_display_outdoor_summary">Только уличный режим</string>
-  <string name="live_display_hint">LiveDisplay поможет снизить зрительное напряжение и улучшить сон. Нажмите здесь, чтобы попробовать!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Нет подключенных устройств</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> подключенное устройство</string>
   <string name="tethered_notification_multi_device_message">Подключено устройств: <xliff:g id="count">%1$s</xliff:g></string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Запуск приложения запрещён</string>
   <string name="notify_package_component_protected_text">Приложение «<xliff:g id="app_name">%1$s</xliff:g>» заблокировано. Нажмите, чтобы ввести пароль и запустить приложение.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Аккумулятор полностью заряжен</string>
   <string name="notify_battery_fully_charged_text">Отключите устройство от сети для продления срока службы батареи.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">Обнуление статистики батареи</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Разрешить приложению очищать данные об использовании аккумуляторной батареи устройства.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM-карты изменились</string>
+  <string name="uicc_hot_swapped_event_text">Нажмите, чтобы задать параметры по умолчанию для SIM-карты</string>
 </resources>
diff --git a/core/res/res/values-si-rLK/cm_strings.xml b/core/res/res/values-si-rLK/cm_strings.xml
index a7a97b7..0ceea5e 100644
--- a/core/res/res/values-si-rLK/cm_strings.xml
+++ b/core/res/res/values-si-rLK/cm_strings.xml
@@ -17,36 +17,74 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">තිර සේයාව</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">ආරක්‍ෂිත SMS ලබන්න</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">එන ආරක්‍ෂිත SMS ලැබීමට යෙදුමට ඉඩ දෙයි.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">ආරක්‍ෂිත SMS ලැයිස්තුව විකරණය කරන්න</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">ආරක්ෂාව</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">උපාංගයේ ආරක්ෂක තොරතුරු වලට අදාළ අනුමැති.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">දුරකථන අපලේඛණය කියවීම</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">පැමිණෙන ඇමතුම් හෝ පණිවිඩ සඳහා අවහිර කර ඇති ඇමතුම් අංක පිලිබඳ තොරතුරු කියවීම සඳහා යෙදුමකට අවසර දෙන්න.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">දුරකථන අපලේඛණය වෙනස් කරන්න</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">පැමිණෙන ඇමතුම් හෝ පණිවිඩ සඳහා අවහිර කර ඇති ඇමතුම් අංක වෙනස් කිරීම සඳහා යෙදුමකට අවසර දෙන්න.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">යතුරු රැක්මේ වෝල්පේපරය සකසන්න</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">අගුළු තිරයේ වෝල්පේපරය වෙනස්කිරීම සඳහා යෙදුමකට අවසර දෙන්න.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">යළි පණගන්වන්න</string>
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">නැවත පනගන්වන්න</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">ප්‍රතිසාධන ප්‍රකාරයට</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">ඇරඹුම් ප්‍රවේශකයට</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">බාගැනීමේ ප්‍රකාරයට</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">මෘදුව නැවත පනගන්වන්න</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">ඔබගේ ටැබ්ලටය නැවත පනගැන්වෙනු ඇත.</string>
   <string name="reboot_confirm" product="default">ඔබගේ දුරකථනය නැවත පනගැන්වෙනු ඇත.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">නැවත පනගැන්වෙමින්\u2026</string>
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ජාලය හරහා ADB සබලයි</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ජාලය &amp; USB හරහා ADB සබලයි</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">නිදොස් කරණය අබල කිරීමට ස්පර්ශ කරන්න.</string>
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">පෞද්ගලිකත්වයේ මුරකරු සබලනය හෝ අබලනය</string>
   <string name="permdesc_changePrivacyGuardState">තවත් යෙදුමක් පෞද්ගලිකත්වයේ මුරකරු සමග ධාවනය විය යුතුද නැද්ද යන්න වෙනස් කිරීම සඳහා යෙදුමට අවසර දෙන්න. යෙදුමක් පෞද්ගලිකත්වයේ මුරකරු සමග ධාවනය වන විට, එයට සම්බන්ධතා, ඇමතුම් ලොග හෝ පණිවිඩ පරිශීලනය කල නොහැක.</string>
   <string name="privacy_guard_notification">පෞද්ගලිකත්වයේ මුරකරු සක්‍රීයයි</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g>ට පුද්ගලික දත්ත පරිශීලනය කල නොහැක</string>
   <string name="privacy_guard_dialog_title">පෞද්ගලිකත්වයේ මුරකරු</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="op">%2$s</xliff:g> සඳහා <xliff:g id="app">%1$s</xliff:g>ට අවශ්‍යව ඇත.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">කැමරාව පරිශීලනය</string>
   <string name="app_ops_access_location">ඔබගේ ස්ථානය පරිශීලනය</string>
   <string name="app_ops_access_notifications">ඔබගේ දැනුම්දීම් කියවීම</string>
@@ -84,4 +122,16 @@
   <string name="app_ops_use_voice_volume">හඬ ඇමතුම් ශබ්දය පාලනය</string>
   <string name="app_ops_write_mms">MMS පණිවිඩයක් ලිවීම</string>
   <string name="app_ops_write_sms">කෙටි පණිවිඩයක් ලිවීම</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-sk/cm_strings.xml b/core/res/res/values-sk/cm_strings.xml
index 62cef0c..31eb96b 100644
--- a/core/res/res/values-sk/cm_strings.xml
+++ b/core/res/res/values-sk/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Snímka obrazovky</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">prijímať chránené SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Umožňuje aplikácii prijímať chránené prichádzajúce SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">upraviť zoznam chránených SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Umožňuje aplikácii upraviť zoznam chránených SMS adries.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Zabezpečenie</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Povolenia súvisiace s informáciami o bezpečnosti zariadenia.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">čítať čiernu listinu telefónu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Umožňuje aplikácii čítať informácie o telefónnych číslach, ktoré sú pre prichádzajúce hovory a správy zablokované.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">zmeniť čiernu listinu telefónu</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Umožňuje aplikácii zmeniť telefónne čísla, ktoré sú pre prichádzajúce hovory a správy zablokované.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">nastaviť tapetu obrazovky uzamknutia</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Umožňuje aplikácii zmeniť tapetu obrazovky uzamknutia.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Reštartovať</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Aktuálny</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Reštartovať</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Softvérový reštart</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Reštartovať</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Váš tablet bude reštartovaný.</string>
   <string name="reboot_confirm" product="default">Váš telefón bude reštartovaný.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Reštartuje sa\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplikácia bola ukončená</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB cez sieť povolené</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB cez USB a sieť povolené</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Dotykom zakážate ladenie.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB a sieť</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Sieť</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">zachytiť spustenie aplikácie</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">Aplikácia %s nie je nainštalovaná</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Priorita</string>
   <string name="silent_mode_none">Žiadna</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wi-Fi hotspot bol zakázaný kvôli prepnutiu karty SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Vypnúť Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">povoliť alebo zakázať Ochranu súkromia</string>
   <string name="permdesc_changePrivacyGuardState">Umožňuje aplikácii určiť, či má byť iná aplikácia spustená s Ochranou súkromia. Keď je aplikácia spustená s Ochranou súkromia, nemá umožnený prístup k osobným údajom ako sú kontakty, denníky hovorov, alebo správy.</string>
   <string name="privacy_guard_notification">Aktívna ochrana súkromia</string>
   <string name="privacy_guard_notification_detail">Aplikácii <xliff:g id="app">%1$s</xliff:g> nebude umožnený prístup k osobným údajom</string>
   <string name="privacy_guard_dialog_title">Ochrana súkromia</string>
   <string name="privacy_guard_dialog_summary">Aplikácia <xliff:g id="app">%1$s</xliff:g> sa pokúša <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Zapamätať voľbu</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">prístup k fotoparátu</string>
   <string name="app_ops_access_location">prístup k polohe</string>
   <string name="app_ops_access_notifications">čítať oznámenia</string>
@@ -111,19 +149,22 @@
   <string name="app_ops_write_mms">napísať správu MMS</string>
   <string name="app_ops_write_sms">napísať správu SMS</string>
   <string name="app_ops_su">získať root prístup</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Na odopnutie tejto obrazovky stlačte a podržte tlačidlo Späť.</string>
-  <string name="live_display_auto">Automatické</string>
-  <string name="live_display_auto_summary">Automaticky upraviť teplotu farieb obrazovky po západe a východe slnka</string>
-  <string name="live_display_off">Vypnuté</string>
-  <string name="live_display_off_summary">Zakázať všetky úpravy</string>
-  <string name="live_display_day">Deň</string>
-  <string name="live_display_day_summary">Použiť len nastavenia pre deň</string>
-  <string name="live_display_night">Noc</string>
-  <string name="live_display_night_summary">Použiť len nastavenia pre noc</string>
-  <string name="live_display_outdoor">Vonku (jasné slnko)</string>
-  <string name="live_display_outdoor_summary">Používať len nastavenia pre vonkajšie prostredie</string>
-  <string name="live_display_hint">LiveDisplay môže pomôcť znížiť únavu očí a pomôže vám spať v noci. Kliknite sem a vyskúšajte túto funkciu!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Žiadne pripojené zariadenie</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> pripojené zariadenie</string>
   <string name="tethered_notification_multi_device_message">Pripojené zariadenia: <xliff:g id="count">%1$s</xliff:g></string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">obnoviť štatistiky batérie</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Umožňuje aplikácii obnoviť aktuálne nízkoúrovňové údaje o využití batérie.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-sl/cm_strings.xml b/core/res/res/values-sl/cm_strings.xml
index 6a1c843..75cb7c0 100644
--- a/core/res/res/values-sl/cm_strings.xml
+++ b/core/res/res/values-sl/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Zaslonska slika</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">prejemanje zaščitenih SMS-ov</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Dovoli aplikaciji prejemanje zaščitenih dohodnih SMS-ov.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">spreminjanje seznama zaščitenih SMS-ov</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Dovoli aplikaciji spreminjanje seznama naslovov zaščitenih SMS-ov.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Varnost</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Dovoljenja, ki so povezana z varnostnimi podatki naprave.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">branje črnega seznama telefona</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Dovoli aplikaciji branje podatkov o blokiranih telefonskih številkah za dohodne klice in sporočila.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">spreminjanje črnega seznama telefona</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Dovoli aplikaciji spreminjanje blokiranih telefonskih številk za dohodne klice in sporočila.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">nastavitev slike ozadja keyguard</string>
-  <string name="permdesc_setKeyguardWallpaper">Dovoli aplikaciji spreminjanje slike ozadja zaslona za zaklepanje.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">Dovoli aplikaciji spreminjanje slike ozadja zaklenjenega zaslona.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Ponovno zaženi</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Trenutni</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Ponovno zaženi</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Obnovitev</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Zagonski nalagalnik</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Prenos</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Mehki ponovni zagon</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Ponovno zaženi</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tablica se bo ponovno zagnala.</string>
   <string name="reboot_confirm" product="default">Telefon se bo ponovno zagnal.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Ponovno zaganjanje \u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Aplikacija uničena</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB preko omrežja omogočen</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB preko USB-ja in omrežja omogočen</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Dotaknite se, da onemogočite razhroščevanje.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB in omrežje</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Omrežje</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">prestrezanje zagona aplikacije</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s ni nameščen</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prednost</string>
   <string name="silent_mode_none">Brez</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Dostopna točka Wi-Fi je bila onemogočena zaradi spremembe naročnine SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Izklopi Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">omogočanje ali onemogočanje Privacy Guarda</string>
   <string name="permdesc_changePrivacyGuardState">Dovoli aplikaciji spreminjanje, ali se druga aplikacija izvaja s Privacy Guardom. Kadar se aplikacija izvaja s Privacy Guardom, ne bo imela dostopa do osebnih podatkov, kot so stiki, dnevniki klicev ali sporočila.</string>
   <string name="privacy_guard_notification">Privacy Guard dejaven</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> ne bo imel dostopa do osebnih podatkov</string>
   <string name="privacy_guard_dialog_title">Privacy Guard</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> bi rad <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Zapomni si mojo izbiro</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">dostop do fotoaparata</string>
   <string name="app_ops_access_location">dostop do lokacije</string>
   <string name="app_ops_access_notifications">branje obvestil</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">pridobivanje računov naprave</string>
   <string name="app_ops_wifi_change">spreminjanje stanja Wi-Fi</string>
   <string name="app_ops_su">pridobitev skrbniškega dostopa</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Da odpnete ta zaslon, se dotaknite in pridržite gumb Nazaj.</string>
-  <string name="live_display_auto">Samodejno</string>
-  <string name="live_display_auto_summary">Samodejno nastavi barvno temperaturo zaslona po sončnem zahodu in vzhodu</string>
-  <string name="live_display_off">Izklopljen</string>
-  <string name="live_display_off_summary">Onemogoči vse prilagoditve</string>
-  <string name="live_display_day">Dan</string>
-  <string name="live_display_day_summary">Uporabi samo dnevne nastavitve</string>
-  <string name="live_display_night">Noč</string>
-  <string name="live_display_night_summary">Uporabi samo nočne nastavitve</string>
-  <string name="live_display_outdoor">Na prostem (močna svetloba)</string>
-  <string name="live_display_outdoor_summary">Uporabi samo nastavitve na prostem</string>
-  <string name="live_display_hint">LiveDisplay vam lahko pomaga pri zmanjšanju obremenitve oči in spanju ponoči. Kliknite tukaj, da ga preskusite!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Nobene naprave ni povezane</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> povezana naprava</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> povezanih naprav</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Zagon dejavnosti blokiran</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> je zaščiten pred zagonom. Kliknite za overitev in zaženite aplikacijo.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Baterija napolnjena</string>
   <string name="notify_battery_fully_charged_text">Odklopite napravo iz polnilca za izboljšanje življenjske dobe baterije.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">ponastavitev statistike baterije</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Dovoli aplikaciji ponastavitev trenutnih podatkov uporabe baterije ob nizkem stanju.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Kartice SIM so se spremenile</string>
+  <string name="uicc_hot_swapped_event_text">Tapnite, da nastavite privzete možnosti kartice SIM</string>
 </resources>
diff --git a/core/res/res/values-sq-rAL/cm_strings.xml b/core/res/res/values-sq-rAL/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-sq-rAL/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-sr/cm_strings.xml b/core/res/res/values-sr/cm_strings.xml
index 3453ce3..b15b557 100644
--- a/core/res/res/values-sr/cm_strings.xml
+++ b/core/res/res/values-sr/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Снимак екрана</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">прими заштићени SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Дозволи да апликације приме долазећи заштићени SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">измените заштићену SMS листу</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Дозвољава апликацији да мења заштићену SMS листу адреса.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Безбедност</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Дозволе које се односе на безбедносне информације уређаја.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">читај црну листу телефона</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Омогућава апликацији да чита информације о телефонским бројевима који су блокирани за долазне позиве или поруке.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">мењај црну листу телефона</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Омогућава апликацији да промени бројеве телефона које су блокирани за долазне позиве или поруке.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">постави позадину закључаног екрана</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Омогућава апликацији да промени позадину на закључаном екрану.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Рестартуј</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Тренутно</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Рестартуј</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Опоравак</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Преузимање</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Рестартуј интерфејс</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Рестартуј</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tаблет ће се рестартовати.</string>
   <string name="reboot_confirm" product="default">Tелефон ће се рестартовати.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Рестартовање\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Апликација је затворена</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB преко мреже омогућен</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB преко USB &amp; мреже омогућен</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Додирни да онемогућиш отклањање грешака.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; мрежа</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Мрежа</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">пресретни подизање апликације</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s није инсталирано</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Приоритет</string>
   <string name="silent_mode_none">Ниједан</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Онемогућен Wi-Fi hotspot због промене SIM претплате</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Искључи Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">омогући или онемогући заштиту приватности</string>
   <string name="permdesc_changePrivacyGuardState">Дозвољава апликацији да промени да ли се друга апликација покреће са заштитом приватности. Када је апликација покренута са заштитом приватности, она неће имати приступ личним подацима, као што су контакти, евиденција позива или поруке.</string>
   <string name="privacy_guard_notification">Заштита приватности је активна</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> неће бити у могућности да приступи личним подацима</string>
   <string name="privacy_guard_dialog_title">Заштита приватности</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> жели да <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Запамти мој избор</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">приступ камери</string>
   <string name="app_ops_access_location">приступ твојој локацији</string>
   <string name="app_ops_access_notifications">прочитај твоја обавештења</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">добави налог уређаја</string>
   <string name="app_ops_wifi_change">промени Wi-Fi стање</string>
   <string name="app_ops_su">дај root приступ</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Да искључиш овај екран додирни и држи дугме за назад.</string>
-  <string name="live_display_auto">Аутоматски</string>
-  <string name="live_display_auto_summary">Аутоматски прилагоди температуру боје екрана после сумрака и свитања</string>
-  <string name="live_display_off">Искључено</string>
-  <string name="live_display_off_summary">Онемогућити сва подешавања</string>
-  <string name="live_display_day">Дан</string>
-  <string name="live_display_day_summary">Користи само дневна подешавања</string>
-  <string name="live_display_night">Ноћ</string>
-  <string name="live_display_night_summary">Користи само ноћна подешавања</string>
-  <string name="live_display_outdoor">Напољу (јако сунце)</string>
-  <string name="live_display_outdoor_summary">Користи само подешавања за напоље</string>
-  <string name="live_display_hint">LiveDisplay може смањити напрезање очију и помоћи да спавате ноћу. Додирните да пробате!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Нема повезаног уређаја</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> конектован уређај</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> конектовани уређаји</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Блокирана активност покретања</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> је заштићена од покретања. Додирни да потврдиш и покрени апликацију.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Батерија пуна</string>
   <string name="notify_battery_fully_charged_text">Искључи пуњач са уређаја да би побољшао трајност батерије.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">ресетуј статистику батерије</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Омогућава апликацији да ресетује актуелне податке ниског нивоа коришћења батерије.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM картица је промењена</string>
+  <string name="uicc_hot_swapped_event_text">Додирни да поставиш задане поставке за SIM картицу</string>
 </resources>
diff --git a/core/res/res/values-sv/cm_strings.xml b/core/res/res/values-sv/cm_strings.xml
index 88e02b6..c5c91b0 100644
--- a/core/res/res/values-sv/cm_strings.xml
+++ b/core/res/res/values-sv/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Skärmdump</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">ta emot skyddade SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Tillåter att appen tar emot ett inkommande skyddat SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">ändra lista över skyddade SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Tillåter att appen ändrar listan över skyddade SMS.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Säkerhet</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Behörigheter relaterade till enhetssäkerhet.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">läsa telefonens svartlista</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Tillåter en app att läsa information kring telefonnummer som är blockerade för inkommande samtal eller meddelanden.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">ändra telefonens svartlista</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Tillåter en app att ändra de telefonnummer som är blockerade för inkommande samtal eller meddelanden.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">ställa in bakgrundsbild på låsskärm</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Tillåter en app att ändra låsskärmens bakgrundsbild.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Omstart</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Nuvarande</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Starta om</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Mjuk omstart</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Starta om</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Din surfplatta kommer att startas om.</string>
   <string name="reboot_confirm" product="default">Din telefon kommer att startas om.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Startar om\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">App tvångsavslutad</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB över nätverk aktiverat</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB över USB och nätverk aktiverat</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Tryck på för att inaktivera felsökning.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; nätverk</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Nätverk</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">avbryt app-start</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s är inte installerad</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Prioritet</string>
   <string name="silent_mode_none">Ingen</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Wi\u2011Fi hotspot avaktiverad på grund av ändrat SIM-abonnemang</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Inaktivera Wi\u2011Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">aktivera eller inaktivera integritetsskydd</string>
   <string name="permdesc_changePrivacyGuardState">Tillåter appen att ändra huruvida en annan app körs med integritetsskydd. När en app körs med integritetsskydd har den ingen tillgång till personlig data som kontakter, samtalslistor och meddelanden.</string>
   <string name="privacy_guard_notification">Integritetsskydd aktivt</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> kommer inte få tillgång till personlig data</string>
   <string name="privacy_guard_dialog_title">Integritetsskydd</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> skulle vilja <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Kom ihåg mitt val</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">få tillgång till kamera</string>
   <string name="app_ops_access_location">få tillgång till din plats</string>
   <string name="app_ops_access_notifications">läsa dina aviseringar</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">hämta enhetskonton</string>
   <string name="app_ops_wifi_change">ändra Wi\u2011Fi status</string>
   <string name="app_ops_su">få root-åtkomst</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">För att frigöra denna skärm, tryck och håll nere Bakåt-knappen.</string>
-  <string name="live_display_auto">Automatisk</string>
-  <string name="live_display_auto_summary">Justera automatiskt skärmens färgtemperatur efter solnedgång och soluppgång</string>
-  <string name="live_display_off">Av</string>
-  <string name="live_display_off_summary">Inaktivera alla justeringar</string>
-  <string name="live_display_day">Dag</string>
-  <string name="live_display_day_summary">Använd enbart dagläge</string>
-  <string name="live_display_night">Natt</string>
-  <string name="live_display_night_summary">Använd enbart nattläge</string>
-  <string name="live_display_outdoor">Utomhus (stark sol)</string>
-  <string name="live_display_outdoor_summary">Använd endast utomhusläge</string>
-  <string name="live_display_hint">LiveDisplay kan minska överansträngning av ögon och hjälpa dig med nattsömnen. Klicka här för att prova!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Ingen ansluten enhet</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ansluten enhet</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> anslutna enheter</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Aktivitetsstart blockerad</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> är skyddad från att startas. Tryck för att autentisera och starta programmet.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Batteriet fulladdat</string>
   <string name="notify_battery_fully_charged_text">Koppla bort enheten från laddaren för att förbättra batteriets livslängd.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">återställa batteristatistik</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Tillåter en app att återställa nuvarande lågnivådata för batterianvändning.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM-kort har ändrats</string>
+  <string name="uicc_hot_swapped_event_text">Tryck för att ange standardinställningar för SIM-kortet</string>
 </resources>
diff --git a/core/res/res/values-sw/cm_strings.xml b/core/res/res/values-sw/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-sw/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-ta-rIN/cm_strings.xml b/core/res/res/values-ta-rIN/cm_strings.xml
index 415fb8f..9b129f3 100644
--- a/core/res/res/values-ta-rIN/cm_strings.xml
+++ b/core/res/res/values-ta-rIN/cm_strings.xml
@@ -17,54 +17,175 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">திரைப்பிடிப்பு</string>
-  <string name="global_action_reboot">மறுதொடக்கம்</string>
-  <string name="reboot_reboot">மறுதொடக்கம்</string>
-  <string name="reboot_recovery">மீட்பு (ரெகவரி)</string>
-  <string name="reboot_bootloader">துவக்க ஏற்றி</string>
-  <string name="reboot_download">பதிவிறக்கம்</string>
-  <string name="reboot_confirm" product="tablet">உங்கள் கைக்கணினி மீண்டும் துவக்கபடும்.</string>
-  <string name="reboot_confirm" product="default">உங்கள் தொலைபேசி மீண்டும் துவக்கபடும்.</string>
-  <string name="reboot_progress">மீண்டும் துவக்க\u2026</string>
-  <string name="permdesc_changePrivacyGuardState">பயன்பாட்டை மற்றொரு பயன்பாடு தனியுரிமை பாதுகாப்பு கொண்டு இயங்குமா என்பதை மாற்ற அனுமதிக்கிறது. ஒரு பயன்பாடு தனியுரிமை பாதுகாப்பு கொண்டு இயங்கும் போது, இது போன்ற தொடர்புகள், அழைப்பு பதிவுகள், மற்றும் செய்திகள் போன்ற தனிப்பட்ட தரவுக்கான அணுகல் இருக்காது.</string>
-  <string name="privacy_guard_notification">தனியுரிமை பாதுகாப்பு செயலில்</string>
-  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> தனிப்பட்ட தரவை அணுக முடியாது</string>
-  <string name="privacy_guard_dialog_title">தனியுரிமை பாதுகாப்பு</string>
-  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> <xliff:g id="op">%2$s</xliff:g> விரும்புகிறது.</string>
-  <string name="app_ops_access_camera">கேமரா அணுக</string>
-  <string name="app_ops_access_location">உங்கள் இருப்பிடத்தை அணுக</string>
-  <string name="app_ops_access_notifications">உங்கள் அறிவிக்கைகள் படிக்க</string>
-  <string name="app_ops_keep_device_awake">உங்கள் கருவியை விழித்து வைக்க</string>
-  <string name="app_ops_make_phone_call">தொலைபேசியில் அழைப்பு செய்ய</string>
-  <string name="app_ops_modify_calendar">உங்கள் நாட்காட்டியில் மேம்படுத்த</string>
-  <string name="app_ops_modify_call_log">அழைப்பு பதிவு மேம்படுத்த</string>
-  <string name="app_ops_modify_clipboard">இடைநிலை பலகையை திருத்த</string>
-  <string name="app_ops_modify_contacts">உங்கள் தொடர்புகள் மேம்படுத்த</string>
-  <string name="app_ops_modify_settings">முறைமை அமைப்புகள் மேம்படுத்த</string>
-  <string name="app_ops_play_audio">ஒலி விளையாட</string>
-  <string name="app_ops_post_notification">அறிவிக்கை பதிவு செய்ய</string>
-  <string name="app_ops_read_calendar">உங்கள் நாட்காட்டியை படிக்க</string>
-  <string name="app_ops_read_call_log">அழைப்பு பதிவை படிக்க</string>
-  <string name="app_ops_read_clipboard">இடைநிலை பலகை படிக்க</string>
-  <string name="app_ops_read_contacts">உங்கள் தொடர்புகள் படிக்க</string>
-  <string name="app_ops_read_mms">உங்கள் எம்எம்எஸ் செய்திகளை படிக்க</string>
-  <string name="app_ops_read_sms">உங்கள் குறுந்தகவல் செய்திகளை படிக்க</string>
-  <string name="app_ops_receive_sms">ஒரு குறுந்தகவல் செய்தி பெற</string>
-  <string name="app_ops_record_audio">ஒலி பதிவு செய்ய</string>
-  <string name="app_ops_send_mms">ஒரு எம்எம்எஸ் செய்தி அனுப்ப</string>
-  <string name="app_ops_send_sms">ஒரு குறுந்தகவல் செய்தி அனுப்ப</string>
-  <string name="app_ops_start_at_bootup">மின்சக்தி தொடக்கத்தில் ஆரம்பிக்க</string>
-  <string name="app_ops_toggle_bluetooth">Bluetooth நிலைமாற்று</string>
-  <string name="app_ops_use_alarm_volume">அலார ஒலி கட்டுப்படுத்த</string>
-  <string name="app_ops_use_audio_focus">ஒலி கவனத்தை கட்டுப்படுத்த</string>
-  <string name="app_ops_use_bluetooth_volume">Bluetooth ஒலியளவு கட்டுப்படுத்த</string>
-  <string name="app_ops_use_master_volume">முதன்மை ஒலியளவு கட்டுப்படுத்த</string>
-  <string name="app_ops_use_media_buttons">ஊடக பொத்தான்கள் பயன்படுத்தவும்</string>
-  <string name="app_ops_use_media_volume">ஊடக ஒலியளவு கட்டுப்படுத்த</string>
-  <string name="app_ops_use_notification_volume">அறிவித்தல் ஒலியளவு கட்டுப்படுத்த</string>
-  <string name="app_ops_use_ring_volume">ரிங்டோன் ஒலியளவு கட்டுப்படுத்த</string>
-  <string name="app_ops_use_vibrate">தொடு உணர்வியல் பின்னூட்டம் பயன்படுத்தவும்</string>
-  <string name="app_ops_use_voice_volume">குரல் அழைப்பு ஒலியை கட்டுப்படுத்த</string>
-  <string name="app_ops_write_mms">ஒரு எம்எம்எஸ் தகவலை எழுது</string>
-  <string name="app_ops_write_sms">ஒரு எஸ்எம்எஸ் செய்தி எழுது</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_receiveProtectedSms">பாதுகாக்கப்பட்ட SMSஐ பெறுக</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">உள்வரும் பாதுகாக்கப்பட்ட SMS ஒன்றை பெற பயன்பாட்டை அனுமதிக்கிறது.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">பாதுகாக்கப்பட்ட SMS பட்டியலை மாற்றியமை.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">பாதுகாக்கப்பட்ட SMS முகவரி பட்டியலை மாற்றியமைக்க பயன்பாட்டை அனுமதிக்கிறது.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_security">பாதுகாப்பு</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">சாதன பாதுகாப்பு தகவல் தொடர்பான அனுமதிகள்.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">தொலைப்பேசி தடுப்புபட்டியலை படி</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">உள்வரும் அழைப்புகள் அல்லது செய்திகளுக்காக தடுக்கப்பட்ட தொலைப்பேசி எண்கள் குறித்த தகவலை பயன்பாடு படிக்க அனுமதிக்கிறது.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">தொலைப்பேசி தடுப்புபட்டியலை மாற்று</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">உள்வரும் அழைப்புகள் அல்லது செய்திகளுக்காக தடுக்கப்பட்ட தொலைப்பேசி எண்கள் குறித்த தகவலை பயன்பாடு மாற்ற அனுமதிக்கிறது.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">விசைபாதுகாப்பு வால்பேப்பரை அமை</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">ஒரு பயன்பாடு பூட்டுத் திரையை மாற்ற அனுமதிக்கிறது.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">மீண்டும் தொடங்கு</string>
+  <!-- label for current user in phone options dialog -->
+  <string name="global_action_current_user">நடப்பு</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">மீண்டும் தொடங்கு</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">மீட்டல்</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">பூட்லோடர்</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">இறக்கு</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">மென்மையான மறுயியக்கம்</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">மீண்டும் தொடங்கு</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">உங்கள் டேப்ளட் மறுயியக்கமாகும்.</string>
+  <string name="reboot_confirm" product="default">உங்கள் தொலைப்பேசி மறுயியக்கமாகும்.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">மறுஇயக்கம்செய்கிறது\u2026</string>
+  <!-- Long-press back kill application -->
+  <string name="app_killed_message">பயன்பாடு கொல்லப்பட்டது</string>
+  <!-- ADB over network notification -->
+  <string name="adb_net_active_notification_title">நெட்வொர்க் மீது ADB செயல்படுத்தப்பட்டது</string>
+  <!-- ADB over USB and network notification -->
+  <string name="adb_both_active_notification_title">USB &amp; நெட்வொர்க் மீது ADB செயல்படுத்தப்பட்டது</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">பிழைநீக்கலை முடக்க தொடு.</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB &amp; நெட்வொர்க்</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">நெட்வொர்க்</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">இடைமறிப்பு பயன்பாடு தொடக்கம்</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s நிறுவப்படவில்லை.</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">முன்னுரிமை</string>
+  <string name="silent_mode_none">ஏதுமில்லை</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">SIM சந்தா மாற்றத்தின் காரணமாக wi-fi ஹாட்ஸ்பாட் முடக்கப்பட்டது.</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">வை-ஃபைஐ ஆஃப் செய்க</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">அந்தரங்கம் பாதுகாப்பானை செயல்படுத்து அல்லது முடக்கு</string>
+  <string name="permdesc_changePrivacyGuardState">வேறொரு பயன்பாடு அந்தரங்கம் பாதுகாப்பானுடன் இயங்குகிறதா என்பதை மாற்ற பயன்பாட்டை அனுமதிக்கிறது. ஒரு பயன்பாடு அந்தரங்கம் பாதுகாப்பானுடன் இயங்கும்போது, அது தனிநபர் தரவுகளான தொடர்புகள், அழைப்பு பதிவுகள், அல்லது செய்திகள் போன்றவற்றை அணுகாது.</string>
+  <string name="privacy_guard_notification">அந்தரங்கம் பாதுகாப்பான் செயல்பாட்டிலுள்ளது</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> தனிநபர் தரவை அணுக முடியாது</string>
+  <string name="privacy_guard_dialog_title">அந்தரங்கம் பாதுகாப்பான்</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g>  <xliff:g id="op">%2$s</xliff:g> செய்ய விரும்புகிறார்.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">எனது விருப்பத்தேர்வை நினைவில்கொள்</string>
+  <!-- App ops requests -->
+  <string name="app_ops_access_camera">கேமராவை அணுகவும்</string>
+  <string name="app_ops_access_location">உங்கள் இருப்பிடத்தை அணுகவும்</string>
+  <string name="app_ops_access_notifications">உங்கள் அறிவிப்பைப் படி</string>
+  <string name="app_ops_activate_vpn">ஒரு VPNஐ செயல்படுத்து</string>
+  <string name="app_ops_auto_start">மின்சக்தி அப்பில் தொடங்கவும்</string>
+  <string name="app_ops_delete_call_log">உங்கள் அழைப்பு பதிவை நீக்குக</string>
+  <string name="app_ops_delete_contacts">உங்கள் தொடர்புகளை நீக்குக</string>
+  <string name="app_ops_delete_mms">உங்கள் MMS செய்திகளை நீக்குக</string>
+  <string name="app_ops_delete_sms">உங்கள் SMS செய்திகளை நீக்குக</string>
+  <string name="app_ops_draw_on_top">windosஐ மேலே இழுக்கவும்</string>
+  <string name="app_ops_get_usage_stats">பயன்பாட்டு பயன்படுத்தல் புள்ளிவிவரங்களைப் பெறு</string>
+  <string name="app_ops_keep_device_awake">உங்கள் சாதனத்தை விழிப்போடு வைத்திருக்கவும்</string>
+  <string name="app_ops_make_phone_call">ஒரு தொலைப்பேசி அழைப்பை ஏற்படுத்தவும்</string>
+  <string name="app_ops_modify_calendar">உங்கள் நாள்காட்டியை புதுப்பிக்கவும்</string>
+  <string name="app_ops_modify_call_log">அழைப்பு பதிவை புதுப்பிக்கவும்</string>
+  <string name="app_ops_modify_clipboard">நகலகத்தை மாற்றியமைக்கவும்</string>
+  <string name="app_ops_modify_contacts">உங்கள் தொடர்புகளை புதுப்பிக்கவும்</string>
+  <string name="app_ops_modify_settings">கணினி அமைப்புகளை புத்துப்பி</string>
+  <string name="app_ops_mute_unmute_microphone">மைக்ரோஃபோனை ஒலிதடு/ஒலிதடைநீக்கு</string>
+  <string name="app_ops_play_audio">ப்ளே ஆடியோ</string>
+  <string name="app_ops_post_notification">ஒரு அறிவிப்பை இடுகையிடவும்</string>
+  <string name="app_ops_project_media">ஊடகத்தை வெளிப்படுத்து</string>
+  <string name="app_ops_read_calendar">உங்கள் நாள்காட்டியை படிக்கவும்</string>
+  <string name="app_ops_read_call_log">அழைப்பு பதிவை படிக்கவும்</string>
+  <string name="app_ops_read_clipboard">நகலகத்தை படிக்கவும்</string>
+  <string name="app_ops_read_contacts">உங்கள் தொடர்புகளைப் படித்தல்</string>
+  <string name="app_ops_read_mms">உங்கள் MMS செய்திகளை படிக்கவும்</string>
+  <string name="app_ops_read_sms">உங்கள் SMS செய்திகளை படிக்கவும்</string>
+  <string name="app_ops_receive_sms">உங்கள் SMS செய்திகளை பெறவும்</string>
+  <string name="app_ops_record_audio">ஆடியோவைப் பதிவுசெய்தல்</string>
+  <string name="app_ops_send_mms">ஒரு MMS குறுந்தகவல் அனுப்புக</string>
+  <string name="app_ops_send_sms">ஒரு SMS குறுந்தகவல் அனுப்புக</string>
+  <string name="app_ops_start_at_bootup">மின்சக்தி அப்பில் தொடங்கவும்</string>
+  <string name="app_ops_toast_window">டோஸ்ட் செய்திகளை காண்பி</string>
+  <string name="app_ops_toggle_bluetooth">டோக்கில் ப்ளுடுத்</string>
+  <string name="app_ops_toggle_mobile_data">மொபைல் தரவு நிலைமாற்று</string>
+  <string name="app_ops_toggle_nfc">NFC நிலைமாற்று</string>
+  <string name="app_ops_toggle_wifi">Wi-Fi நிலைமாற்று</string>
+  <string name="app_ops_use_alarm_volume">அலார ஒலியளவை கட்டுப்படுத்து</string>
+  <string name="app_ops_use_audio_focus">ஆடியோ குவிமையத்தைக் கட்டுப்படுத்து</string>
+  <string name="app_ops_use_bluetooth_volume">ப்ளுடுத் ஒலியளவை கட்டுப்படுத்து</string>
+  <string name="app_ops_use_master_volume">தலைமை ஒலியளவை கட்டுப்படுத்து</string>
+  <string name="app_ops_use_media_buttons">ஊடக பொத்தான்களைப் பயன்படுத்து</string>
+  <string name="app_ops_use_media_volume">ஊடக ஒலியளவை கட்டுப்படுத்து</string>
+  <string name="app_ops_use_notification_volume">அறிவிப்பு ஒலியளவை கட்டுப்படுத்து</string>
+  <string name="app_ops_use_ring_volume">ரிங்டோன் ஒலியளவை கட்டுப்படுத்து</string>
+  <string name="app_ops_use_vibrate">தீண்டும் பின்னூட்டத்தைப் பயன்படுத்து</string>
+  <string name="app_ops_use_voice_volume">குரல் அழைப்பு ஒலியளவை கட்டுப்படுத்து</string>
+  <string name="app_ops_write_mms">ஒரு MMS செய்தி எழுது</string>
+  <string name="app_ops_write_sms">ஒரு SMS செய்தி எழுது</string>
+  <string name="app_ops_use_fingerprint">கைரேகையைப் பயன்படுத்து</string>
+  <string name="app_ops_add_voicemail">ஒரு குரலஞ்சலைச் சேர்த்தல்</string>
+  <string name="app_ops_read_phone_state">தொலைபேசி நிலையை அணுகல்</string>
+  <string name="app_ops_scan_wifi">Wi-Fi பிணையங்களை ஸ்கேன்செய்</string>
+  <string name="app_ops_change_wallpaper">வால்பேப்பரை மாற்று</string>
+  <string name="app_ops_assist_structure">உதவி கட்டமைப்பைப் பயன்படுத்து</string>
+  <string name="app_ops_assist_screenshot">ஒரு ஸ்க்ரீன்ஷாட்டை எடு</string>
+  <string name="app_ops_use_body_sensors">உடல் உணர்கருவிகளைப் பயன்படுத்து</string>
+  <string name="app_ops_read_cell_broadcasts">கலம் ஒளிபரப்புகளை படி</string>
+  <string name="app_ops_mock_location">உங்கள் இருப்பிடத்தை போலியாக்கு</string>
+  <string name="app_ops_read_external_storage">வெளிப்புற சேமிப்பகத்தைப் படி</string>
+  <string name="app_ops_write_external_storage">உட்புற சேமிப்பகத்தை எழுது</string>
+  <string name="app_ops_turn_on_screen">திரையை ஆன் செய்</string>
+  <string name="app_ops_get_accounts">சாதன கணக்குகளைப் பெறு</string>
+  <string name="app_ops_wifi_change">Wi-fi நிலையை மாற்று</string>
+  <string name="app_ops_su">மூல அணுகலைப் பெறு</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">இந்த திரையை அன்பின் செய்ய, பின்செல் பொத்தானைத் தொட்டு பிடித்துக்கொள்.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">இணைக்கப்பட்ட சாதனம் இல்லை</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> இணைக்கப்பட்ட சாதனம்</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> இணைக்கப்பட்ட சாதனங்கள்</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">செயல்பாட்டு துவக்கம் தடுக்கப்பட்டது</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> துவங்கப்படுவதில் இருந்து தடுக்கப்பட்டது. பயன்பாட்டை அங்கீகரிக்கவும் துவங்கவும் தட்டு.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">மின்கலம் முழுமையாக மின்னூட்டப்பட்டது</string>
+  <string name="notify_battery_fully_charged_text">மின்கலத்தின் ஆயுளை மேம்படுத்த சார்ஜரிலிருந்து உங்கள் சாதனத்தின் இணைப்பை துண்டிக்கவும்.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">மின்கல புள்ளிவிவரங்களை மீட்டமை</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">நடப்பு குறைந்த-நிலை மின்கல பயன்பாட்டு தரவை மீட்டமைக்க ஒரு பயன்பாட்டை அனுமதிக்கிறது.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-te-rIN/cm_strings.xml b/core/res/res/values-te-rIN/cm_strings.xml
new file mode 100644
index 0000000..6200a30
--- /dev/null
+++ b/core/res/res/values-te-rIN/cm_strings.xml
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <string name="global_action_screenshot">స్క్రీన్‌షాట్</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_receiveProtectedSms">రక్షిత SMSను స్వీకరించుము</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_receiveProtectedSms">ఇన్కమింగ్ రక్షిత SMSను అందుకునేందుకు అనువర్తనానికి అనుమతినిస్తుంది.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_modifyProtectedSmsList">రక్షిత SMS జాబితాను సవరించుము</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_modifyProtectedSmsList">రక్షిత SMS చిరునామా జాబితాను సవరించేందుకు అనువర్తనానికి అనుమతినిస్తుంది.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgrouplab_security">భద్రత</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permgroupdesc_security">పరికరం యొక్క భద్రతా సమాచారానికి సంబంధించిన అనుమతులు.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_readPhoneBlacklist">ఫోన్ యొక్క ఆమోదం కాని జాబితాను చదువుము</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_readPhoneBlacklist">ఇన్కమింగ్ కాల్స్ లేదా మేసేజుల కొరకు నిరోధించబడిన ఫోన్ నంబర్లను గూర్చిన సమాచారాన్ని చదివేందుకు అనువర్తనానికి అనుమతినిస్తుంది.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permlab_changePhoneBlacklist">ఫోన్ యొక్క ఆమోదం కాని జాబితాను మార్చుము</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_changePhoneBlacklist">ఇన్కమింగ్ కాల్స్ లేదా మేసేజుల కొరకు నిరోధించబడిన ఫోన్ నంబర్లను మార్చేందుకు అనువర్తనానికి అనుమతినిస్తుంది.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_setKeyguardWallpaper">కీగార్డ్ వాల్ పేపరును సెట్ చేయండి</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <string name="permdesc_setKeyguardWallpaper">లాక్ స్క్రీన్ వాల్ పేపరును మార్చడానికి ఒక అనువర్తనానికి అనుమతినిస్తుంది.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <string name="global_action_reboot">రీబూట్ </string>
+  <!-- label for current user in phone options dialog -->
+  <string name="global_action_current_user">ప్రస్తుత</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <string name="reboot_reboot">రీబూట్</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <string name="reboot_recovery">పునరుద్ధరణ</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <string name="reboot_bootloader">బూట్‌లోడర్</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <string name="reboot_download">డౌన్‌లోడ్ </string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <string name="reboot_soft">మరలా సాఫ్ట్ బూట్</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <string name="reboot_title">రీబూట్</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <string name="reboot_confirm" product="tablet">మీ టాబ్లెట్ మరలా బూట్ అవుతుంది.</string>
+  <string name="reboot_confirm" product="default">మీ ఫోన్ మరలా బూట్ అవుతుంది.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <string name="reboot_progress">రీబూటింగ్\u2026</string>
+  <!-- Long-press back kill application -->
+  <string name="app_killed_message">అనువర్తనం నిర్వీర్యం చేయబడింది</string>
+  <!-- ADB over network notification -->
+  <string name="adb_net_active_notification_title">ADB ఓవర్ నెట్వర్క్ ప్రారంభించబడింది</string>
+  <!-- ADB over USB and network notification -->
+  <string name="adb_both_active_notification_title">ADB ఓవర్ USB మరియు నెట్వర్క్ ప్రారంభించబడ్డాయి</string>
+  <!-- ADB notification message-->
+  <string name="adb_active_generic_notification_message">డీబగ్గింగ్ నిలిపివేయడానికి తాకండి</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB మరియు నెట్వర్క్</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">నెట్‌వర్క్</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <string name="permlab_interceptPackageLaunch">ప్రోగ్రాం ప్రారంభానికి అవరోధం కలిగించుము</string>
+  <!-- stylus gestures support -->
+  <string name="stylus_app_not_installed">%s ఇన్స్టాల్ చేయబడలేదు</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">ప్రాధాన్యత</string>
+  <string name="silent_mode_none">ఏదీ లేదు</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">SIM సభ్యత్వ మార్పు కారణంగా Wi-Fi హాట్ స్పాట్ నిలిపివేయబడింది</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Wi-Fi ను ఆఫ్ చేయుము</string>
+  <!-- Privacy Guard -->
+  <string name="permlab_changePrivacyGuardState">గోప్యతా సంరక్షణను ప్రారంభించుము/నిలిపివేయుము</string>
+  <string name="permdesc_changePrivacyGuardState">ఇంకొక అనువర్తనం గోప్యతా సంరక్షణతో పనిచేస్తుందా అనే దానిని మార్చడానికి అనువర్తనానికి అనుమతినిస్తుంది. అనువర్తనం గోప్యతా సంరక్షణతో పనిచేస్తున్నప్పుడు, పరిచయాలు, కాల్ లాగులు, లేదా మెసేజులు వంటి వ్యక్తిగత డేటాకు అది ప్రాప్యతను కలిగి ఉండదు.</string>
+  <string name="privacy_guard_notification">గోప్యతా సంరక్షణ క్రియాశీలం</string>
+  <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> వ్యక్తిగత డేటాకు ప్రాప్యతను కలిగి ఉండదు</string>
+  <string name="privacy_guard_dialog_title">గోప్యత రక్షణ</string>
+  <string name="privacy_guard_dialog_summary"><xliff:g id="app">%2$s</xliff:g> ను చేయడానికి <xliff:g id="op">%1$s</xliff:g> ఇష్టపడుతుంది.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <string name="permission_remember_choice">నా ఎంపికను గుర్తుంచుకో</string>
+  <!-- App ops requests -->
+  <string name="app_ops_access_camera">కెమెరాను ప్రాప్యత చేయుము</string>
+  <string name="app_ops_access_location">మీ స్థానానికి ప్రాప్యత చేయుము</string>
+  <string name="app_ops_access_notifications">మీ నోటిఫికేషన్లను చదువుము</string>
+  <string name="app_ops_activate_vpn">ఒక VPNను క్రియాశీలం చేయుము</string>
+  <string name="app_ops_auto_start">పవర్ అప్ వద్ద ప్రారంభించుము</string>
+  <string name="app_ops_delete_call_log">మీ కాల్ లాగును తొలిగించుము</string>
+  <string name="app_ops_delete_contacts">మీ పరిచయాలను తొలిగించుము</string>
+  <string name="app_ops_delete_mms">మీ MMS మెసేజులను తొలిగించుము</string>
+  <string name="app_ops_delete_sms">మీ SMS మెసేజులను తొలిగించుము</string>
+  <string name="app_ops_draw_on_top">పైన గవాక్షాలను గీయండి</string>
+  <string name="app_ops_get_usage_stats">అనువర్తన వినియోగ గణాంకాలను పొందుము</string>
+  <string name="app_ops_keep_device_awake">మీ పరికరాన్ని చేతనంగా ఉంచండి</string>
+  <string name="app_ops_make_phone_call">ఫోన్ కాల్ చేయుము</string>
+  <string name="app_ops_modify_calendar">క్యాలెండరును నవీకరించుము</string>
+  <string name="app_ops_modify_call_log">కాల్ లాగును నవీకరించుము</string>
+  <string name="app_ops_modify_clipboard">క్లిప్ బోర్డును నవీకరించుము</string>
+  <string name="app_ops_modify_contacts">మీ పరిచయాలను నవీకరించుము</string>
+  <string name="app_ops_modify_settings">సిస్టమ్ అమరికలను నవీకరించుము</string>
+  <string name="app_ops_mute_unmute_microphone">మైక్రోఫోనును మ్యూట్/అన్ మ్యూట్ చేయుము</string>
+  <string name="app_ops_play_audio">ఆడియోను ప్లే చేయుము</string>
+  <string name="app_ops_post_notification">నోటిఫికేషనును పోస్ట్ చేయుము</string>
+  <string name="app_ops_project_media">మీడియాను ప్రదర్శించుము</string>
+  <string name="app_ops_read_calendar">మీ కాలెండరును చదువుము</string>
+  <string name="app_ops_read_call_log">కాల్ లాగును చదువుము</string>
+  <string name="app_ops_read_clipboard">క్లిప్ బోర్డును చదువుము</string>
+  <string name="app_ops_read_contacts">మీ పరిచయాలను చదవడం</string>
+  <string name="app_ops_read_mms">మీ యొక్క MMS మెసేజులను చదువుము</string>
+  <string name="app_ops_read_sms">మీ యొక్క SMS మెసేజులను చదువుము</string>
+  <string name="app_ops_receive_sms">SMS మెసేజ్ అందుకొనుము</string>
+  <string name="app_ops_record_audio">ఆడియో రికార్డ్ చేయడం</string>
+  <string name="app_ops_send_mms">MMS మెసేజును పంపుము</string>
+  <string name="app_ops_send_sms">SMS మెసేజును పంపుము</string>
+  <string name="app_ops_start_at_bootup">పవర్ అప్ వద్ద ప్రారంభించుము</string>
+  <string name="app_ops_toast_window">టోస్ట్ మెసేజులను ప్రదర్శించుము</string>
+  <string name="app_ops_toggle_bluetooth">బ్లూటూతును ద్విక్రియం చేయుము</string>
+  <string name="app_ops_toggle_mobile_data">మొబైల్ డేటాను ద్విక్రియం చేయుము</string>
+  <string name="app_ops_toggle_nfc">NFCను ద్విక్రియ చేయుము</string>
+  <string name="app_ops_toggle_wifi">Wi-Fiను ద్విక్రియ చేయుము</string>
+  <string name="app_ops_use_alarm_volume">అలారం శబ్దాన్ని నియంత్రించుము</string>
+  <string name="app_ops_use_audio_focus">ఆడియో కేంద్రీకరణను నియంత్రించుము</string>
+  <string name="app_ops_use_bluetooth_volume">బ్లూటూత్ శబ్దాన్ని నియంత్రించుము</string>
+  <string name="app_ops_use_master_volume">మాస్టర్ శబ్దాన్ని నియంత్రించుము</string>
+  <string name="app_ops_use_media_buttons">మీడియా బటన్లను ఉపయోగించుము</string>
+  <string name="app_ops_use_media_volume">మీడియా శబ్దాన్ని నియంత్రించుము</string>
+  <string name="app_ops_use_notification_volume">నోటిఫికేషన్ శబ్దాన్ని నియంత్రించుము</string>
+  <string name="app_ops_use_ring_volume">రింగ్ టోన్ శబ్దాన్ని నియంత్రించుము</string>
+  <string name="app_ops_use_vibrate">చేతి సంబంధ అభిప్రాయాన్ని ఉపయోగించుము</string>
+  <string name="app_ops_use_voice_volume">స్వర కాల్ శబ్దాన్ని నియంత్రించుము</string>
+  <string name="app_ops_write_mms">MMS మెసేజును వ్రాయుము</string>
+  <string name="app_ops_write_sms">SMS  మెసేజును వ్రాయుము</string>
+  <string name="app_ops_use_fingerprint">వేలిముద్రను ఉపయోగించుము</string>
+  <string name="app_ops_add_voicemail">వాయిస్ మెయిల్‌ను జోడించడం</string>
+  <string name="app_ops_read_phone_state">ఫోన్  స్థితి యొక్క ప్రాప్తి</string>
+  <string name="app_ops_scan_wifi">Wi-Fi నెట్వర్క్స్ స్కాన్ చేయి</string>
+  <string name="app_ops_change_wallpaper">వాల్పేపర్ మార్చు</string>
+  <string name="app_ops_assist_structure">సహాయక నిర్మాణంను ఉపయోగించు</string>
+  <string name="app_ops_assist_screenshot">స్క్రీన్‌షాట్ తీయుము</string>
+  <string name="app_ops_use_body_sensors">శరీర సెన్సార్లను ఉపయోగించుము</string>
+  <string name="app_ops_read_cell_broadcasts">గడి ప్ర్రసారాలను చదువుము</string>
+  <string name="app_ops_mock_location">మీ స్థానాన్ని నకిలీ చేయండి</string>
+  <string name="app_ops_read_external_storage">బాహ్య నిల్వను చదువుము</string>
+  <string name="app_ops_write_external_storage">బాహ్య నిల్వకు వ్రాయుము</string>
+  <string name="app_ops_turn_on_screen">తెరను ఆన్ చేయుము</string>
+  <string name="app_ops_get_accounts">మీ పరికరం యొక్క ఖాతాలు పొందుము</string>
+  <string name="app_ops_wifi_change">Wi-Fi స్థితిని మార్చు</string>
+  <string name="app_ops_su">మూలాంశ ప్రాప్యతను పొందుము</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">ఈ స్క్రీనును అన్పిన్ చేయడానికి, బ్యాక్ బటనును తాకండి మరియు పట్టుకోండి.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">ఎటువంటి పరికరం అనుసంధానించబడలేదు</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> అనుసంధానించబడిన పరికరం</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> అనుసంధానించబడిన పరికరాలు</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">కార్యకలాపం ప్రయోగించడం నిరోధించబడింది</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$S</xliff:g> ప్రయోగించడం నుండి సంరక్షించబడింది అనువర్తనాన్ని అధీకృతం చేయడం మరియు ప్రయోగించడం నుండి సంరక్షించబడింది.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">బ్యాటరీ పూర్తిగా ఛార్జ్</string>
+  <string name="notify_battery_fully_charged_text">బ్యాటరీ దీర్ఘాయువు మెరుగు ఛార్జర్ నుండి మీ పరికరాన్ని డిస్కనెక్ట్ చేయండి.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">బ్యాటరీ గణాంకాలను రీసెట్ చేయడం</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">ప్రస్తుత తక్కువ-స్థాయి బ్యాటరీ నిల్వ డేటాను రీసెట్ చేసేందుకు అప్లికేషనుకు అనుమతినిస్తుంది.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-th/cm_strings.xml b/core/res/res/values-th/cm_strings.xml
index ca087e8..cd6f80e 100644
--- a/core/res/res/values-th/cm_strings.xml
+++ b/core/res/res/values-th/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">ถ่ายภาพหน้าจอ</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">รับ SMS ที่ได้รับการปกป้อง</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">อนุญาตให้แอปรับ SMS ที่ได้รับการปกป้อง</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">แก้ไขรายการ SMS ที่ได้รับการปกป้อง</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">อนุญาตให้แอปแก้ไขรายการที่อยู่ SMS ที่ได้รับการปกป้อง</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">ความปลอดภัย</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">สิทธิ์ที่เกี่ยวข้องกับข้อมูลความปลอดภัยของอุปกรณ์</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">อ่านรายชื่อบัญชีดำ</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">อนุญาตให้แอปอ่านข้อมูลหมายเลขโทรศัพท์ที่ถูกบล็อคสำหรับสายการโทรเข้าหรือข้อความ</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">เปลี่ยนรายชื่อบัญชีดำ</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">อนุญาตให้แอปเปลี่ยนหมายเลขที่ถูกบล็อคสำหรับสายการโทรเข้าหรือข้อความ</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">ตั้งภาพล็อคหน้าจอ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">อนุญาตให้แอปเปลี่ยนภาพล็อคหน้าจอได้</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">เริ่มระบบใหม่</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">ปัจจุบัน</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">เริ่มระบบใหม่</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">ดาวน์โหลด</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">เริ่มระบบแบบซอฟต์รีบู๊ต</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">เริ่มระบบใหม่</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">แท็บเล็ตของคุณจะเริ่มระบบใหม่</string>
   <string name="reboot_confirm" product="default">โทรศัพท์ของคุณจะเริ่มระบบใหม่</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">กำลังเริ่มระบบใหม่\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">ปิดแอป</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB บนเครือข่ายถูกเปิดใช้งาน</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB บน USB และ &amp; เครือข่ายถูกเปิดใช้งาน</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">แตะเพื่อปิดการแก้ไขข้อบกพร่อง</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; เครือข่าย</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">เครือข่าย</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">ขัดขวางการเปิดแอป</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s ไม่ถูกติดตั้ง</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">ระดับความสำคัญ</string>
   <string name="silent_mode_none">ไม่มี</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">ปิดฮอตสปอต Wi-Fi เนื่องจากการเปลี่ยนแปลงการสมัครซิมการ์ด</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">ปิด Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">เปิดหรือปิดการป้องกันความเป็นส่วนตัว</string>
   <string name="permdesc_changePrivacyGuardState">อนุญาตให้แอปเปลี่ยนแปลงไม่ว่าแอปอื่นทำงานโดยใช้การป้องกันความเป็นส่วนตัวหรือไม่ก็ตาม เมื่อแอปกำลังทำงานโดยใช้การป้องกันความเป็นส่วนตัว แอปจะไม่สามารถเข้าถึงข้อมูลส่วนบุคคล เช่น รายชื่อติดต่อ ประวัติการโทร หรือข้อความได้</string>
   <string name="privacy_guard_notification">การป้องกันความเป็นส่วนตัวทำงาน</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> จะไม่สามารถเข้าถึงข้อมูลส่วนตัวได้</string>
   <string name="privacy_guard_dialog_title">รักษาความเป็นส่วนตัว</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> ต้องการ <xliff:g id="op">%2$s</xliff:g></string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">จำตัวเลือกของฉัน</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">เข้าถึงกล้อง</string>
   <string name="app_ops_access_location">เข้าถึงตำแหน่งที่ตั้งของคุณ</string>
   <string name="app_ops_access_notifications">อ่านการแจ้งเตือน</string>
@@ -97,6 +135,7 @@
   <string name="app_ops_start_at_bootup">เริ่มเมื่อเปิดเครื่อง</string>
   <string name="app_ops_toast_window">แสดงแถบข้อความ</string>
   <string name="app_ops_toggle_bluetooth">สลับบลูทูธ</string>
+  <string name="app_ops_toggle_mobile_data">สลับข้อมูลโทรศัพท์มือถือ</string>
   <string name="app_ops_toggle_nfc">สลับ NFC</string>
   <string name="app_ops_toggle_wifi">สลับ WiFi</string>
   <string name="app_ops_use_alarm_volume">ควบคุมระดับเสียงนาฬิกาปลุก</string>
@@ -127,21 +166,28 @@
   <string name="app_ops_get_accounts">เข้าถึงบัญชีของอุปกรณ์</string>
   <string name="app_ops_wifi_change">เปลี่ยนแปลงสถานะ Wi-Fi</string>
   <string name="app_ops_su">รับสิทธิผู้ดูแลระบบ</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">เพื่อยกเลิกการปักหมุดหน้าจอนี้ กดปุ่มกลับค้างไว้</string>
-  <string name="live_display_auto">อัตโนมัติ</string>
-  <string name="live_display_auto_summary">ตั้งอุณหภูมิสีจออัตโนมัติหลังดวงอาทิตย์ขึ้นและตก</string>
-  <string name="live_display_off">ปิด</string>
-  <string name="live_display_off_summary">ปิดการปรับแต่งทั้งหมด</string>
-  <string name="live_display_day">กลางวัน</string>
-  <string name="live_display_day_summary">ใช้การตั้งค่ากลางวันเท่านั้น</string>
-  <string name="live_display_night">กลางคืน</string>
-  <string name="live_display_night_summary">ใช้การตั้งค่ากลางคืนเท่านั้น</string>
-  <string name="live_display_outdoor">กลางแจ้ง (แดดจ้า)</string>
-  <string name="live_display_outdoor_summary">ใช้การตั้งค่ากลางแจ้งเท่านั้น</string>
-  <string name="live_display_hint">LiveDisplay สามารถช่วยลดอาการปวดตา และช่วยให้คุณนอนหลับในเวลากลางคืน คลิกที่นี่เพื่อลองใช้!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">ไม่มีอุปกรณ์เชื่อมต่อ</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> อุปกรณ์เชื่อมต่ออยู่</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> อุปกรณ์เชื่อมต่ออยู่</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">การเปิดกิจจรรมถูกบล็อก</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> ถูกป้องกันจากการเปิด แตะเพื่อยืนยันและเปิดแอป</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">แบตเตอรี่เต็มแล้ว</string>
+  <string name="notify_battery_fully_charged_text">ถอดอุปกรณ์ของคุณออกจากที่ชาร์จเพื่อเพิ่มอายุการใช้งานของแบตเตอรี่</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">รีเซ็ตสถิติแบตเตอรี่</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">อนุญาตให้แอปพลิเคชันรีเซ็ตข้อมูลการใช้แบตเตอรี่ระดับต่ำในปัจจุบัน</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">มีการเปลี่ยนซิมการ์ด</string>
+  <string name="uicc_hot_swapped_event_text">แตะเพื่อตั้งค่าการกำหนดค่าเริ่มต้นของ SIM การ์ด</string>
 </resources>
diff --git a/core/res/res/values-tr/cm_strings.xml b/core/res/res/values-tr/cm_strings.xml
index 1cd22e5..7e31585 100644
--- a/core/res/res/values-tr/cm_strings.xml
+++ b/core/res/res/values-tr/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Ekran görüntüsü</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">korumalı SMS al</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Uygulamaya korumalı bir SMS alma izni verir.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">korumalı SMS listesini değiştir</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Uygulamaya korumalı SMS adres listesini değiştirme izni verir.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Güvenlik</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Cihaz güvenlik bilgisi ile ilgili izinler.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">telefon kara listesini oku</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Bir uygulamanın gelen çağrıları ya da mesajları engellenmiş telefon numaralarını okumasına izin verir.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">telefon kara listesini değiştir</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Bir uygulamanın gelen çağrıları ya da mesajları engellenmiş telefon numaralarını değiştirmesine izin verir.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">tuş kilidi duvar kağıdını ayarla</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Bir uygulamanın kilit ekranı duvar kağıdını değiştirmesine izin verir.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Yeniden başlat</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Şimdiki</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Yeniden başlat</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Kurtarma modu (Recovery)</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Ön yükleyici (Bootloader)</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">İndir</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Yazılımsal yeniden başlatma</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Yeniden Başlat</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Tabletiniz yeniden başlatılacak.</string>
   <string name="reboot_confirm" product="default">Telefonunuz yeniden başlatılacak.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Yeniden başlatılıyor\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Uyg. sonlandırıldı</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">Ağ üzerinden ADB etkin</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USB &amp; Ağ üzerinden ADB etkin</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Hata ayıklamayı devre dışı bırakmak için dokunun.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; ağ</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Ağ</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">uygulama başlangıcını önle</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s yüklü değil</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Öncelik</string>
   <string name="silent_mode_none">Yok</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">SIM abonelik değişikliği nedeniyle Wi-Fi internet paylaşımı devre dışı bırakıldı</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Wi-Fi\'yi kapat</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">Gizlilik Korumasını etkinleştir ya da devre dışı bırak</string>
   <string name="permdesc_changePrivacyGuardState">Uygulamaya başka bir uygulamanın Gizlilik Korumasını kullanıp kullanamayacağını belirleme olanağı verir. Bir uygulama Gizlilik Koruması ile çalışırken; kişiler, arama kayıtları ya da mesajlar gibi kişisel bilgilere ulaşamaz.</string>
   <string name="privacy_guard_notification">Gizlilik Koruması aktif</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> kişisel bilgilere ulaşamayacak</string>
   <string name="privacy_guard_dialog_title">Gizlilik Koruması</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g>  <xliff:g id="op">%2$s</xliff:g> iznini kullanmak istiyor.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Seçimimi hatırla</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">kameraya eriş</string>
   <string name="app_ops_access_location">konuma erişim</string>
   <string name="app_ops_access_notifications">bildirimleri oku</string>
@@ -97,6 +135,7 @@
   <string name="app_ops_start_at_bootup">açılışta başla</string>
   <string name="app_ops_toast_window">bildirim mesajları göster</string>
   <string name="app_ops_toggle_bluetooth">Bluetooth\'u açıp kapat</string>
+  <string name="app_ops_toggle_mobile_data">hücresel veriye geçiş</string>
   <string name="app_ops_toggle_nfc">NFC\'yi aç kapa</string>
   <string name="app_ops_toggle_wifi">Wi-Fi aç kapa</string>
   <string name="app_ops_use_alarm_volume">alarm sesini kontrol et</string>
@@ -127,19 +166,28 @@
   <string name="app_ops_get_accounts">cihaz hesaplarını al</string>
   <string name="app_ops_wifi_change">Wi-Fi durumunu değiştir</string>
   <string name="app_ops_su">root erişimi al</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Bu ekranı kaldırmak için Geri tuşuna dokunun ve tutun.</string>
-  <string name="live_display_auto">Otomatik</string>
-  <string name="live_display_auto_summary">Gün batımı ve doğumundan sonra ekranın renk sıcaklığını otomatik ayarlar</string>
-  <string name="live_display_off">Kapalı</string>
-  <string name="live_display_off_summary">Tüm ayarlamaları devre dışı bırak</string>
-  <string name="live_display_day">Gündüz</string>
-  <string name="live_display_day_summary">Sadece gündüz ayarlarını kullan</string>
-  <string name="live_display_night">Gece</string>
-  <string name="live_display_night_summary">Sadece gece ayarlarını kullan</string>
-  <string name="live_display_outdoor">Açık alan (parlak güneş)</string>
-  <string name="live_display_outdoor_summary">Sadece açık alan ayarlarını kullan</string>
-  <string name="live_display_hint">LiveDisplay göz yorgunluğunuzu azaltıp geceleri uyumanıza yardımcı olabilir. Denemek için buraya tıklayın!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Bağlı cihaz yok</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s </xliff:g> cihaz bağlı</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> cihaz bağlı</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Etkinlik başlatma engellendi</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> başlatılmadan önce sistem korumaya alındı. Uygulamayı doğrulamak ve başlatmak için dokunun.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Batarya tam olarak şarj edildi</string>
+  <string name="notify_battery_fully_charged_text">Aygıtınızın pil ömrünü artırmak için şarjdan çıkarın.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">pil istatistiklerini sıfırla</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Uygulamaya güncel düşük seviye pil kullanım verisini sıfırlama izni verir.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM kartlar değişti</string>
+  <string name="uicc_hot_swapped_event_text">Varsayılan SIM kart tercihlerini ayarlamak için dokunun</string>
 </resources>
diff --git a/core/res/res/values-ug/cm_strings.xml b/core/res/res/values-ug/cm_strings.xml
index 5332e1f..c40799c 100644
--- a/core/res/res/values-ug/cm_strings.xml
+++ b/core/res/res/values-ug/cm_strings.xml
@@ -17,43 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">ئېكراندىن تۇتۇلغان سۈرەت</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">قوغدالغان قىسقا ئۇچۇرنى قوبۇل قىلىش</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">ئەپنىڭ قوغدالغان قىسقا ئۇچۇرنى قوبۇللىشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">قوغدالغان قىسقا ئۇچۇر تىزىمىنى ئۆزگەرتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">ئەپنىڭ قوغدالغان قىسقا ئۇچۇر ئادرېسىنىڭ تىزىمىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">بىخەتەرلىك</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">ئۈسكۈنە بىخەتەرلىك ئۇچۇرىغا مۇناسىۋەتلىك ھوقۇقلار.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">تېلېفون قارا تىزىمىنى ئوقۇش</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">ئەپنىڭ كەلگەن تېلېفون ياكى ئۇچۇرلارنىڭ چەكلەنگەن تېلېفون نومۇر ئۇچۇرلىرىنى ئوقۇشىغا يول قويىدۇ.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">تېلېفون قارا تىزىمىنى ئۆزگەرتىدۇ</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">كەلگەن تېلېفون ياكى ئۇچۇرنىڭ چەكلەنگەن نومۇر ئۇچۇرلىرىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">قۇلۇپ ئېكران تام قەغىزىنى تەڭشەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">ئەپنىڭ قۇلۇپ ئېكران تام قەغىزىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">قايتا قوزغات</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">نۆۋەتتىكى</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">قايتا قوزغات</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">ئەسلىگە كەلتۈر</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">قوزغىتىش يۈكلىگۈچ</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">چۈشۈر</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">يۇمشاق قايتا قوزغىتىش</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">قايتا قوزغات</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">تاختا كومپيۇتېرىڭىز قايتا قوزغىلىدۇ.</string>
   <string name="reboot_confirm" product="default">تېلېفونىڭىز قايتا قوزغىلىدۇ.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">قايتا قوزغىتىۋاتىدۇ\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">ئەپ ئاخىرلاشتۇرۇلدى</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">تور ھالقىغان ADB قوزغىتىلدى</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USB ۋە تور ADB قوزغىتىلدى</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">چېكىلسە سازلاشنى چەكلەيدۇ.</string>
+  <!-- ADB custom tile -->
+  <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
+  <string name="adb_active_custom_tile_both">USB &amp; تور</string>
+  <string name="adb_active_custom_tile_usb">USB</string>
+  <string name="adb_active_custom_tile_net">تور</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">ئەپ قوزغىتىشنى توسىدۇ</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s تېخى ئورنىتىلمىغان</string>
+  <!-- Zen mode buttons -->
+  <string name="silent_mode_priority">ئالدىنلىق</string>
+  <string name="silent_mode_none">يوق</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <string name="subscription_change_disabled_wifi_ap">SIM كارتنىڭ مۇشتەرلىكى ئۆزگەرگەنلىكتىن، Wi-Fi قىزىق نوقتىسى چەكلەندى</string>
+  <!-- WiFi turn off notification action text -->
+  <string name="notify_turn_wifi_off_title">Wi-Fi نى تاقاڭ</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">شەخسىيەت قوغداشنى قوزغىتىدۇ ياكى چەكلەيدۇ</string>
   <string name="permdesc_changePrivacyGuardState">ئەپنىڭ باشقا ئەپنى شەخسىيەت قوغداش ھالىتىدە ئىجرا قىلىشىغا يول قويىدۇ. ئەپ شەخسىيەت قوغداش ھالىتىدە ئىجرا قىلىنسا، ئۇ ئالاقەداشلار، چاقىرىش خاتىرىسى ياكى ئۇچۇرلارغا ئوخشاش شەخسىي سانلىق مەلۇماتلارنى زىيارەت قىلىش ھوقۇقى بولمايدۇ.</string>
   <string name="privacy_guard_notification">شەخسىيەت قوغداش ئاكتىپ</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> شەخسىي سانلىق مەلۇماتلارنى زىيارەت قىلالمايدۇ</string>
   <string name="privacy_guard_dialog_title">شەخسىيەت قوغداش</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> نىڭ قىلماقچى بولغىنى <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">تاللىشىمنى ئەستە تۇت</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">كامېراغا ئېرىشىدۇ</string>
   <string name="app_ops_access_location">ئورنىڭىزغا ئېرىشىدۇ</string>
   <string name="app_ops_access_notifications">ئۇقتۇرۇشىڭىزنى ئوقۇيدۇ</string>
@@ -89,7 +135,9 @@
   <string name="app_ops_start_at_bootup">قوزغالغاندا باشلايدۇ</string>
   <string name="app_ops_toast_window">قاڭقىش ئۇچۇرىنى كۆرسىتىدۇ</string>
   <string name="app_ops_toggle_bluetooth">كۆكچىشنى ئاچ تاقا</string>
+  <string name="app_ops_toggle_mobile_data">كۆچمە تورغا ئالماشتۇرۇش</string>
   <string name="app_ops_toggle_nfc">NFC ئاچ تاقا</string>
+  <string name="app_ops_toggle_wifi">WiFi نى ئېچىش تاقاش</string>
   <string name="app_ops_use_alarm_volume">قوڭغۇراق ئاۋازىنى تىزگىنلەيدۇ</string>
   <string name="app_ops_use_audio_focus">ئاۋاز فوكۇسىنى تىزگىنلەيدۇ</string>
   <string name="app_ops_use_bluetooth_volume">كۆكچىش ئاۋازىنى تىزگىنلەيدۇ</string>
@@ -102,19 +150,44 @@
   <string name="app_ops_use_voice_volume">ئاۋازلىق چاقىرىش ئاۋازىنى تىزگىنلە</string>
   <string name="app_ops_write_mms">MMS ئۇچۇرى ياز</string>
   <string name="app_ops_write_sms">SMS ئۇچۇر ياز</string>
+  <string name="app_ops_use_fingerprint">بارماق ئىشلىتىش</string>
+  <string name="app_ops_add_voicemail">ئاۋازلىق ئېلخەت قوشۇش</string>
+  <string name="app_ops_read_phone_state">يانفون ھالىتىنى زىيارەت قىلىش</string>
+  <string name="app_ops_scan_wifi">Wi-Fi تورىنى سىكاننېرلاش</string>
+  <string name="app_ops_change_wallpaper">تەگلىك ئالماشتۇرۇش</string>
+  <string name="app_ops_assist_structure">قوشۇمچە قۇرۇلمىنى ئىشلىتىش</string>
+  <string name="app_ops_assist_screenshot">رەسىم تۇتۇش</string>
+  <string name="app_ops_use_body_sensors">ئادەم بەدىنى ئىندۇكسىيەسىنى ئىشلىتىش</string>
+  <string name="app_ops_read_cell_broadcasts">رايونلۇق رادىئونى ئوقۇش</string>
+  <string name="app_ops_mock_location">ساختا ئورۇن ئىشلىتىڭ</string>
+  <string name="app_ops_read_external_storage">سىرتقى ساقلىغۇچنى ئوقۇش</string>
+  <string name="app_ops_write_external_storage">سىرتقى ساقلىغۇچنى يېزىش</string>
+  <string name="app_ops_turn_on_screen">ئېكراننى ئېچىش</string>
+  <string name="app_ops_get_accounts">ئۈسكىنىنىڭ ھېساباتىغا ئېرىشىش</string>
+  <string name="app_ops_wifi_change">سىمسىز تور ھالىتىنى ئۆزگەرتىش</string>
   <string name="app_ops_su">root ھوقۇقىغا ئېرىشىدۇ</string>
-  <string name="live_display_auto">ئاپتوماتىك</string>
-  <string name="live_display_auto_summary">كۈن چىققان ۋە كۈن پاتقاندىن كېيىن ئېكران رەڭ تېمپېراتورىسىنى ئۆزلۈكىدىن تەڭشەيدۇ</string>
-  <string name="live_display_off">تاقاق</string>
-  <string name="live_display_off_summary">بارلىق تەڭشەشلەرنى چەكلەيدۇ</string>
-  <string name="live_display_day">كۈندۈز</string>
-  <string name="live_display_day_summary">كۈندۈز تەڭشەكلىرىنىلا ئىشلىتىدۇ</string>
-  <string name="live_display_night">كېچە</string>
-  <string name="live_display_night_summary">كېچە تەڭشەكلىرىنىلا ئىشلىتىدۇ</string>
-  <string name="live_display_outdoor">تالا (قۇياش نۇرى)</string>
-  <string name="live_display_outdoor_summary">تالا تەڭشەكلىرىنىلا ئىشلىتىدۇ</string>
-  <string name="live_display_hint">LiveDisplay كۆزنىڭ چارچىشىنى يېنىكلىتىشكە ياردەم بېرىدۇ، كېچىدە ئۇخلىشىڭىزغا ياردەم بېرىدۇ. سىناش ئۈچۈن بۇ جاينى چېكىڭ!</string>
-  <string name="tethered_notification_no_device_message">باغلانغان ئۈسكۈنە يوق</string>
-  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ئۈسكۈنە باغلاندى</string>
-  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> ئۈسكۈنە باغلاندى</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <string name="lock_to_app_toast_no_navbar">بۇ مۇقىم ئېكراننى يوق قىلىش ئۈچۈن، قايتىش كۇنۇپكىسىنى بېسىپ تۇرۇڭ.</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <string name="tethered_notification_no_device_message">ئۇلانغان ئۈسكۈنە يوق</string>
+  <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> ئۈسكۈنە ئۇلاندى</string>
+  <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> ئۈسكۈنە ئۇلاندى</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">پائالىيەت توسىۋېلىندى</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> قوزغىلىۋاتقاندا ئاللىبۇرۇن قوغدالدى. چىكىپ ئىسپاتلاڭ ھەم بۇ ئەپنى قوزغىتىڭ.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">باتارىيە تۇللۇق توشتى</string>
+  <string name="notify_battery_fully_charged_text">باتارىيە ئۆمرىنىڭ تېخىمۇ ئۇزۇن بۇلۇشى ئۈچۈن، توك قاچىلىغۇچنى ئۈسكىنىڭىزدىن ئايرىڭ.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">توكدان ئىستاتىستىكىسىنى ئەسلىگە قايتۇرۇڭ</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">ئەپنىڭ نۆۋەتتىكى تۆۋەن توك ئىشلىتىش سانلىق مەلۇماتلىرىنى ئەسلىگە قايتۇرۇشىغا يول قويىدۇ.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM كارتا ئالماشتۇرۇلدى</string>
+  <string name="uicc_hot_swapped_event_text">چىكىپ SIM كارتىنىڭ كۆڭۈلدىكى تەڭشىكىگە قايتۇرۇڭ</string>
 </resources>
diff --git a/core/res/res/values-ug/strings.xml b/core/res/res/values-ug/strings.xml
index 768ccd5..a5d9d1e 100644
--- a/core/res/res/values-ug/strings.xml
+++ b/core/res/res/values-ug/strings.xml
@@ -19,41 +19,105 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Suffix added to a number to signify size in bytes. -->
   <string name="byteShort">B</string>
+  <!-- Suffix added to a number to signify size in kilobytes. -->
   <string name="kilobyteShort">KB</string>
+  <!-- Suffix added to a number to signify size in megabytes. -->
   <string name="megabyteShort">MB</string>
+  <!-- Suffix added to a number to signify size in gigabytes. -->
   <string name="gigabyteShort">GB</string>
+  <!-- Suffix added to a number to signify size in terabytes. -->
   <string name="terabyteShort">TB</string>
+  <!-- Suffix added to a number to signify size in petabytes. -->
   <string name="petabyteShort">PB</string>
+  <!-- Format string used to add a suffix like "KB" or "MB" to a number
+         to display a size in kilobytes, megabytes, or other size units.
+         Some languages (like French) will want to add a space between
+         the placeholders. -->
+  <string name="fileSizeSuffix"><xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g></string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in days -->
+  <string name="durationDays"><xliff:g id="days">%1$d</xliff:g> كۈن</string>
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one day with one hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in hours -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one hour with one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in minutes -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one minute with one second -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration in seconds -->
+  <!-- [CHAR_LIMIT=10] Suffix added to signify duration of one second -->
+  <!-- Used in Contacts for a field that has no label and in Note Pad
+         for a note with no name. -->
   <string name="untitled">&lt;ماۋزۇسىز&gt;</string>
+  <!-- How to display the lack of a phone number -->
   <string name="emptyPhoneNumber">(تېلېفون نومۇرى يوق)</string>
+  <!-- How to display the lack of a name -->
+  <!-- What the UI should display for "voice mail" unless overridden by the SIM-->
   <string name="defaultVoiceMailAlphaTag">ئۈنخەت</string>
+  <!-- What the UI should display for "Msisdn" unless overridden by the SIM-->
   <string name="defaultMsisdnAlphaTag">MSISDN1</string>
+  <!-- For GsmMmiCode.java -->
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed. This will be displayed in a toast. -->
   <string name="mmiError">باغلىنىشتا مەسىلە كۆرۈلدى ياكى MMI كودى خاتا.</string>
+  <!-- Displayed when the user dialed an MMI code whose function
+         could not be performed because FDN is enabled. This will be displayed in a toast. -->
   <string name="mmiFdnError">پەقەت مۇقىم نومۇرغىلا بۇ مەشغۇلاتنى ئىجرا قىلىدۇ.</string>
+  <!-- Displayed when a phone feature such as call barring was activated. -->
   <string name="serviceEnabled">مۇلازىمەت قوزغىتىلدى.</string>
+  <!-- Displayed in front of the list of a set of service classes
+         (voice, data, fax, etc.) that were enabled. -->
   <string name="serviceEnabledFor">مۇلازىمەت تۆۋەندىكى تۈر ئۈچۈن قوزغىتىلدى:</string>
+  <!-- Displayed when a phone feature such as call forwarding was deactivated. -->
   <string name="serviceDisabled">مۇلازىمەت چەكلەندى.</string>
+  <!-- Displayed when a phone property such as a SIM password was registered. -->
   <string name="serviceRegistered">خەتلەش مۇۋەپپەقىيەتلىك.</string>
+  <!-- Displayed when a phone property such as a SIM password was erased. -->
   <string name="serviceErased">مۇۋەپپەقىيەتلىك ئۆچۈردى.</string>
+  <!-- Displayed when a SIM password was entered incorrectly. -->
   <string name="passwordIncorrect">ئىم خاتا.</string>
+  <!-- Displayed when a phone feature triggered by an MMI code is complete. -->
   <string name="mmiComplete">MMI تاماملاندى.</string>
+  <!-- Displayed when a SIM PIN password is entered incorrectly. -->
   <string name="badPin">سىز كىرگۈزگەن كونا PIN خاتا.</string>
+  <!-- Displayed when a SIM PUK password is entered incorrectly. -->
   <string name="badPuk">سىز كىرگۈزگەن PUK خاتا.</string>
+  <!-- Displayed when SIM PIN passwords are entered inconsistently. -->
   <string name="mismatchPin">سىز كىرگۈزگەن PIN ماس كەلمىدى.</string>
+  <!-- Displayed when a SIM PIN password is too long or too short. -->
   <string name="invalidPin">4-8 خانىلىق PIN نى كىرگۈزۈڭ.</string>
+  <!-- Displayed when a SIM PUK password is too short. -->
   <string name="invalidPuk">8 خانە ۋە ئۇنىڭدىن كۆپ PUK2 نى كىرگۈزۈڭ.</string>
+  <!-- Displayed to prompt the user to type the PUK password to unlock
+         the SIM card. -->
   <string name="needPuk">SIM كارتا PUK نۇمۇرىدا قۇلۇپلانغان. ئېچىش ئۈچۈن PUK نۇمۇرىنى كىرگۈزۈڭ.</string>
   <string name="needPuk2">SIM كارتىنى ئېچىش ئۈچۈن PUK2 نۇمۇرىنى كىرگۈزۈڭ.</string>
+  <!-- Displayed when user attempts to change SIM PIN1 without enabling PIN1. -->
   <string name="enablePin">مۇۋەپپەقىيەتلىك بولمىدى. SIM/RUIM قۇلۇپى قوزغىتىلدى.</string>
+  <!-- Displayed when a SIM PIN/PUK is entered incorrectly. -->
+  <!-- Title for the dialog used to display the user's IMEI number [CHAR LIMIT=10] -->
   <string name="imei">IMEI</string>
+  <!-- Title for the dialog used to display the user's MEID number on CDMA network
+         [CHAR LIMIT=10] -->
   <string name="meid">MEID</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
   <string name="ClipMmi">كەلگەن تېلېفون نومۇر</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling caller ID. -->
   <string name="ClirMmi">ئۇرۇلغان تېلېفون نومۇر</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling connected line ID restriction. -->
+  <!-- Displayed as the title for a success/failure report enabling/disabling call forwarding. -->
   <string name="CfMmi">كەلگەن تېلېفوننى ئۇلاپ يەتكۈزۈش</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call waiting. -->
   <string name="CwMmi">چاقىرىشنى كۈتۈش</string>
+  <!-- Displayed as the title for a success/failure report enabling/disabling call barring. -->
   <string name="BaMmi">چاقىرىشنى چەكلەش</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM password. -->
   <string name="PwdMmi">ئىم ئۆزگەرتىش</string>
+  <!-- Displayed as the title for a success/failure report changing the SIM PIN. -->
   <string name="PinMmi">PIN ئۆزگەرت</string>
   <string name="CnipMmi">كەلگەن نومۇرنى كۆرسىتىش</string>
   <string name="CnirMmi">كەلگەن نومۇرنى كۆرسىتىشنى چەكلەش</string>
@@ -61,29 +125,56 @@
   <string name="RuacMmi">ئېلىشنى خالىمايدىغان تېلېفۇنلارنى ئۈزىۋېتىش</string>
   <string name="CndMmi">چاقىرغان نومۇرنى يەتكۈزۈش</string>
   <string name="DndMmi">ئاۋارە قىلماڭ</string>
+  <!-- Displayed to confirm to the user that caller ID will be restricted on the next call as usual. -->
   <string name="CLIRDefaultOnNextCallOn">كۆڭۈلدىكى ئەھۋالدا يەرلىك نومۇرنى كۆرسەتمەيدۇ ئەمما كېيىنكى قېتىملىق سۆزلىشىشتە كۆرسىتىدۇ.</string>
+  <!-- Displayed to confirm to the user that caller ID will be not restricted on the next call even though it usually is. -->
   <string name="CLIRDefaultOnNextCallOff">كۆڭۈلدىكى ئەھۋالدا يەرلىك نومۇرنى كۆرسەتمەيدۇ ئەمما كېيىنكى قېتىملىق سۆزلىشىشتە كۆرسەتمەيدۇ.</string>
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call but usually is. -->
   <string name="CLIRDefaultOffNextCallOn">كۆڭۈلدىكى ئەھۋالدا يەرلىك نومۇرنى كۆرسىتىدۇ ئەمما كېيىنكى قېتىملىق سۆزلىشىشتە كۆرسەتمەيدۇ.</string>
+  <!-- Displayed to confirm to the user that caller ID will not be restricted on the next call or in general. -->
   <string name="CLIRDefaultOffNextCallOff">كۆڭۈلدىكى ئەھۋالدا يەرلىك نومۇرنى كۆرسىتىدۇ كېيىنكى قېتىملىق سۆزلىشىشتىمۇ كۆرسىتىدۇ.</string>
+  <!-- Displayed to tell the user that caller ID is not provisioned for their SIM. -->
   <string name="serviceNotProvisioned">مۇلازىمەت تەمىنلەنمىگەن</string>
+  <!-- Displayed to tell the user that they cannot change the caller ID setting. -->
   <string name="CLIRPermanent">چاقىرغۇچى كىملىك تەڭشىكىنى ئۆزگەرتەلمەيسىز</string>
+  <!-- Notification title to tell the user that restricted state is changed by access control. -->
   <string name="RestrictedChangedTitle">زىيارەت چەكلىمىسى ئۆزگەردى</string>
+  <!-- Displayed to tell the user that data service is blocked by access control. -->
   <string name="RestrictedOnData">سانلىق مەلۇمات مۇلازىمىتى چەكلەندى.</string>
+  <!-- Displayed to tell the user that emergency service is blocked by access control. -->
   <string name="RestrictedOnEmergency">جىددىي مۇلازىمەت چەكلەندى.</string>
+  <!-- Displayed to tell the user that normal service is blocked by access control. -->
   <string name="RestrictedOnNormal">ئاۋاز مۇلازىمىتى چەكلەندى.</string>
+  <!-- Displayed to tell the user that all emergency and normal voice services are blocked by access control. -->
   <string name="RestrictedOnAllVoice">بارلىق ئاۋاز مۇلازىمىتى چەكلەندى.</string>
+  <!-- Displayed to tell the user that sms service is blocked by access control. -->
   <string name="RestrictedOnSms">قىسقا ئۇچۇر مۇلازىمىتى توختىتىلدى.</string>
+  <!-- Displayed to tell the user that voice/data service is blocked by access control. -->
   <string name="RestrictedOnVoiceData">ئاۋاز/سانلىق مەلۇمات مۇلازىمىتى توختىتىلدى.</string>
+  <!-- Displayed to tell the user that voice and sms service are blocked by access control. -->
   <string name="RestrictedOnVoiceSms">ئاۋاز/قىسقا ئۇچۇر مۇلازىمىتى توختىتىلدى.</string>
+  <!-- Displayed to tell the user that all service is blocked by access control. -->
   <string name="RestrictedOnAll">بارلىق ئاۋاز/سانلىق مەلۇمات/قىسقا ئۇچۇر مۇلازىمىتى توختىتىلدى.</string>
+  <!-- Displayed to tell the user that peer changed TTY mode -->
+  <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings-->
+  <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassVoice">ئاۋاز</string>
+  <!-- Example: Service was enabled for: Voice, Data -->
   <string name="serviceClassData">سانلىق مەلۇمات</string>
+  <!-- Example: Service was enabled for: Voice, FAX -->
   <string name="serviceClassFAX">فاكس</string>
+  <!-- Example: Service was enabled for: Voice, SMS -->
   <string name="serviceClassSMS">قىسقا ئۇچۇر</string>
+  <!-- Meaning: asynchronous data.  Example: Service was enabled for: Voice, Async -->
   <string name="serviceClassDataAsync">قەدەمداشسىز</string>
+  <!-- Meaning: synchronous data.  Example: Service was enabled for: Voice, Async -->
   <string name="serviceClassDataSync">قەدەمداش</string>
+  <!-- Meaning: packet data.  Example: Service was enabled for: Voice, Packet -->
   <string name="serviceClassPacket">بوغچا</string>
+  <!-- Meaning: unknown.  Example: Service was enabled for: Voice, PAD -->
   <string name="serviceClassPAD">PAD</string>
+  <!-- CDMA Roaming Indicator Strings (non ERI)-->
+  <!-- Default roaming indicator text -->
   <string name="roamingText0">كەزمە كۆرسەتكۈچ ئوچۇق</string>
   <string name="roamingText1">كەزمە كۆرسەتكۈچ تاقاق</string>
   <string name="roamingText2">كەزمە كۆرسەتكۈچ چاقناۋاتىدۇ</string>
@@ -98,260 +189,697 @@
   <string name="roamingText11">كەزمە لەۋھە ئوچۇق</string>
   <string name="roamingText12">كەزمە لەۋھە تاقاق</string>
   <string name="roamingTextSearching">مۇلازىمەت ئىزدەۋاتىدۇ</string>
+  <!-- Displayed when WFC registration fails -->
+  <!-- WFC Operator Error Codes -->
+  <!-- WFC Operator Error Messages showed as alerts -->
+  <!-- WFC Operator Error Messages showed as notifications -->
+  <!-- Template for showing cellular network operator name while WFC is active -->
+  <!-- Template for showing operator name for data connection while WFC is active -->
+  <!-- WFC, summary for Disabled -->
+  <!-- WFC, summary for Wi-Fi Preferred -->
+  <!-- WFC, summary for Cellular Preferred -->
+  <!-- WFC, summary for Wi-Fi Only -->
+  <!--
+        {0} is one of "bearerServiceCode*"
+        {1} is dialing number
+        {2} is time in seconds
+
+        cfTemplateRegistered and cfTemplateRegisteredTime mean that a phone number
+        has been set but forwarding is not on.
+    -->
+  <!-- Displayed when the call forwarding query was not able to be forwarded. -->
   <string name="cfTemplateNotForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
+  <!-- Displayed when the call forwarding query was forwarded. -->
   <string name="cfTemplateForwarded"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>：<xliff:g id="DIALING_NUMBER">{1}</xliff:g></string>
+  <!-- Displayed when the call forwarding query will be forwarded after some time. -->
   <string name="cfTemplateForwardedTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> دىن <xliff:g id="TIME_DELAY">{2}</xliff:g> سېكۇنت كېيىن</string>
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegistered"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
+  <!-- Displayed when the call forwarding query was set but forwarding is not enabled. -->
   <string name="cfTemplateRegisteredTime"><xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>:ئۇلاپ يۆتكىيەلمىدى</string>
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes successfully. -->
   <string name="fcComplete">ئىقتىدار كودى تاماملاندى.</string>
+  <!-- Displayed when a feature code (non-phone number) is dialed and completes unsuccessfully. -->
   <string name="fcError">باغلىنىشتا مەسىلە كۆرۈلدى ياكى ئىقتىدار كودى ئىناۋەتسىز.</string>
+  <!-- android.net.http Error strings -->
+  <!-- Displayed when a web request was successful. -->
   <string name="httpErrorOk">جەزملە</string>
+  <!-- Displayed when a web request failed with a generic network error. -->
   <string name="httpError">تور خاتالىقى كۆرۈلدى.</string>
+  <!-- Displayed when a web request failed because the URL could not be found. -->
   <string name="httpErrorLookup">بۇ تور ئادرېسىنى تاپالمىدى.</string>
+  <!-- Displayed when a web request failed because the site's authentication scheme is not supported by us. -->
   <string name="httpErrorUnsupportedAuthScheme">بۇ تور بېكەتنىڭ سالاھىيەت دەلىللەش لايىھەسىنى قوللىمايدۇ.</string>
+  <!-- Displayed when a web request failed because the authentication failed. -->
   <string name="httpErrorAuth">سالاھىيەت دەلىللىيەلمەيدۇ.</string>
+  <!-- Displayed when a web request failed because the authentication with the proxy failed. -->
   <string name="httpErrorProxyAuth">ۋاكالەتچى مۇلازىمېتىر ئارقىلىق سالاھىيەت دەلىللەش مەغلۇپ بولدى.</string>
+  <!-- Displayed when a web request failed because there was a connection error. -->
   <string name="httpErrorConnect">مۇلازىمېتىرغا باغلىنالمىدى . </string>
+  <!-- Displayed when a web request failed because there was an input or output error. -->
   <string name="httpErrorIO">مۇلازىمىتىر بىلەن ئالاقە قىلالمىدى. سەل تۇرۇپ قايتا سىناڭ.</string>
+  <!-- Displayed when a web request failed because the request timed out -->
   <string name="httpErrorTimeout">مۇلازىمىتىرغا ئۇلىنىش مۆھلىتى ئېشىپ كەتتى.</string>
+  <!-- Displayed when a web request failed because the site tried to redirect us one too many times -->
   <string name="httpErrorRedirectLoop">بۇ بەتتە نۇرغۇنلىغان مۇلازىمېتىر قايتا نىشانلاش بار.</string>
+  <!-- Displayed when a web request failed because the protocol of the server is not supported. -->
   <string name="httpErrorUnsupportedScheme">بۇ كېلىشىمنى قوللىمايدۇ.</string>
+  <!-- Displayed when a web request failed because the a secure connection couldn't be made to the server.-->
   <string name="httpErrorFailedSslHandshake">بىخەتەر باغلىنىش قۇرالمايدۇ.</string>
+  <!-- Displayed when a web request failed because the URL isn't in a valid form. -->
   <string name="httpErrorBadUrl">تور بەتنى ئاچالمايدۇ چۈنكى تور ئادرېس ئىناۋەتسىز.</string>
+  <!-- Displayed when a request failed because we failed to open the file. -->
   <string name="httpErrorFile">بۇ ھۆججەتنى زىيارەت قىلالمايدۇ.</string>
+  <!-- Displayed when a request failed because the file wasn't found. -->
   <string name="httpErrorFileNotFound">ئىلتىماس قىلغان ھۆججەتنى تاپالمىدى.</string>
+  <!-- Displayed when a request failed because there are too many requests right now. -->
   <string name="httpErrorTooManyRequests">بىر تەرەپ قىلىۋاتقان ئىلتىماس بەك كۆپ. سەل تۇرۇپ قايتا سىناڭ.</string>
+  <!-- Account notifications -->
+  <!-- A notification is shown when the AccountManager is unable to
+    supply an auth token without prompting the user to re-enter the
+    password.  This is the text that will scroll through the
+    notification bar (will be seen by the user as he uses another application). -->
   <string name="notification_title"><xliff:g id="ACCOUNT">%1$s</xliff:g> نىڭ تىزىمغا كىرىش خاتالىقى</string>
+  <!-- Sync notifications -->
+  <!-- A notification is shown when there is a sync error.  This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). -->
   <string name="contentServiceSync">قەدەمداش</string>
+  <!-- A notification is shown when there is a sync error.  This is the title of the notification.  It will be seen in the pull-down notification tray. -->
   <string name="contentServiceSyncNotificationTitle">قەدەمداش</string>
+  <!-- A notification is shown when there is a sync error.  This is the message of the notification.  It describes the error, in this case is there were too many deletes. The argument is the type of content, for example Gmail or Calendar. It will be seen in the pull-down notification tray. -->
   <string name="contentServiceTooManyDeletesNotificationDesc">نۇرغۇن <xliff:g id="CONTENT_TYPE">%s</xliff:g> ئۆچۈرۈش.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="tablet">تاختا كومپيۇتېر ساقلىغۇچىسى توشتى. بەزى ھۆججەتلەرنى ئۆچۈرۈپ بوشلۇق بىكارلاڭ.</string>
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
+  <!-- If MMS discovers there isn't much space left on the device, it will show a toast with this message. -->
   <string name="low_memory" product="default">تېلېفون ساقلىغۇچىسى توشتى. بەزى ھۆججەتلەرنى ئۆچۈرۈپ بوشلۇق بىكارلاڭ.</string>
+  <!-- SSL CA cert notification -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.  [CHAR LIMIT=NONE] -->
   <string name="ssl_ca_cert_warning">تور نازارەت قىلىنغان بولۇشى مۇمكىن</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This says that an unknown party is doing the monitoring.
+         [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_by_unknown">يوچۇن ئۈچىنچى تەرەپنىڭ نازارىتىدە</string>
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+        i.e. "Network may be monitored". This indicates that an unspecified administrator is doing
+        the monitoring. [CHAR LIMIT=100]-->
+  <!-- Content text for a notification. The Title of the notification is "ssl_ca_cert_warning",
+         i.e. "Network may be monitored". This indicates who is doing the monitoring.
+         [CHAR LIMIT=100]-->
   <string name="ssl_ca_cert_noti_managed"><xliff:g id="MANAGING_DOMAIN">%s</xliff:g> نازارىتىدە</string>
+  <!-- Work profile deleted notification-->
+  <!-- Shows up in the notification's title when the system deletes the work profile. [CHAR LIMIT=NONE] -->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This says that the profile is deleted by the system as a result of
+         the current profile owner gone missing. [CHAR LIMIT=100]-->
+  <!-- Content text for an expanded notification. The Title of the notification is "work_profile_deleted",
+         i.e. "Work profile deleted". This further explains that the profile is deleted by the system
+         as a result of the current profile admin gone missing. [CHAR LIMIT=NONE]-->
+  <!-- Content text for a notification. The Title of the notification is "work_profile_deleted",
+        This indicates that a work profile has been deleted. [CHAR LIMIT=NONE]-->
+  <!-- Factory reset warning dialog strings-->
+  <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Text message in the factory reset warning dialog. This says that the the device admin app
+         is missing or corrupted. As a result the device will be erased. [CHAR LIMIT=NONE]-->
+  <!-- Display name for any time a piece of data refers to the owner of the phone. For example, this could be used in place of the phone's phone number. -->
   <string name="me">مەن</string>
+  <!-- Power Dialog -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="tablet">تاختا كومپيۇتېر تاللانمىلار</string>
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
+  <!-- Title for the Phone Options dialog to lock the screen, turn off the phone etc. -->
   <string name="power_dialog" product="default">تېلېفون تاللانما</string>
+  <!-- Button to turn on silent mode, within the Phone Options dialog -->
   <string name="silent_mode">ئۈنسىز ھالەت</string>
+  <!-- Button to turn on the radio, within the Phone Options dialog -->
   <string name="turn_on_radio">سىمسىز تورنى ئاچ</string>
+  <!-- Button to turn off the radio, within the Phone Options dialog -->
   <string name="turn_off_radio">سىمسىز تورنى تاقا</string>
+  <!-- Button to lock the screen, within the Phone Options dialog -->
   <string name="screen_lock">ئېكران قۇلۇپلا</string>
+  <!-- Button to turn off the phone, within the Phone Options dialog -->
   <string name="power_off">تاقا</string>
+  <!-- Spoken description for ringer silent option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_silent">قوڭغۇراق تاقاق</string>
+  <!-- Spoken description for ringer vibrate option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_vibrate">قوڭغۇراق تىترەت</string>
+  <!-- Spoken description for ringer normal option. [CHAR LIMIT=NONE] -->
   <string name="silent_mode_ring">قوڭغۇراق ئوچۇق</string>
+  <!-- Reboot to Recovery Progress Dialog. This is shown before it reboots to recovery. -->
+  <!-- Reboot to Recovery for factory reset. -->
+  <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. -->
   <string name="shutdown_progress">تاقاۋاتىدۇ…</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="tablet">تاختا كومپيۇتېرىڭىز تاقىلىدۇ.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the TV, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the watch, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="shutdown_confirm" product="default">تېلېفونىڭىز تاقىلىدۇ.</string>
+  <!-- Shutdown Confirmation Dialog.  When the user chooses to power off the phone, it asks
+         the user if they'd like to shut down.  This is the message.  This is used instead of
+         shutdown_confirm when the system is configured to use long press to go directly to the
+         power off dialog instead of the global actions menu. -->
   <string name="shutdown_confirm_question">تاقامسىز؟</string>
+  <!-- Title of dialog to confirm rebooting into safe mode. [CHAR LIMIT=50] -->
   <string name="reboot_safemode_title">قايتا قوزغىتىپ بىخەتەر ھالەتكە كىرىدۇ</string>
+  <!-- Shutdown Confirmation Dialog.  Message in the confirmation dialog
+         when the user asks to reboot into safe mode. [CHAR LIMIT=NONE] -->
   <string name="reboot_safemode_confirm">قايتا قوزغىتىپ بىخەتەر ھالەتكە كىرەمسىز؟  بۇنداق بولغاندا سىز ئورناتقان ئۈچىنچى تەرەپ ئەپلەر توختىتىلىدۇ. قايتا قوزغاتسىڭىز ئاندىن بۇ ئەپلەر ئەسلىگە كېلىدۇ.</string>
+  <!-- Recent Tasks dialog: title
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
   <string name="recent_tasks_title">يېقىنقى</string>
+  <!-- Recent Tasks dialog: message when there are no recent applications
+     TODO: this should move to SystemUI.apk, but the code for the old
+            recent dialog is still in the framework
+     -->
   <string name="no_recent_tasks">يېقىنقى ئەپلەر يوق</string>
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="tablet">تاختا كومپيۇتېر تاللانمىلار</string>
+  <!-- Title of the Global Actions Dialog -->
+  <!-- Title of the Global Actions Dialog -->
   <string name="global_actions" product="default">تېلېفون تاللانما</string>
+  <!-- label for item that locks the phone in the phone options dialog -->
   <string name="global_action_lock">ئېكران قۇلۇپلا</string>
+  <!-- label for item that turns off power in phone options dialog -->
   <string name="global_action_power_off">تاقا</string>
+  <!-- label for item that generates a bug report in the phone options dialog -->
   <string name="global_action_bug_report">خاتالىق دوكلاتى</string>
+  <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
   <string name="bugreport_title">خاتالىق دوكلاتى يوللاش</string>
+  <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
   <string name="bugreport_message">نۆۋەتتىكى ئۈسكۈنىڭىزنىڭ ھالىتىگە ئائىت ئۇچۇرلارنى توپلاپ، تورخەت ئۇچۇرى يوللايدۇ. يوللاشقا لازىملىق خاتالىق دوكلاتىنى قوزغىتىپ تەييارلاشقا بىر ئاز ۋاقىت كېتىشى مۇمكىن. سەۋرىچانلىق بىلەن كۈتۈڭ.</string>
+  <!-- Format for build summary info [CHAR LIMIT=NONE] -->
+  <!-- label for item that enables silent mode in phone options dialog -->
   <string name="global_action_toggle_silent_mode">ئۈنسىز ھالەت</string>
+  <!-- status message in phone options dialog for when silent mode is enabled -->
   <string name="global_action_silent_mode_on_status">ئاۋاز تاقاق</string>
+  <!-- status message in phone options dialog for when silent mode is disabled -->
   <string name="global_action_silent_mode_off_status">ئاۋاز ئوچۇق</string>
+  <!-- label for item that toggles airplane mode -->
   <string name="global_actions_toggle_airplane_mode">ئايروپىلان ھالىتى</string>
+  <!-- status message in phone options dialog for when airplane mode is on -->
   <string name="global_actions_airplane_mode_on_status">ئايروپىلان ھالىتى ئوچۇق</string>
+  <!-- status message in phone options dialog for when airplane mode is off -->
   <string name="global_actions_airplane_mode_off_status">ئايروپىلان ھالىتى تاقاق</string>
+  <!-- label for item that launches settings in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that launches voice assist in phone options dialog [CHAR LIMIT=15]-->
+  <!-- label for item that locks the phone and enforces that it can't be unlocked without entering a credential. [CHAR LIMIT=15] -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated. May need to be localized
+         for most appropriate textual indicator of "more than X".
+         [CHAR LIMIT=4] -->
   <string name="status_bar_notification_info_overflow">999+</string>
+  <!-- Displayed to the user to tell them that they have started up the phone in "safe mode" -->
   <string name="safeMode">بىخەتەر ھالەت</string>
+  <!-- Label for the Android system components when they are shown to the user. -->
   <string name="android_system_label">Android سىستېما</string>
+  <!-- Label for the user owner in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Label for a corporate profile in the intent forwarding app. [CHAR LIMIT=15] -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_calendar">يىلنامە</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_sms">قىسقا ئۇچۇر</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_storage">ساقلىغۇچ</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissioncds, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_microphone">مىكروفون</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_microphone">ئاۋاز ئېلىش</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_camera">كامېرا</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_phone">تېلېفون</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title for the capability of an accessibility service to retrieve window content. -->
   <string name="capability_title_canRetrieveWindowContent">كۆزنەك مەزمۇنىنى ئىزدەيدۇ</string>
+  <!-- Description for the capability of an accessibility service to retrieve window content. -->
   <string name="capability_desc_canRetrieveWindowContent">سىز ئۆزئارا تەسىرلىشىۋاتقان كۆزنەكنىڭ مەزمۇنىنى تەكشۈرىدۇ.</string>
+  <!-- Title for the capability of an accessibility service to request touch exploration. -->
   <string name="capability_title_canRequestTouchExploration">چېكىلگەندىكى كۆرگۈنى قوزغىتىدۇ</string>
+  <!-- Description for the capability of an accessibility service to request touch exploration. -->
   <string name="capability_desc_canRequestTouchExploration">ئۈسكۈنە ئىشلەتكۈچى چەككەندىكى مەزمۇننى ئۈنلۈك ئوقۇيالايدۇ، ئىشلەتكۈچى قول ئىشارىتى ئارقىلىق ئېكرانغا كۆز يۈگۈرتەلەيدۇ.</string>
+  <!-- Title for the capability of an accessibility service to request enhanced web accessibility. -->
   <string name="capability_title_canRequestEnhancedWebAccessibility">تور بەت قوشۇمچە كۈچەيتىلگەن ئىقتىدارنى ئاچ</string>
+  <!-- Description for the capability of an accessibility service to request enhanced web accessibility. -->
   <string name="capability_desc_canRequestEnhancedWebAccessibility">ئەپ مەزمۇنىنى زىيارەت قىلىشقا قولايلىق بولۇشى ئۈچۈن قوليازما ئورنىتىدۇ.</string>
+  <!-- Title for the capability of an accessibility service to request to filter key events. -->
   <string name="capability_title_canRequestFilterKeyEvents">كىرگۈزگەن تېكىستىڭىزنى كۆزىتىدۇ</string>
+  <!-- Description for the capability of an accessibility service to request to filter key events. -->
   <string name="capability_desc_canRequestFilterKeyEvents">ئىناۋەتلىك كارتا نومۇرى ۋە ئىمغا ئوخشاش شەخسىي ئۇچۇرلارنىمۇ ئۆز ئىچىگە ئالىدۇ.</string>
+  <!--  Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_statusBar">ھالەت بالداقنى چەكلەش ياكى ئۆزگەرتىش.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_statusBar">ئەپنىڭ ھالەت بالداقنى چەكلىشىگە ياكى سىستېما سىنبەلگىسىنى قوشۇش ۋە ئۆچۈرۈشىگە يول قويىدۇ.</string>
-  <string name="permlab_statusBarService">ھالەت بالداق</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_statusBarService">ئەپنىڭ ھالەت بالداقتا تۇرۇشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_expandStatusBar">ھالەت بالداقنى يايىدۇ/قاتلايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_expandStatusBar">ئەپنىڭ ھالەت بالداقنى يېيىش ياكى قاتلىشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permlab_install_shortcut">قىسقا يول ئورنىتىش</string>
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permdesc_install_shortcut">ئەپنىڭ ئىشلەتكۈچى ئارىلاشمىغان ئەھۋالدا قىسقا يول قۇرۇشقا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can uninstall application shortcuts
+    in their Launcher -->
   <string name="permlab_uninstall_shortcut">قىسقا يول ئۆچۈر</string>
+  <!-- Description of an application permission, listed so the user can install application shortcuts
+    in their Launcher -->
   <string name="permdesc_uninstall_shortcut">ئەپنىڭ ئىشلەتكۈچى ئارىلاشمىغان ئەھۋالدا قىسقا يولنى ئۆچۈرۈشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_processOutgoingCalls">سىرتقا نومۇر بۇراشنى قايتا تەڭشەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_processOutgoingCalls">ئەپنىڭ ئۇرۇلغان تېلېفۇننى بىر تەرەپ قىلىش ۋە نۇمۇرنى ئۆزگەرتىپ ئۇرۇشىغا يول قويىدۇ. بۇ ھوقۇق ئەپنىڭ ئۇرۇلغان تېلېفۇننى كۆزىتىشى، قايتا ئۇرۇشى ھەتتا چەكلەپ قۇيۇشىغا يول قويۇشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveSms">قىسقا ئۇچۇر (SMS) قوبۇللايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveSms">ئەپنىڭ ئۇچۇر قۇبۇل قىلىشى ۋە بىر تەرەپ قىلىشىغا يول قويىدۇ. بۇ ئىقتىداردا ئەپلەر ئۇچۇرلىرىڭىزنى نازارەت قىلىشى ياكى سىزگە كۆرسەتمەي ئۆچۈرۈۋېتىشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveMms">قىسقا ئۇچۇر (MMS) قوبۇللايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveMms">ئەپنىڭ كۆپ ۋاستە ئۇچۇر (MMS) قۇبۇل قىلىشى ۋە بىر تەرەپ قىلىشىغا يول قويىدۇ. بۇ ئىقتىداردا ئەپلەر ئۇچۇرلىرىڭىزنى نازارەت قىلىشى ياكى سىزگە كۆرسەتمەي ئۆچۈرۈۋېتىشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCellBroadcasts">ئىجتىمائى رايون تارقاتقان ئۇچۇرلارنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_subscribedFeedsRead">مۇشتەرى بولغان خەۋەر بېتىنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_subscribedFeedsRead">ئەپنىڭ نۆۋەتتە قەدەمداشلانغان خەۋەر بېتىگە مۇناسىۋەتلىك تەپسىلىي ئۇچۇرىنى ئوقۇشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sendSms">ئەپنىڭ  ئۇچۇر يوللىشىغا يول قويىدۇ. زەھەرخەندە ئەپلەر رۇخسىتىڭىزسىز ئۇچۇر يوللاپ، سىزنى چىقىم قىلدۇرىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSms">تېكىست ئۇچۇرىڭىزنى ئوقۇيدۇ (قىسقا ئۇچۇر ياكى كۆپ ۋاستە ئۇچۇر)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="tablet">ئەپنىڭ  تاختا كومپيۇتېر ياكى SIM كارتىدىكى ئۇچۇرلارنى ئۇقۇشىغا يول قويىدۇ. بۇ ھوقۇق ئارقىلىق ئەپ بارلىق قىسقا ئۇچۇرلارنى ئوقۇۋالالايدۇ، قىسقا ئۇچۇر مەزمۇنى ياكى مەخپىيەتلىكنى ئويلاشمايدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSms" product="default">ئەپنىڭ  تېلېفون ياكى SIM كارتىدىكى ئۇچۇرلارنى ئۇقۇشىغا يول قويىدۇ. بۇ ھوقۇق ئارقىلىق ئەپ بارلىق قىسقا ئۇچۇرلارنى ئوقۇۋالالايدۇ، قىسقا ئۇچۇر مەزمۇنى ياكى مەخپىيەتلىكنى ئويلاشمايدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveWapPush">تېكىست ئۇچۇر قوبۇللايدۇ (WAP)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveWapPush">ئەپنىڭ WAP ئۇچۇر قۇبۇل قىلىشى ۋە بىر تەرەپ قىلىشىغا يول قويىدۇ. بۇ ئىقتىداردا ئەپلەر ئۇچۇرلىرىڭىزنى نازارەت قىلىشى ياكى سىزگە كۆرسەتمەي ئۆچۈرۈۋېتىشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getTasks">ئىجرا قىلىنىۋاتقان ئەپلەرنى ئىزدەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getTasks">ئەپنىڭ نۆۋەتتىكى ۋە يىقىنقى ئىجرا قىلىنغان ۋەزىپە ئۇچۇرلىرىنى ئىزدىشىگە يول قويىدۇ. بۇ ھوقۇق ئارقىلىق ئەپ بۇ ئۈسكۈنىدە قانداق ئەپلەرنىڭ ئىشلىتىلگەنلىكى ھەققىدىكى ئۇچۇرلارنى بىلەلەيدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to set the profile/device owners.
+     [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_reorderTasks">ئىجرا قىلىنىۋاتقان پىروگراممىلارنى قايتا تەرتىپلەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_reorderTasks">ئەپنىڭ ۋەزىپىنى ئالدى سۇپا ياكى ئارقا سۇپىغا يۆتكىشىگە يول قويىدۇ. بۇ ئەپ سىزدىن بىسوراق مەشغۇلاتنى ئۆز ئالدىغا ئىجرا قىلىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_enableCarMode">ماشىنىدا يۈرۈش ھالىتىنى قوزغىتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_enableCarMode">ئەپنىڭ ماشىنىدا يۈرۈش ھالىتىنى قوزغىتىشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_killBackgroundProcesses">باشقا ئەپلەرنى تاقايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_killBackgroundProcesses">ئەپنىڭ ئارقا سۇپىدا ئىجرا قىلىنىۋاتقان باشقا ئەپلەرنى ئاخىرلاشتۇرۇشىغا يول قويىدۇ. بۇ ھوقۇق باشقا ئەپلەرنىڭ ئىجرا قىلىنىشىنى توختىتىشنى كەلتۈرۈپ چىقىرىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_systemAlertWindow">باشقا ئەپلەرنىڭ ئۈستىدە كۆرسىتىدىغان مەزمۇن</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_systemAlertWindow">بۇ ئەپنىڭ باشقا ئەپنىڭ ئۈستىدە ياكى ئىشلەتكۈچى ئارايۈزىنىڭ مۇئەييەن بۆلىكىگە سىزىشىغا يول قويىدۇ. بۇنداق بولغاندا بارلىق ئەپلەرنىڭ ئارايۈزىگە كاشىلا قىلىشى ياكى سىز باشقا ئەپلەردە كۆرگەن مەزمۇن ئۆزگىرىپ كېتىشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_persistentActivity">ئەپنى ھەمىشە ئىجرا قىلدۇرىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_persistentActivity" product="tablet">ئەپنىڭ مەلۇم بۆلىكىنىڭ ئەسلەكتە داۋاملىق ئىجرا قىلىنىشىغا يول قويىدۇ. بۇنداق بولغاندا باشقا ئەپلەر ئىشلىتىدىغان ئەسلەكنى چەكلەپ، تاختا كومپيۇتېرنىڭ ئىجرا قىلىش سۈرئىتىنى ئاستىلىتىۋېتىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_persistentActivity" product="default">ئەپنىڭ مەلۇم بۆلىكىنىڭ ئەسلەكتە داۋاملىق ئىجرا قىلىنىشىغا يول قويىدۇ. بۇنداق بولغاندا باشقا ئەپلەر ئىشلىتىدىغان ئەسلەكنى چەكلەپ، تېلېفوننىڭ ئىجرا قىلىش سۈرئىتىنى ئاستىلىتىۋېتىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getPackageSize">ئەپنىڭ ساقلاش بوشلۇقىنى ھىسابلايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getPackageSize">ئەپنىڭ ئۆزىنىڭ كودى، سانلىق مەلۇماتى ۋە غەملەك بوشلۇقىنى ئىزدىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeSettings">سىستېما تەڭشەكلىرىنى ئۆزگەرتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeSettings">ئەپنىڭ سىستېما تەڭشەك سانلىق مەلۇماتىنى ئۆزگەرتىشىگە يول قويىدۇ. زەھەرخەندە ئەپلەر بۇ ئارقىلىق سىستىما سەپلىمىڭىزنى بۇزىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveBootCompleted">قوزغالغاندا ئىجرا قىلىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="tablet">ئەپنىڭ سىستېما قوزغىتىلغاندا ئاپتۇماتىك قوزغىلىشىغا يول قويىدۇ. بۇنداق بولغاندا تاختا كومپيۇتېر قوزغىلىش ۋاقتى ئۇزىراپ كېتىدۇ، ئەپ ئوچۇق تۇرغاندا تاختا كومپيۇتېر سۈرئىتىگىمۇ تەسىر يىتىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveBootCompleted" product="default">ئەپنىڭ سىستېما قوزغىتىلغاندا ئاپتۇماتىك قوزغىلىشىغا يول قويىدۇ. بۇنداق بولغاندا تېلېفون قوزغىلىش ۋاقتى ئۇزىراپ كېتىدۇ، ئەپ ئوچۇق تۇرغاندا تېلېفون سۈرئىتىگىمۇ تەسىر يىتىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_broadcastSticky">مۇقىم ئاڭلىتىشنى يوللايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="tablet">ئەپنىڭ ئاڭلىتىش تۈگىگەندىن كېيىنمۇ ساقلىنىپ قالىدىغان مۇقىم ئاڭلىتىشنى يوللىشىغا يول قويىدۇ. بۇ ئىقتىدارنى كۆپ ئىشلەتكەندە ئەسلەكنى كۆپ ئىگىلىۋېلىپ تاختا كومپيۇتېر سۈرئىتىنى ئاستىلىتىۋېتىدۇ ياكى مۇقىملىقىنى تۆۋەنلىۋېتىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_broadcastSticky" product="default">ئەپنىڭ ئاڭلىتىش تۈگىگەندىن كېيىنمۇ ساقلىنىپ قالىدىغان مۇقىم ئاڭلىتىشنى يوللىشىغا يول قويىدۇ. بۇ ئىقتىدارنى كۆپ ئىشلەتكەندە ئەسلەكنى كۆپ ئىگىلىۋېلىپ تېلېفون سۈرئىتىنى ئاستىلىتىۋېتىدۇ ياكى مۇقىملىقىنى تۆۋەنلىۋېتىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readContacts">ئالاقەداشلىرىڭىزنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="tablet">ئەپنىڭ تاختا كومپيۇتېردا ساقلانغان ئالاقەداشلىرىڭىزنىڭ مۇناسىۋەتلىك ئۇچۇرلىرىنى ئوقۇشىغا يول قويىدۇ، تېلېفون، تورخەت ياكى باشقا ئۇسۇلدا مەلۇم كىشى بىلەن ئالاقە قىلىش چاستوتىڭىزنىمۇ ئۆز ئىچىگە ئالىدۇ. بۇ ھوقۇق ئارقىلىق ئەپلەر ئالاقەداشلىرىڭىزنىڭ سانلىق مەلۇماتىنى ساقلىيالايدۇ، زەھەرخەندە ئەپلەر سىز بىخەۋەر ھالدا ئالاقەداش سانلىق مەلۇماتلىرىڭىزنى ھەمبەھىر قىلىۋېتىشى مۇمكىن.\"</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readContacts" product="default">ئەپنىڭ تېلېفوندا ساقلانغان ئالاقەداشلىرىڭىزنىڭ مۇناسىۋەتلىك ئۇچۇرلىرىنى ئوقۇشىغا يول قويىدۇ، تېلېفون، تورخەت ياكى باشقا ئۇسۇلدا مەلۇم كىشى بىلەن ئالاقە قىلىش چاستوتىڭىزنىمۇ ئۆز ئىچىگە ئالىدۇ. بۇ ھوقۇق ئارقىلىق ئەپلەر ئالاقەداشلىرىڭىزنىڭ سانلىق مەلۇماتىنى ساقلىيالايدۇ، زەھەرخەندە ئەپلەر سىز بىخەۋەر ھالدا ئالاقەداش سانلىق مەلۇماتلىرىڭىزنى ھەمبەھىر قىلىۋېتىشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeContacts">ئالاقەداشلىرىڭىزنى تەھرىرلەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="tablet">ئەپنىڭ تاختا كومپيۇتېردا ساقلانغان ئالاقەداشلىرىڭىزنىڭ مۇناسىۋەتلىك ئۇچۇرلىرىنى ئۆزگەرتىشىگە يول قويىدۇ، تېلېفون، تورخەت ياكى باشقا ئۇسۇلدا مەلۇم كىشى بىلەن ئالاقە قىلىش چاستوتىڭىزنىمۇ ئۆز ئىچىگە ئالىدۇ. بۇ ھوقۇق ئارقىلىق ئەپلەر ئالاقەداشلىرىڭىزنىڭ سانلىق مەلۇماتىنى ئۆچۈرۈۋېتەلەيدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeContacts" product="default">ئەپنىڭ تېلېفوندا ساقلانغان ئالاقەداشلىرىڭىزنىڭ مۇناسىۋەتلىك ئۇچۇرلىرىنى ئۆزگەرتىشىگە يول قويىدۇ، تېلېفون، تورخەت ياكى باشقا ئۇسۇلدا مەلۇم كىشى بىلەن ئالاقە قىلىش چاستوتىڭىزنىمۇ ئۆز ئىچىگە ئالىدۇ. بۇ ھوقۇق ئارقىلىق ئەپلەر ئالاقەداشلىرىڭىزنىڭ سانلىق مەلۇماتىنى ئۆچۈرۈۋېتەلەيدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCallLog">چاقىرىش خاتىرىسىنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="tablet">ئەپنىڭ تاختا كومپيۇتېردا ساقلانغان چاقىرىش خاتىرىسىنى ئوقۇشىغا يول قويىدۇ، چاقىرغان ۋە چاقىرىلغان تېلېفون ئۇچۇرلىرىنىمۇ ئۆز ئىچىگە ئالىدۇ. بۇ ھوقۇق ئارقىلىق ئەپلەر چاقىرىش خاتىرىسى سانلىق مەلۇماتىنى ساقلىيالايدۇ، زەھەرخەندە ئەپلەر سىز بىخەۋەر ھالدا چاقىرىش خاتىرە سانلىق مەلۇماتلىرىڭىزنى ھەمبەھىر قىلىۋېتىشى مۇمكىن.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCallLog" product="default">ئەپنىڭ تېلېفوندا ساقلانغان چاقىرىش خاتىرىسىنى ئوقۇشىغا يول قويىدۇ، چاقىرغان ۋە چاقىرىلغان تېلېفون ئۇچۇرلىرىنىمۇ ئۆز ئىچىگە ئالىدۇ. بۇ ھوقۇق ئارقىلىق ئەپلەر چاقىرىش خاتىرىسى سانلىق مەلۇماتىنى ساقلىيالايدۇ، زەھەرخەندە ئەپلەر سىز بىخەۋەر ھالدا چاقىرىش خاتىرە سانلىق مەلۇماتلىرىڭىزنى ھەمبەھىر قىلىۋېتىشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeCallLog">چاقىرىش خاتىرىسىنى يازىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="tablet">ئەپنىڭ تاختا كومپيۇتېردا ساقلانغان چاقىرىش خاتىرىسىنى ئۆزگەرتىشىگە يول قويىدۇ، چاقىرغان ۋە چاقىرىلغان تېلېفون ئۇچۇرلىرىنىمۇ ئۆز ئىچىگە ئالىدۇ. زەھەرخەندە ئەپلەر سىز بىخەۋەر ھالدا چاقىرىش خاتىرە سانلىق مەلۇماتلىرىڭىزنى ئۆزگەرتىۋېتىشى مۇمكىن.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeCallLog" product="default">ئەپنىڭ تېلېفوندا ساقلانغان چاقىرىش خاتىرىسىنى ئۆزگەرتىشىگە يول قويىدۇ، چاقىرغان ۋە چاقىرىلغان تېلېفون ئۇچۇرلىرىنىمۇ ئۆز ئىچىگە ئالىدۇ. زەھەرخەندە ئەپلەر سىز بىخەۋەر ھالدا چاقىرىش خاتىرە سانلىق مەلۇماتلىرىڭىزنى ئۆزگەرتىۋېتىشى مۇمكىن.</string>
+  <!-- Title of the body sensors permission, listed so the user can decide whether to allow the application to access body sensor data. [CHAR LIMIT=30] -->
+  <!-- Description of the body sensors permission, listed so the user can decide whether to allow the application to access data from body sensors. [CHAR LIMIT=NONE] -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readCalendar">يىلنامەدىكى پائالىيەت ۋە مەخپىي ئۇچۇرلارنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="tablet">ئەپنىڭ  تاختا كومپيۇتېردا ساقلانغان يىلنامەدىكى پائالىيەت ئۇچۇرلىرىنى ئۇقۇشىغا يول قويىدۇ، دوست ياكى ئىشداشلىرىڭىزنىڭ پائالىيەتلىرىنىمۇ ئۆز ئىچىگە ئالىدۇ. بۇ ھوقۇق ئارقىلىق ئەپ يىنامە سانلىق مەلۇماتلىرىڭىزنى ھەمبەھىرلەپ ياكى ساقلىيالايدۇ، بۇ ئۇچۇرلار مەزمۇنى ياكى مەخپىيەتلىكنى ئويلاشمايدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readCalendar" product="default">ئەپنىڭ  تېلېفوندا ساقلانغان يىلنامەدىكى پائالىيەت ئۇچۇرلىرىنى ئۇقۇشىغا يول قويىدۇ، دوست ياكى ئىشداشلىرىڭىزنىڭ پائالىيەتلىرىنىمۇ ئۆز ئىچىگە ئالىدۇ. بۇ ھوقۇق ئارقىلىق ئەپ يىنامە سانلىق مەلۇماتلىرىڭىزنى ھەمبەھىرلەپ ياكى ساقلىيالايدۇ، بۇ ئۇچۇرلار مەزمۇنى ياكى مەخپىيەتلىكنى ئويلاشمايدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeCalendar">يىلنامەدىكى پائالىيەتلىرىڭىزنى قوشۇپ ئۆزگەرتىدۇ ھەمدە ئىگىسى خەۋەرسىز ئەھۋالدا قارشى تەرەپنىڭ تورخەت يوللىشىنى ئىلتىماس قىلىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessLocationExtraCommands">زىيادە ئورۇن ئۇچۇرىغا ئېرىشىش پىروگرامما بۇيرۇق زىيارىتى</string>
-  <string name="permlab_accessFineLocation">دەل ئورنى (GPS ۋە تور ئاساسىدا)</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessFineLocation">ئەپنىڭ يەرشارى ئورۇن بەلگىلەش سىستېمىسى (GPS) ياكى تارقىتىش مۇنارى ۋە Wi-Fi غا ئوخشاش تور ئورنى ئۇچۇر مەنبەسى ئارقىلىق دەل ئورنىڭىزنىڭ ئۇچۇرىغا ئېرىشىشىگە يول قويىدۇ. ئۈسكۈنىدە ئورۇن مۇلازىمىتىنى قوزغاتسىڭىز ئاندىن ئەپ سىزنىڭ ئورۇن ئۇچۇرىڭىزغا ئېرىشەلەيدۇ. ئەپ بۇ خىل مۇلازىمەت ئارقىلىق دەل ئورنىڭىزنى جەزملەيدۇ، بۇنداق بولغاندا ئەپ تېخىمۇ كۆپ توك سەرپ قىلىشى مۇمكىن.</string>
-  <string name="permlab_accessCoarseLocation">تەخمىنىي ئورنى(تور ئاساسىدا) </string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessCoarseLocation">ئەپنىڭ تارقىتىش مۇنارى ۋە Wi-Fi غا ئوخشاش تور ئورنى ئۇچۇر مەنبەسى ئارقىلىق تەخمىنىي ئورنىڭىزنىڭ ئۇچۇرىغا ئېرىشىشىگە يول قويىدۇ. ئۈسكۈنىدە ئورۇن مۇلازىمىتىنى قوزغاتسىڭىز ئاندىن ئەپ سىزنىڭ ئورۇن ئۇچۇرىڭىزغا ئېرىشەلەيدۇ. ئەپ بۇ خىل مۇلازىمەت ئارقىلىق تەخمىنىي ئورنىڭىزنى جەزملەيدۇ، بۇنداق بولغاندا ئەپ تېخىمۇ كۆپ توك سەرپ قىلىشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyAudioSettings">ئاۋاز تەڭشىكىنى ئۆزگەرتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyAudioSettings">ئەپنىڭ سىستېمىنىڭ ئاۋاز كۈچى، ئاۋاز چىقىرىدىغان ياڭراتقۇ قاتارلىق بارلىق ئومۇمىيەت ئاۋاز تەڭشىكىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_recordAudio">ئاۋاز ئېلىش</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_recordAudio">ئەپنىڭ مىكروفون ئارقىلىق ئاۋاز ئېلىشىغا يول قويىدۇ. بۇ ھوقۇق ئارقىلىق ئەپ سىز جەزملىمەي تۇرۇپلا خالىغان ۋاقىتتا ئاۋاز ئالالايدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_camera">رەسىم تارتىپ ۋە سىنغا ئالىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_camera">ئەپنىڭ كامېرا ئارقىلىق رەسىم تارتىشى ۋە سىنغا ئېلىشىغا يول قويىدۇ. بۇ ھوقۇق ئارقىلىق ئەپ سىز جەزملىمەي تۇرۇپلا خالىغان ۋاقىتتا كامېرانى ئىشلىتەلەيدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_vibrate">تىترەتكۈچ تىزگىنى</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_vibrate">ئەپنىڭ تىترەتكۈچنى باشقۇرۇشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_flashlight">چاقماق چىراغ باشقۇرۇش</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_flashlight">ئەپنىڭ چاقماق چىراغ باشقۇرۇشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_callPhone">تېلېفون نۇمۇرىنى بىۋاستە بۇرايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_callPhone">ئەپنىڭ سىزنىڭ ۋاسىتىڭىزسىز تېلېفون ئۇرۇشىغا يول قويىدۇ. بۇ ھوقۇق ئارقىلىق ئەپ تېلېفون ئۇرۇشى ياكى تېلېفون ھەققىڭىزنى ئاشۇرۇۋېتىشى مۇمكىن. دىققەت: بۇ ھوقۇق پىروگراممىنىڭ جىددى قۇتقۇزۇش تېلېفۇنى ئۇرۇشىغا رۇخسەت قىلمايدۇ. زەھەرخەندە ئەپلەر سىز جەزملىمەي تۇرۇپمۇ تېلېفون ئۇرۇش ئارقىلىق مۇناسىپ ھەق كەلتۈرۈپ چىقىرىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneState">تېلېفوننىڭ ھالىتى ۋە سالاھىيىتىنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneState">ئەپنىڭ ئۈسكۈنىنىڭ تېلېفون ئىقتىدارىنى زىيارەت قىلىشىغا يول قويىدۇ. ئەپ تېلېفوننىڭ نۇمۇرىنى، رەت نۇمۇرىنى، تېلېفوننىڭ سۆزلىشىشۋاتقانلىقىنى، قارشى تەرەپنىڭ نۇمۇرىنى جەزملەش ھوقۇقى بولىدۇ. </string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="tablet">تاختا كومپيۇتېرنى ئۇيقۇ ھالىتىدىن چەكلەيدۇ</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_wakeLock" product="default">تېلېفوننى ئۇيقۇ ھالىتىدىن چەكلەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="tablet">ئەپنىڭ تاختا كومپيۇتېرنىڭ ئۇيقۇ ھالىتىگە كىرىشىنى چەكلىشىگە يول قويىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_wakeLock" product="default">ئەپنىڭ تېلېفوننىڭ ئۇيقۇ ھالىتىگە كىرىشىنى چەكلىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_transmitIr">ئىنفرا قىزىل نۇر تارقىتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="tablet">ئەپنىڭ تاختا كومپيۇتېرنىڭ ئىنفرا قىزىل نۇرلۇق تارقاتقۇچىسىنى ئىشلىتىشىگە يول قويىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_transmitIr" product="default">ئەپنىڭ تېلېفوننىڭ ئىنفرا قىزىل نۇرلۇق تارقاتقۇچىسىنى ئىشلىتىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setWallpaper">تام قەغەز تەڭشىكى</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setWallpaper">ئەپنىڭ سىستېما تام قەغەزنى تەڭشىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setWallpaperHints">تام قەغەز چوڭلۇقىنى تەڭشەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setWallpaperHints">ئەپنىڭ تام قەغەزنىڭ چوڭ-كىچىكلىكىنىڭ ئەسكەرتىشىنى تەڭشىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_setTimeZone">ۋاقىت رايون تەڭشىكى</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="tablet">ئەپنىڭ تاختا كومپيۇتېر ۋاقىت رايونىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setTimeZone" product="default">ئەپنىڭ تېلېفون ۋاقىت رايونىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_getAccounts">ئۈسكۈنىدىكى ھېساباتنى ئىزدەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="tablet">ئەپنىڭ تاختا كومپيۇتېردا ئەسلى بار بولغان مەلۇملۇق ھىسابات تىزىمىغا ئېرىشىشىگە يول قويىدۇ. ئۇنىڭدا ئورنىتىلغان ئەپلەر قۇرغان بارلىق ھېساباتلار بولۇشى مۇمكىن.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_getAccounts" product="default">ئەپنىڭ تېلېفوندا ئەسلى بار بولغان مەلۇملۇق ھىسابات تىزىمىغا ئېرىشىشىگە يول قويىدۇ. ئۇنىڭدا ئورنىتىلغان ئەپلەر قۇرغان بارلىق ھېساباتلار بولۇشى مۇمكىن.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNetworkState">تور باغلىنىشىنى كۆرسىتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNetworkState">ئەپنىڭ مەۋجۇت ۋە باغلانغان تورغا ئوخشاش تورغا ئائىت ئۇچۇرلىرىنى كۆرۈشىگە يول قويىدۇ. </string>
-  <string name="permlab_createNetworkSockets">تورنى تولۇق زىيارەت ھوقۇقى</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_createNetworkSockets">ئەپنىڭ تور socket قۇرۇپ،  ئۆزلەشتۈرگەن تور كېلىشىمى ئىشلىتىشىگە يول قويىدۇ. توركۆرگۈ ۋە باشقا بەزى ئەپلەرگە ئىنتېرنېتقا سانلىق مەلۇمات يوللاش يولى بىلەن تەمىنلەيدۇ شۇڭلاشقا ئەپ بۇ ھوقۇققا ئېرىشمەي تۇتۇپمۇ ئىنتېرنېتقا سانلىق مەلۇمات يوللىيالايدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeNetworkState">تور باغلىنىشچانلىقىنى ئۆزگەرتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeNetworkState">ئەپنىڭ تور باغلىنىش ھالىتىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeTetherState">باغلاقنىڭ ئۇلىنىشىنى ئۆزگەرتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the applicaiton to do this. -->
   <string name="permdesc_changeTetherState">ئەپنىڭ تور باغلىنىش ھالىتىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessWifiState">بۇ Wi-Fi باغلىنىشلىرىنى كۆرسىتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessWifiState">ئەپنىڭ Wi-FI ئۈسكۈنە ئاتى ۋە Wi-FI قوزغالغان ياكى قوزغالمىغانلىقىغا ئوخشاش Wi-FI تورىغا ئائىت ئۇچۇرلىرىنى كۆرۈشىگە يول قويىدۇ. </string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeWifiState">بۇ WiFi غا باغلاپ ۋە ئۈزىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiState">ئەپنىڭ Wi-Fi ئېغىزىنى ئۇلاش ياكى ئۈزۈش ھەمدە Wi-Fi تورىنىڭ ئۈسكۈنە سەپلىمىسىنى ئۆزگەرتىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changeWifiMulticastState">Wi-Fi كۆپ قاناللىق ئاڭلىتىشقا يول قويىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiMulticastState" product="tablet">ئەپنىڭ كۆپ قاناللىق ئاڭلىتىش ئارقىلىق Wi-FI تورىدىكى تاختا كومپيۇتېرىڭىزلا ئەمەس بەلكى ھەممە ئۈسكۈنىلەرنىڭ سانلىق مەلۇمات بوغچىسىنى قوبۇللاپ ۋە يوللاشقا يول قويىدۇ. بۇ مەشغۇلاتنىڭ توك سەرپىياتى كۆپ قاناللىق بولمىغان ئاڭلىتىشنىڭكىدىن يۇقىرى.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changeWifiMulticastState" product="default">ئەپنىڭ كۆپ قاناللىق ئاڭلىتىش ئارقىلىق Wi-FI تورىدىكى تېلېفونىڭىزلا ئەمەس بەلكى ھەممە ئۈسكۈنىلەرنىڭ سانلىق مەلۇمات بوغچىسىنى قوبۇللاپ ۋە يوللاشقا يول قويىدۇ. بۇ مەشغۇلاتنىڭ توك سەرپىياتى كۆپ قاناللىق بولمىغان ئاڭلىتىشنىڭكىدىن يۇقىرى.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bluetoothAdmin">كۆكچىش تەڭشەك زىيارىتى</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="tablet">ئەپنىڭ تاختا كومپيۇتېر كۆكچىشنى سەپلىشىگە، قوشنا ئۈسكۈنىلەرنى بايقىشىغا ۋە يىراق مۇساپىلىق پەرلەشكە يول قويىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetoothAdmin" product="default">ئەپنىڭ تېلېفون كۆكچىشنى سەپلىشىگە، قوشنا ئۈسكۈنىلەرنى بايقىشىغا ۋە يىراق مۇساپىلىق پەرلەشكە يول قويىدۇ.</string>
   <string name="permlab_accessWimaxState">بۇ WiMAX كە باغلاپ ۋە ئۈزىدۇ</string>
   <string name="permdesc_accessWimaxState">ئەپنىڭ WiMAX قوزغالغان ياكى قوزغالمىغانلىقى ۋە باغلانغان خالىغان WiMAX تورىنىڭ مۇناسىۋەتلىك ئۇچۇرلىرىنى جەزملىشىگە يول قويىدۇ.</string>
-  <string name="permlab_changeWimaxState">WiMAX ھالىتىنى ئۆزگەرتىدۇ</string>
   <string name="permdesc_changeWimaxState" product="tablet">ئەپنىڭ تاختا كومپيۇتېرنى WiMAX تورىغا باغلىشى ۋە ئۈزۈشىگە يول قويىدۇ.</string>
   <string name="permdesc_changeWimaxState" product="default">ئەپنىڭ تېلېفوننى WiMAX تورىغا باغلىشى ۋە ئۈزۈشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bluetooth">كۆكچىش ئۈسكۈنە بىلەن جۈپلىنىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="tablet">ئەپنىڭ تاختا كومپيۇتېر كۆكچىش سەپلىمىسىنى تەكشۈرۈپ كۆرۈپ، چۈپلەنگەن ماس ئۈسكۈنىگە باغلىنىشىغا يول قويىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bluetooth" product="default">ئەپنىڭ تېلېفون كۆكچىش سەپلىمىسىنى تەكشۈرۈپ كۆرۈپ، چۈپلەنگەن ماس ئۈسكۈنىگە باغلىنىشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_nfc">يېقىن دائىرىدىكى ئالاقە تىزگىنى</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_nfc">ئەپنىڭ يېقىن ئەتراپتىكى ئالاقە(NFC) بەلگە، كارتا ۋە ئوقۇغۇچ بىلەن ئالاقە قىلىشىغا يول قويىدۇ،</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_disableKeyguard">ئېكران قۇلۇپنى چەكلەيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_disableKeyguard">ئەپنىڭ كۇنۇپكا قۇلۇپى ۋە ئىم بىلەن باغلانغان بىخەتەرلىك تەڭشىكىنى توختىتىشىغا يول قويىدۇ. مەسىلەن، تېلېفوندا كەلگەندە كۇنۇپكا قۇلۇپىنى توختىتىپ، سۆزلىشىش تاماملانغاندا كۇنۇپكا قۇلۇپىنى قايتا قوزغىتىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint cannot be recognized -->
+  <!-- Message shown during fingerprint acquisision when the fingerprint sensor needs cleaning -->
+  <!-- Message shown during fingerprint acquisision when the user removes their finger from the sensor too quickly -->
+  <!-- Message shown during fingerprint acquisision when the user moves their finger too slowly -->
+  <!-- Array containing custom messages shown during fingerprint acquisision from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Error message shown when the fingerprint hardware can't be accessed -->
+  <!-- Error message shown when the fingerprint hardware has run out of room for storing fingerprints -->
+  <!-- Error message shown when the fingerprint hardware timer has expired and the user needs to restart the operation. -->
+  <!-- Generic error message shown when the fingerprint operation (e.g. enrollment or authentication) is canceled. Generally not shown to the user-->
+  <!-- Generic error message shown when the fingerprint operation fails because too many attempts have been made. -->
+  <!-- Generic error message shown when the fingerprint hardware can't recognize the fingerprint -->
+  <!-- Template to be used to name enrolled fingerprints by default. -->
+  <!-- Array containing custom error messages from vendor.  Vendor is expected to add and translate these strings -->
+  <!-- Content description which should be used for the fingerprint icon. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncSettings">قەدەمداش تەڭشىكىنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSyncSettings">ئەپنىڭ مەلۇم بىر ھېساباتنىڭ قەدەمداش تەڭشىكىنى ئوقۇشىغا يول قويىدۇ. مەسىلەن، بۇ ھوقۇق ئالاقەداش ئەپنىڭ مەلۇم ھېسابات بىلەن قەدەمداشلانغان ياكى قەدەمداشلانمىغانلىقىنى جەزملەيدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_writeSyncSettings">قەدەمداشنى ئاچىدۇ ياكى ياپىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_writeSyncSettings">ئەپنىڭ مەلۇم بىر ھېساباتنىڭ قەدەمداش تەڭشىكىنى ئۆزگەرتىشىگە يول قويىدۇ. مەسىلەن، بۇ ھوقۇق ئالاقەداش ئەپنىڭ مەلۇم ھېسابات بىلەن قەدەمداشلاشنى قوزغىتىشقا ئىشلىتىلىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readSyncStats">قەدەمداش سىتاتىستىكا ئۇچۇرىنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readSyncStats">ئەپنىڭ مەلۇم بىر ھېساباتنىڭ قەدەمداش سىتاتىستىكا ئۇچۇرىنى ئوقۇشىغا يول قويىدۇ، ھەرىكەتچان تارىخ خاتىرىسى ۋە قەدەمداش سانلىق مەلۇمات مىقدارىنى قەدەمداشلاشنى ئۆز ئىچىگە ئالىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permlab_sdcardRead" product="nosdcard">سىزنىڭ USB ساقلىغۇچىڭىزدىكى مەزمۇنلارنى ئوقۇيدۇ</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_sdcardRead" product="default">سىزنىڭ SD كارتىڭىزدىكى مەزمۇنلارنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permdesc_sdcardRead" product="nosdcard">ئەپنىڭ USB ساقلىغۇچىڭىزدىكى مەزمۇنلارنى ئوقۇشىغا يول قويىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sdcardRead" product="default">ئەپنىڭ SD كارتىڭىزدىكى مەزمۇنلارنى ئوقۇشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permlab_sdcardWrite" product="nosdcard">USB ساقلىغۇچىڭىزدىكى مەزمۇنلارنى ئۆزگەرتىدۇ ياكى ئۆچۈرىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_sdcardWrite" product="default">SD كارتىڭىزدىكى مەزمۇنلارنى ئۆزگەرتىدۇ ياكى ئۆچۈرىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=30] -->
   <string name="permdesc_sdcardWrite" product="nosdcard">ئەپنىڭ USB ساقلىغۇچقا يېزىشىغا يول قويىدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_sdcardWrite" product="default">ئەپنىڭ SD كارتىغا يېزىشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readNetworkUsageHistory">تور ئىشلىتىش ئەھۋالىنىڭ تارىخىنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readNetworkUsageHistory">ئەپنىڭ مۇئەييەن تور ۋە ئەپنىڭ تور ئىشلىتىش ئەھۋالىنىڭ تارىخىنى ئوقۇشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_manageNetworkPolicy">تور تەدبىرىنى باشقۇرىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_manageNetworkPolicy">ئەپنىڭ تور تەدبىرىنى باشقۇرۇشىغا ۋە ئەپكە قارىتىلغان قائىدە بەلگىلىشىگە يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyNetworkAccounting">تور ئىشلىتىش ئەھۋالىنىڭ تارىخىنى خاتىرىلەش ئۇسۇلىنى ئۆزگەرتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyNetworkAccounting">ئەپكە نىسبەتەن تور ئىشلىتىش ئەھۋالىنى خاتىرىلەش ئۇسۇلىنى ئۆزگەرتىشكە يول قويىدۇ. ئادەتتىكى پىروگراممىلار بۇ ھوقۇقنى ئىشلىتەلمەيدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNotifications">زىيارەت ئۇقتۇرۇشى</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNotifications">بۇ ئەپنىڭ باشقا ئەپلەر تارقاتقان ئۇقتۇرۇشلارنى ئۆز ئىچىگە ئالغان ئۇقتۇرۇشلارنى ئىزدەش، تەكشۈرۈش ھەمدە تازىلىشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_bindNotificationListenerService">ئۇقتۇرۇش تىڭشاش مۇلازىمىتىگە باغلايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_bindNotificationListenerService">ئىشلەتكۈچىنىڭ ئۇقتۇرۇش تىڭشاش مۇلازىمىتىنى يۇقىرى قاتلام ئېغىزىغا باغلىشىغا يول قويىدۇ. ئادەتتىكى ئەپلەر بۇ ھوقۇققا موھتاج بولمايدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_invokeCarrierSetup">مۇلازىمەت تەمىنلىگۈچى سەپلىگەن ئەپنى يۆتكەپ ئىشلىتىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_invokeCarrierSetup">ئەپنىڭ مۇلازىمەت تەمىنلىگۈچى سەپلىگەن ئەپنى يۆتكەپ ئىشلىتىشىگە يول قويىدۇ. ئادەتتىكى ئەپلەر بۇ ھوقۇققا مۇھتاج بولمايدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_accessNetworkConditions">تور ئەھۋالىنىڭ تەكشۈرۈش ئۇچۇرىنى تىڭشايدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_accessNetworkConditions">ئەپنىڭ تور ئەھۋالىنىڭ تەكشۈرۈش ئۇچۇرىنى تىڭشىشىغا يول قويىدۇ. ئادەتتىكى ئەپلەر بۇ ھوقۇققا مۇھتاج بولمايدۇ.</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, for applications that wish to access notification policy. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Policy administration -->
+  <!-- Title of policy access to limiting the user's password choices -->
   <string name="policylab_limitPassword">ئىم قائىدە تەڭشىكى</string>
+  <!-- Description of policy access to limiting the user's password choices -->
+  <!-- Title of policy access to watch user login attempts -->
   <string name="policylab_watchLogin">ئېكران قۇلۇپىنى ئېچىشنى سىناش قېتىم سانى نازارەتچىسى</string>
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="tablet">ئېكراننى قۇلۇپلاشتىن ئىلگىرى ئىم كىرگۈزۈش قېتىم سانىنى نازارەت قىلىدۇ؛ ئەگەر ئىم كىرگۈزۈش قېتىم سانى بەك كۆپ بولۇپ كەتسە تاختا كومپيۇتېرنى قۇلۇپلايدۇ ياكى تاختا كومپيۇتېردىكى ھەممە سانلىق مەلۇماتلارنى ئۆچۈرىدۇ.</string>
+  <!-- Description of policy access to watch user login attempts -->
+  <!-- Description of policy access to watch user login attempts -->
   <string name="policydesc_watchLogin" product="default">ئېكراننى قۇلۇپلاشتىن ئىلگىرى ئىم كىرگۈزۈش قېتىم سانىنى نازارەت قىلىدۇ؛ ئەگەر ئىم كىرگۈزۈش قېتىم سانى بەك كۆپ بولۇپ كەتسە تېلېفوننى قۇلۇپلايدۇ ياكى تېلېفوندىكى ھەممە سانلىق مەلۇماتلارنى ئۆچۈرىدۇ.</string>
+  <!-- Title of policy access to reset user's password -->
+  <!-- Description of policy access to reset user's password -->
+  <!-- Title of policy access to force lock the device -->
   <string name="policylab_forceLock">ئېكراننى قۇلۇپلايدۇ</string>
+  <!-- Description of policy access to limiting the user's password choices -->
   <string name="policydesc_forceLock">ئېكران قۇلۇپلاش ئۇسۇلى ۋە ۋاقىت تىزگىنى</string>
+  <!-- Title of policy access to wipe primary user's data -->
   <string name="policylab_wipeData">ھەممە سانلىق مەلۇماتنى ئۆچۈرىدۇ</string>
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="tablet">تاختا كومپيۇتېرنىڭ سانلىق مەلۇماتلىرىنى ئاگاھلاندۇرمايلا ئۆچۈرىدۇ، خۇددى زاۋۇت تەڭشىكىنى ئەسلىگە قايتۇرغان مەشغۇلاتتەك.</string>
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
   <string name="policydesc_wipeData" product="default">تېلېفوننىڭ سانلىق مەلۇماتلىرىنى ئاگاھلاندۇرمايلا ئۆچۈرىدۇ، خۇددى زاۋۇت تەڭشىكىنى ئەسلىگە قايتۇرغان مەشغۇلاتتەك.</string>
+  <!-- Title of policy access to wipe secondary user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Description of policy access to wipe the user's data -->
+  <!-- Title of policy access to set global proxy -->
   <string name="policylab_setGlobalProxy">ئۈسكۈنىنىڭ ئومۇمىيەت ۋاكالەتچى تەڭشىكى</string>
+  <!-- Description of policy access to set global proxy -->
+  <!-- Title of policy access to enforce password expiration [CHAR LIMIT=50]-->
+  <!-- Description of policy access to enforce password expiration [CHAR LIMIT=110]-->
+  <!-- Title of policy access to require encrypted storage [CHAR LIMIT=30]-->
   <string name="policylab_encryptedStorage">ساقلىغۇچ شىفىرلاش تەڭشىكى</string>
+  <!-- Description of policy access to require encrypted storage [CHAR LIMIT=110]-->
   <string name="policydesc_encryptedStorage">لازىملىق ساقلايدىغان ئەپ سانلىق مەلۇماتلىرىنى شىفىرلايدۇ</string>
+  <!-- Title of policy access to disable all device cameras [CHAR LIMIT=30]-->
   <string name="policylab_disableCamera">كامېرانى چەكلە</string>
+  <!-- Description of policy access to disable all device cameras [CHAR LIMIT=110]-->
   <string name="policydesc_disableCamera">ھەممە ئۈسكۈنە كامېراسىنى ئىشلىتىشنى چەكلەيدۇ</string>
+  <!-- Title of policy access to disable keyguard features [CHAR LIMIT=30]-->
+  <!-- Description of policy access to disable keyguard features. [CHAR LIMIT=110]-->
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Phone number types from android.provider.Contacts. This could be used when adding a new phone number for a contact, for example. -->
   <string-array name="phoneTypes">
     <item>ئۆي</item>
     <item>كۆچمە</item>
@@ -362,29 +890,39 @@
     <item>باشقا</item>
     <item>ئىختىيارىي</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Email address types from android.provider.Contacts. This could be used when adding a new e-mail address for a contact, for example. -->
   <string-array name="emailAddressTypes">
     <item>ئۆي</item>
     <item>ئىش</item>
     <item>باشقا</item>
     <item>ئىختىيارىي</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. -->
   <string-array name="postalAddressTypes">
     <item>ئۆي</item>
     <item>ئىش</item>
     <item>باشقا</item>
     <item>ئىختىيارىي</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Messenger ID types from android.provider.Contacts. This could be used when adding a new IM for a contact, for example. -->
   <string-array name="imAddressTypes">
     <item>ئۆي</item>
     <item>ئىش</item>
     <item>باشقا</item>
     <item>ئىختىيارىي</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Organization types from android.provider.Contacts. This could be used when adding a new organization for a contact, for example. -->
   <string-array name="organizationTypes">
     <item>ئىش</item>
     <item>باشقا</item>
     <item>ئىختىيارىي</item>
   </string-array>
+  <!-- The order of these is important, don't reorder without changing Contacts.java -->
+  <!-- Instant Message protocols/providers from android.provider.Contacts -->
   <string-array name="imProtocols">
     <item>AIM</item>
     <item>Windows Live</item>
@@ -395,379 +933,891 @@
     <item>ICQ</item>
     <item>Jabber</item>
   </string-array>
+  <!-- Custom phone number type -->
   <string name="phoneTypeCustom">ئىختىيارىيي</string>
+  <!-- Home phone number type -->
   <string name="phoneTypeHome">ئۆي</string>
+  <!-- Mobile phone number type -->
   <string name="phoneTypeMobile">كۆچمە</string>
+  <!-- Work phone number type -->
   <string name="phoneTypeWork">ئىش</string>
+  <!-- Work fax phone number type -->
   <string name="phoneTypeFaxWork">ئىش فاكىس</string>
+  <!-- Home fax phone number type -->
   <string name="phoneTypeFaxHome">ئوي فاكىس</string>
+  <!-- Pager phone number type -->
   <string name="phoneTypePager">چاقىرغۇ</string>
+  <!-- Other phone number type -->
   <string name="phoneTypeOther">باشقا</string>
+  <!-- Callback phone number type -->
   <string name="phoneTypeCallback">قايتۇرما چاقىرىق</string>
+  <!-- Car phone number type -->
   <string name="phoneTypeCar">ماشىنا</string>
+  <!-- Company main phone number type -->
   <string name="phoneTypeCompanyMain">شىركەت باش ئاپپاراتى</string>
+  <!-- ISDN phone number type -->
   <string name="phoneTypeIsdn">ISDN</string>
+  <!-- Main phone number type -->
   <string name="phoneTypeMain">ئاساسىي تىزىملىك</string>
+  <!-- Other fax phone number type -->
   <string name="phoneTypeOtherFax">باشقا فاكىس</string>
+  <!-- Radio phone number type -->
   <string name="phoneTypeRadio">سىمسىز ئالاقە</string>
+  <!-- Telex phone number type -->
   <string name="phoneTypeTelex">تېلېگرامما</string>
+  <!-- TTY TDD phone number type -->
   <string name="phoneTypeTtyTdd">TTY/TDD</string>
+  <!-- Work mobile phone number type -->
   <string name="phoneTypeWorkMobile">خىزمەت تېلېفونى</string>
+  <!-- Work pager phone number type -->
   <string name="phoneTypeWorkPager">خىزمەت چاقىرغۇ</string>
+  <!-- Assistant phone number type -->
   <string name="phoneTypeAssistant">ياردەمچى</string>
+  <!-- MMS phone number type -->
   <string name="phoneTypeMms">MMS</string>
+  <!-- Label for custom events  [CHAR LIMIT=20] -->
   <string name="eventTypeCustom">ئىختىيارىيلاشقان</string>
+  <!-- Label for a birthday event  [CHAR LIMIT=20] -->
   <string name="eventTypeBirthday">تۇغۇلغان كۈن</string>
+  <!-- Label for an anniversary event  [CHAR LIMIT=20] -->
   <string name="eventTypeAnniversary">يىللىق خاتىرە كۈن</string>
+  <!-- Label for other events  [CHAR LIMIT=20] -->
   <string name="eventTypeOther">باشقا</string>
+  <!-- Custom email type -->
   <string name="emailTypeCustom">ئىختىيارىي</string>
+  <!-- Home email type -->
   <string name="emailTypeHome">ئۆي</string>
+  <!-- Work email type -->
   <string name="emailTypeWork">ئىش</string>
+  <!-- Other email type -->
   <string name="emailTypeOther">باشقا</string>
+  <!-- Mobile email type -->
   <string name="emailTypeMobile">كۆچمە</string>
+  <!-- Custom postal address type -->
   <string name="postalTypeCustom">ئىختىيارىي</string>
+  <!-- Home postal address type -->
   <string name="postalTypeHome">ئۆي</string>
+  <!-- Work postal address type -->
   <string name="postalTypeWork">ئىش</string>
+  <!-- Other postal address type -->
   <string name="postalTypeOther">باشقا</string>
+  <!-- Custom IM address type -->
   <string name="imTypeCustom">ئىختىيارىي</string>
+  <!-- Home IM address type -->
   <string name="imTypeHome">ئۆي</string>
+  <!-- Work IM address type -->
   <string name="imTypeWork">ئىش</string>
+  <!-- Other IM address type -->
   <string name="imTypeOther">باشقا</string>
+  <!-- Custom IM protocol type -->
   <string name="imProtocolCustom">ئىختىيارىي</string>
+  <!-- AIM IM protocol type -->
   <string name="imProtocolAim">AIM</string>
+  <!-- MSN IM protocol type -->
   <string name="imProtocolMsn">Windows Live</string>
+  <!-- Yahoo IM protocol type -->
   <string name="imProtocolYahoo">Yahoo</string>
+  <!-- Skype IM protocol type -->
   <string name="imProtocolSkype">Skype</string>
+  <!-- QQ IM protocol type -->
   <string name="imProtocolQq">QQ</string>
+  <!-- Google Talk IM protocol type -->
   <string name="imProtocolGoogleTalk">Hangouts</string>
+  <!-- ICQ IM protocol type -->
   <string name="imProtocolIcq">ICQ</string>
+  <!-- Jabber IM protocol type -->
   <string name="imProtocolJabber">Jabber</string>
+  <!-- NetMeeting IM protocol type -->
   <string name="imProtocolNetMeeting">تور يېغىنى </string>
+  <!-- Work organization type -->
   <string name="orgTypeWork">ئىش</string>
+  <!-- Other organization type -->
   <string name="orgTypeOther">باشقا</string>
+  <!-- Custom organization type -->
   <string name="orgTypeCustom">ئىختىيارىي</string>
+  <!-- Custom relationship custom [CHAR LIMIT=20] -->
   <string name="relationTypeCustom">ئىختىيارىيلاشقان</string>
+  <!-- Assistant relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeAssistant">ياردەمچى</string>
+  <!-- Brother relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeBrother">قېرىنداش</string>
+  <!-- Child relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeChild">بالا</string>
+  <!-- Domestic Partner relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeDomesticPartner">ئۆيداش</string>
+  <!-- Father relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeFather">ئاتا</string>
+  <!-- Friend relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeFriend">دوست</string>
+  <!-- Manager relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeManager">باشقۇرغۇچى</string>
+  <!-- Mother relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeMother">ئانا</string>
+  <!-- Parent relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeParent">ئاتا-ئانا</string>
+  <!-- Partner relationship type [CHAR LIMIT=20] -->
   <string name="relationTypePartner">ھەمراھ</string>
+  <!-- Referred by relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeReferredBy">تونۇشتۇرغۇچى</string>
+  <!-- Relative relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeRelative">نىسپىي</string>
+  <!-- Sister relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeSister">ئاچا-سىڭىل</string>
+  <!-- Spouse relationship type [CHAR LIMIT=20] -->
   <string name="relationTypeSpouse">جورا</string>
+  <!-- Custom SIP address type. Same context as Custom phone type.  -->
   <string name="sipAddressTypeCustom">ئىختىيارىيلاشقان</string>
+  <!-- Home SIP address type. Same context as Home phone type. -->
   <string name="sipAddressTypeHome">ئۆي</string>
+  <!-- Work SIP address type. Same context as Work phone type. -->
   <string name="sipAddressTypeWork">ئىش</string>
+  <!-- Other SIP address type. Same context as Other phone type. -->
   <string name="sipAddressTypeOther">باشقا</string>
+  <!-- Error message that is displayed when the user clicks on a quick contacts badge, but
+         there is no contacts application installed that can display the quick contact -->
   <string name="quick_contacts_not_available">بۇ مەزمۇننى كۆرسىتىدىغان ئەپ تېپىلمىدى.</string>
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_code">PIN كودىنى كىرگۈزۈڭ</string>
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_puk_code">PUK ۋە يېڭى PIN كودىنى كىرگۈزۈڭ</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">PUK كودى</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">يېڭى PIN كودى</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">\"بۇ جاينى چېكىپ ئىم كىرگۈزۈڭ\"</font></string>
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_password_code">قۇلۇپ ئېچىش ئۈچۈن ئىم كىرگۈزۈڭ</string>
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_password_code">PIN كىرگۈزۈپ قۇلۇپ ئېچىڭ</string>
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
   <string name="keyguard_password_wrong_pin_code">PIN كودى خاتا.</string>
+  <!-- Instructions telling the user how to unlock the phone. -->
   <string name="keyguard_label_text">قۇلۇپ ئېچىشتا، ئاۋۋال Menu نى بېسىپ ئاندىن 0 نى بېسىڭ.</string>
+  <!-- This can be used in any application wanting to disable the text "Emergency number" -->
   <string name="emergency_call_dialog_number_for_display">جىددىي قۇتقۇزۇش ياكى ساقچىغا مەلۇم قىلىش تېلېفۇنى</string>
+  <!--
+       *** touch based lock / unlock ***
+                                          -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.  This is displayed if the phone is not connected to a carrier.-->
   <string name="lockscreen_carrier_default">مۇلازىمەت يوق</string>
+  <!-- Shown in the lock screen to tell the user that the screen is locked. -->
   <string name="lockscreen_screen_locked">ئىكران قۇلۇپلانغان.</string>
+  <!-- when pattern lock is enabled, tell them about the emergency dial -->
   <string name="lockscreen_instructions_when_pattern_enabled">Menu نى بېسىپ قۇلۇپ ئېچىڭ ياكى جىددىي قۇتقۇزۇشنى چاقىرىڭ.</string>
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="lockscreen_instructions_when_pattern_disabled">Menu نى بېسىپ قۇلۇپنى ئېچىڭ.</string>
+  <!-- On the unlock pattern screen, shown at the top of the unlock screen to tell the user what to do. Below this text is the place for theu ser to draw the pattern. -->
   <string name="lockscreen_pattern_instructions">قۇلۇپ ئېچىش ئەندىزىسىنى سىزىڭ</string>
+  <!-- Button at the bottom of the unlock screen to make an emergency call or access other emergency assistance functions. -->
+  <!-- Button at the bottom of the unlock screen that lets the user return to a call -->
   <string name="lockscreen_return_to_call">چاقىرىشقا قايتىش</string>
+  <!-- Shown to confirm that the user entered their lock pattern correctly. -->
   <string name="lockscreen_pattern_correct">توغرا!</string>
+  <!-- On the unlock pattern screen, shown when the user enters the wrong lock pattern and must try again. -->
   <string name="lockscreen_pattern_wrong">قايتا سىنا</string>
+  <!-- On the unlock password screen, shown when the user enters the wrong lock password and must try again. -->
   <string name="lockscreen_password_wrong">قايتا سىنا</string>
+  <!-- Shown when face unlock failed multiple times so we're just using the backup -->
   <string name="faceunlock_multiple_failures">چىرايدا قۇلۇپ ئاچقۇچنى سىناش قېتىم سانىنىڭ يۇقىرى چېكىدىن ئېشىپ كەتتى</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message_short">SIM كارتا يوق</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="tablet">تاختا كومپيۇتېردا SIM كارتا يوق.</string>
+  <!-- Shown in the lock screen when there is no SIM card. -->
+  <!-- Shown in the lock screen when there is no SIM card. -->
   <string name="lockscreen_missing_sim_message" product="default">تېلېفوندا SIM كارتا يوق.</string>
+  <!-- Shown in the lock screen to ask the user to insert a SIM card. -->
   <string name="lockscreen_missing_sim_instructions">SIM كارتا قىستۇرۇڭ.</string>
+  <!-- Shown in the lock screen to ask the user to insert a SIM card when sim is missing or not readable. -->
   <string name="lockscreen_missing_sim_instructions_long">SIM كارتا يوقالغان ياكى ئوقۇغىلى بولمايدۇ. SIM كارتا قىستۇرۇڭ.</string>
+  <!-- Shown in the lock screen when SIM card is permanently disabled. -->
   <string name="lockscreen_permanent_disabled_sim_message_short">SIM كارتىنى ئىشلەتكىلى بولمايدۇ.</string>
+  <!-- Shown in the lock screen to inform the user to SIM card is permanently disabled. -->
   <string name="lockscreen_permanent_disabled_sim_instructions">سىزنىڭ SIM كارتىڭىز مەڭگۈلۈك توختىتىلدى.\nسىمسىز تور مۇلازىمىتى تەمىنلىگۈچىڭىز بىلەن ئالاقە قىلىپ، يېڭىدىن بىر SIM كارتىغا ئېرىشىڭ.</string>
+  <!-- Shown on transport control of lockscreen. Pressing button goes to previous track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button goes to next track. -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control of lockscreen. Pressing button pauses playback -->
+  <!-- Shown on transport control screens. Pressing button rewinds playback [CHAR LIMIT=NONE]-->
+  <!-- Shown on transport control screens. Pressing button fast forwards playback [CHAR LIMIT=NONE]-->
+  <!-- Shown in the lock screen when there is emergency calls only mode. -->
   <string name="emergency_calls_only" msgid="2485604591272668370">جىددىي تېلېفونلا ئۇرغىلى بولىدۇ</string>
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network
+         locked -->
   <string name="lockscreen_network_locked_message">تور قۇلۇپلانغان</string>
+  <!-- When the user enters a wrong sim pin too many times, it becomes
+         PUK locked (Pin Unlock Kode) -->
   <string name="lockscreen_sim_puk_locked_message">SIM كارتا PUK نۇمۇر ئارقىلىق قۇلۇپلانغان.</string>
+  <!-- Shown in the lock screen when the SIM has become PUK locked and the user must call customer care to unlock it. -->
   <string name="lockscreen_sim_puk_locked_instructions">ئىشلەتكۈچىلەر قوللانمىسىنى كۆرۈڭ ياكى مۇلازىمەتچى بىلەن ئالاقىلىشىڭ.</string>
+  <!-- Shown in the lock screen to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
   <string name="lockscreen_sim_unlock_progress_dialog_message">SIM كارتا قۇلۇپىنى ئېچىۋاتىدۇ…</string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         drawing the unlock pattern -->
   <string name="lockscreen_too_many_failed_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the password -->
   <string name="lockscreen_too_many_failed_password_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئىمنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- For the unlock screen, Information message shown in dialog when user has too many failed attempts at
+         entering the PIN -->
   <string name="lockscreen_too_many_failed_pin_attempts_dialog_message">سىز PIN نى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="tablet">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما Google ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ. "\n\n "يەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where they will be locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="lockscreen_failed_attempts_almost_glogin" product="default">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما Google ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تېلېفون قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ."\n\n" يەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet">سىز تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، تاختا كومپيۇتېرنى زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتۇرىدۇ، ھەممە ئىشلەتكۈچى سانلىق مەلۇماتلىرى يوقىلىدۇ.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
+  <!-- For the unlock screen, informational message shown in dialog when user is almost at the limit
+         where the device will be wiped. -->
   <string name="lockscreen_failed_attempts_almost_at_wipe" product="default">سىز تېلېفون قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، تېلېفوننى زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتۇرىدۇ، ھەممە ئىشلەتكۈچى سانلىق مەلۇماتلىرى يوقىلىدۇ.</string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="tablet">سىز تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. تاختا كومپيۇتېر زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتىدۇ، </string>
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
+  <!-- For the unlock screen, informational message shown in dialog when user has exceeded the
+        maximum attempts and the device will now be wiped -->
   <string name="lockscreen_failed_attempts_now_wiping" product="default">سىز تېلېفون قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. تېلېفون زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتىدۇ، </string>
+  <!-- On the unlock screen, countdown message shown while user is waiting to try again after too many
+         failed attempts -->
   <string name="lockscreen_too_many_failed_attempts_countdown"><xliff:g id="NUMBER">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- On the unlock screen, message shown on button that appears once it's apparent the user may have forgotten
+         their lock gesture -->
   <string name="lockscreen_forgot_pattern_button_text">ئەندىزىنى ئۇنتۇپسىزمۇ؟</string>
+  <!-- Title of the unlock screen that uses your Google login and password when the user hit
+         the 'forgot pattern' button.-->
   <string name="lockscreen_glogin_forgot_pattern">ھىسابات قۇلۇپى ئېچىلدى</string>
+  <!-- Title of the unlock screen that uses your Google login and password when the user attempted
+         too many patterns and we are forcing them to use their account instead. -->
   <string name="lockscreen_glogin_too_many_attempts">ئەندىزىسىنى سىناش قېتىم سانى بەك كۆپ بولۇپ كەتتى</string>
+  <!-- In the unlock screen, message telling the user that they need to use their Google login and password to unlock the phone -->
   <string name="lockscreen_glogin_instructions">قۇلۇپ ئېچىشتا، Google ھېساباتىڭىزدا تىزىمغا كىرىڭ</string>
+  <!-- Hint caption for the username field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_username_hint">ئىشلەتكۈچى ئاتى(تورخەت)</string>
+  <!-- Hint caption for the password field when unlocking the phone using login and password -->
   <string name="lockscreen_glogin_password_hint">ئىم</string>
+  <!-- Button to try to unlock the phone using username and password -->
   <string name="lockscreen_glogin_submit_button">تىزىمغا كىر</string>
+  <!-- Displayed to the user when unlocking the phone with a username and password fails. -->
   <string name="lockscreen_glogin_invalid_input">ئىشلەتكۈچى ئاتى ۋە ياكى ئىم خاتا.</string>
+  <!-- Hint displayed on account unlock screen to advise the user on how to recover the account. -->
   <string name="lockscreen_glogin_account_recovery_hint">\"ئىشلەتكۈچى ئاتىڭىز ياكى ئىمنى ئۇنۇتتىڭىزمۇ؟\"\n\"google.com/accounts/recovery زىيارەت قىلىڭ.\"<b/></string>
+  <!-- Displayed in a progress dialog while a username and password are being checked. -->
   <string name="lockscreen_glogin_checking_password">تەكشۈرۈۋاتىدۇ…</string>
+  <!-- Displayed on lock screen's left tab - unlock -->
   <string name="lockscreen_unlock_label">قۇلۇپ ئاچ</string>
+  <!-- Displayed on lock screen's right tab - turn sound on -->
   <string name="lockscreen_sound_on_label">ئاۋاز ئوچۇق</string>
+  <!-- Displayed on lock screen's right tab - turn sound off -->
   <string name="lockscreen_sound_off_label">ئاۋاز تاقاق</string>
+  <!-- Accessibility description sent when user starts drawing a lock pattern. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_start">ئەندىزە سىزىڭ</string>
+  <!-- Accessibility description sent when the pattern times out and is cleared. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_cleared">ئەندىزە تازىلاندى</string>
+  <!-- Accessibility description sent when user adds a dot to the pattern. [CHAR LIMIT=NONE]  -->
   <string name="lockscreen_access_pattern_cell_added">كاتەكچە قوشۇلدى</string>
+  <!-- Accessibility description sent when user adds a dot to the pattern. Announces the 
+    actual cell when headphones are connected [CHAR LIMIT=NONE]  -->
+  <!-- Accessibility description sent when user completes drawing a pattern. [CHAR LIMIT=NONE] -->
   <string name="lockscreen_access_pattern_detected">ئەندىزە تامام</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="lockscreen_access_pattern_area" msgid="">ئەندىزە دائىرىسى.</string>
+  <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_changed">%1$s. %3$d نىڭ ئەپچىسى %2$d.</string>
+  <!-- Accessibility description of the add widget button. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_add_widget">ئەپچە قوش</string>
+  <!-- Accessibility description of the empty sidget slot (place holder for a new widget). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_empty_slot">بوش</string>
+  <!-- Accessibility description of the event of expanding an unlock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_unlock_area_expanded">قۇلۇپ ئېچىش رايونى يېيىلدى.</string>
+  <!-- Accessibility description of the event of collapsing an unlock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_unlock_area_collapsed">قۇلۇپ ئېچىش رايونى قاتلاندى.</string>
+  <!-- Accessibility description of a lock screen widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget"><xliff:g id="WIDGET_INDEX">%1$s</xliff:g> ئەپچە. </string>
+  <!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_user_selector">ئىشلەتكۈچى تاللىغۇچ</string>
+  <!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_status">ھالەت</string>
+  <!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_camera">كامېرا</string>
+  <!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
   <string name="keygaurd_accessibility_media_controls">ۋاستە تىزگىنلەر</string>
+  <!-- Accessibility description of widget reordering start. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_reorder_start">ئەپچە قايتا تەرتىپلەش باشلاندى.</string>
+  <!-- Accessibility description of widget reordering end. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_reorder_end">ئەپچە قايتا تەرتىپلەش ئاخىرلاشتى.</string>
+  <!-- Accessibility description of the a widget deletion event. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_widget_deleted"><xliff:g id="WIDGET_INDEX">%1$s</xliff:g> ئۆچۈرۈلگەن ئەپچە  .</string>
+  <!-- Accessibility description of the button to expand the lock area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_expand_lock_area">قۇلۇپ ئېچىش دائىرىسىنى يايىدۇ.</string>
+  <!-- Accessibility description of the slide unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_unlock">سۈرۈلسە قۇلۇپ ئاچىدۇ.</string>
+  <!-- Accessibility description of the pattern unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_unlock">ئەدىزەدە قۇلۇپ ئاچىدۇ.</string>
+  <!-- Accessibility description of the face unlock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_face_unlock">چىرايدا قۇلۇپ ئاچىدۇ.</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">بۇ Pin دا قۇلۇپ ئاچىدۇ.</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">ئىمدا قۇلۇپ ئاچىدۇ.</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area">ئەندىزە دائىرىسى.</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">سۈرۈش دائىرىسى</string>
+  <!-- Password keyboard strings. Used by LockScreen and Settings -->
+  <!-- Label for "switch to symbols" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_symbol_key">\?123</string>
+  <!-- Label for "switch to alphabetic" key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_alpha_key">ABC</string>
+  <!-- Label for ALT modifier key.  Must be short to fit on key! -->
   <string name="password_keyboard_label_alt_key">ALT</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by character. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_character">ھەرپ</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by word. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_word">سۆز</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by link. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_link">ئۇلانما</string>
+  <!-- Label for granularity to traverse the content on an AccessibilityNodeInfo by line. Only spoken to the user. [CHAR LIMIT=NONE] -->
   <string name="granularity_label_line">سىزىق</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with lower-case "am" or "pm" (example: "3pm"). -->
   <string name="hour_ampm">"<xliff:g id="AMPM">%P</xliff:g> <xliff:g id="HOUR">%-l</xliff:g>"</string>
+  <!-- A format string for 12-hour time of day, just the hour, not the minute, with capital "AM" or "PM" (example: "3PM"). -->
   <string name="hour_cap_ampm">"<xliff:g id="AMPM">%p</xliff:g> <xliff:g id="HOUR">%-l</xliff:g>"</string>
+  <!-- Title of the alert when something went wrong in the factory test. -->
   <string name="factorytest_failed">زاۋۇتتىن چىقىش سىنىقى مەغلۇب بولدى.</string>
+  <!-- Error message displayed when a non-system application tries to start a factory test. -->
   <string name="factorytest_not_system">پەقەت \system\app گە ئورنىتىلغان بوغچىلارلا FACTORY-TEST مەشقۇلاتىنى قوللايدۇ.</string>
+  <!-- Error message displayed when the factory test could not be started. -->
   <string name="factorytest_no_action">FACTORY_TEST مەشغۇلاتىنى قوللايدىغان بوغچا تېپىلمىدى.</string>
+  <!-- Button to restart the device after the factory test. -->
   <string name="factorytest_reboot">قايتا قوزغات</string>
+  <!-- Do not translate.  WebView User Agent string -->
+  <!-- Do not translate.  WebView User Agent targeted content -->
+  <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" -->
   <string name="js_dialog_title">مەزكۇر <xliff:g id="TITLE">%S</xliff:g> بەتتە دېيىلگىنى:</string>
+  <!-- Default title for a javascript dialog -->
   <string name="js_dialog_title_default">JavaScript</string>
+  <!-- Title for the unload javascript dialog -->
   <string name="js_dialog_before_unload_title">يېتەكلەشنى جەزملە</string>
+  <!-- Text for the positive button on the unload javascript dialog -->
   <string name="js_dialog_before_unload_positive_button">بۇ بەتتىن ئايرىل</string>
+  <!-- Text for the negative button on the unload javascript dialog -->
   <string name="js_dialog_before_unload_negative_button">بۇ بەتتە تۇرۇپ تۇر</string>
+  <!-- Message in a javascript dialog asking if the user wishes to leave the current page -->
   <string name="js_dialog_before_unload"><xliff:g id="MESSAGE">%s</xliff:g>\"\n\n\"راستلا بۇ بەتتىن ئايرىلامسىز؟</string>
+  <!-- Title of the WebView save password dialog.  If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. -->
   <string name="save_password_label">جەزملە</string>
+  <!-- Toast for double-tap -->
   <string name="double_tap_toast">ئەسكەرتىش: قوش چەكسىڭىز چوڭىيىدۇ ۋە كىچىكلەيدۇ.</string>
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form, and the user has configured an AutoFill profile [CHAR-LIMIT=8] -->
   <string name="autofill_this_form">ئۆزلۈكىدىن تولدۇر</string>
+  <!-- Text to show in the auto complete drop down list on a text view when the WebView can auto fill the entire form but the user has not configured an AutoFill profile [CHAR-LIMIT=19] -->
   <string name="setup_autofill">ئۆزلۈكىدىن تولدۇرۇش تەڭشىكى</string>
+  <!-- String used to separate FirstName and LastName when writing out a local name
+         e.g. John<separator>Smith [CHAR-LIMIT=NONE]-->
+  <!-- Format string for displaying a name. $1 is First Name, $2 is autofill_address_name_separator, $3 is Last Name.
+         e.g. (John)( )(Smith) -->
   <string name="autofill_address_summary_name_format">$1$2$3</string>
+  <!-- String used to separate Name and Address Line 1
+         e.g. John Smith<separator>123 Main Street [CHAR-LIMIT=NONE]-->
   <string name="autofill_address_summary_separator">« ،»</string>
+  <!-- Format string for displaying a name and address summary. $1 is the Full Name, $2 is autofill_address_summary_separator, $3 is the Address
+         e.g. (John Smith)(, )(123 Main Street) -->
   <string name="autofill_address_summary_format">$1$2$3</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_attention_ignored_re">attention|attn</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_region_ignored_re">province|region|other<!-- es -->|provincia<!-- pt-BR, pt-PT -->|bairro|suburb</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_company_re">company|business|organization|organisation|department<!-- de-DE -->|firma|firmenname<!-- es -->|empresa<!-- fr-FR -->|societe|société<!-- it-IT -->|ragione.?sociale<!-- ja-JP -->|会社<!-- ru -->|название.?компании<!-- zh-CN -->|单位|公司</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_1_re">address.?line|address1|addr1|street<!-- de-DE -->|strasse|straße|hausnummer|housenumber<!-- en-GB -->|house.?name<!-- es -->|direccion|dirección<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所1<!-- pt-BR, pt-PT -->|morada|endereço<!-- ru -->|Адрес<!-- zh-CN -->|地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_1_label_re">address<!-- fr-FR -->|adresse<!-- it-IT -->|indirizzo<!-- ja-JP -->|住所<!-- zh-CN -->|地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_2_re">address.?line2|address2|addr2|street|suite|unit<!-- de-DE -->|adresszusatz|ergänzende.?angaben<!-- es -->|direccion2|colonia|adicional<!-- fr-FR -->|addresssuppl|complementnom|appartement<!-- it-IT -->|indirizzo2<!-- ja-JP -->|住所2</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_line_3_re">address.?line3|address3|addr3|street|line3<!-- es -->|municipio<!-- fr-FR -->|batiment|residence<!-- it-IT -->|indirizzo3</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_country_re">country|location<!-- ja-JP -->|国<!-- zh-CN -->|国家</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_zip_code_re">zip|postal|post code|pcode|^1z$<!-- de-DE -->|postleitzahl<!-- es -->|cp<!-- fr-FR -->|cdp<!-- it-IT -->|cap<!-- ja-JP -->|郵便番号<!-- pt-BR, pt-PT -->|codigo|codpos|cep<!-- ru -->|Почтовый.?Индекс<!--zh-CN -->|邮政编码|邮编<!-- zh-TW -->|郵遞區號</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_zip_4_re">zip|^-$|post2<!-- pt-BR, pt-PT -->|codpos2</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_city_re">city|town<!-- de-DE -->|ort|stadt<!-- en-AU -->|suburb<!-- es -->|ciudad|provincia|localidad|poblacion<!-- fr-FR -->|ville|commune<!-- it-IT -->|localita<!-- ja-JP -->|市区町村<!-- pt-BR, pt-PT -->|cidade<!-- ru -->|Город<!-- zh-CN -->|市<!-- zh-TW -->|分區</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_state_re">state|county|region|province<!-- de-DE -->|land<!-- en-UK -->|county|principality<!-- ja-JP -->|都道府県<!-- pt-BR, pt-PT -->|estado|provincia<!-- ru -->|область<!-- zh-CN -->|省<!-- zh-TW -->|地區</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_type_same_as_re">ئوخشاش</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_address_type_use_my_re">مېنىڭكىنى</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_billing_designator_re">ھېسابات</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_shipping_designator_re">پاراخوت</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_email_re">e.?mail<!-- ja-JP -->|メールアドレス<!-- ru -->|Электронной.?Почты<!-- zh-CN -->|邮件|邮箱<!-- zh-TW -->|電郵地址</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_username_re">user.?name|user.?id<!-- de-DE -->|vollständiger.?name<!-- zh-CN -->|用户名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_re">^name|full.?name|your.?name|customer.?name|firstandlastname<!-- es -->|nombre.*y.*apellidos<!-- fr-FR -->|^nom<!-- ja-JP -->|お名前|氏名<!-- pt-BR, pt-PT -->|^nome<!-- zh-CN -->|姓名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_specific_re">^name<!-- fr-FR -->|^nom<!-- pt-BR, pt-PT -->|^nome</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_first_name_re">irst.*name|initials|fname|first$<!-- de-DE -->|vorname<!-- es -->|nombre<!-- fr-FR -->|forename|prénom|prenom<!-- ja-JP -->|名<!-- pt-BR, pt-PT -->|nome<!-- ru -->|Имя</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_middle_initial_re">middle.*initial|m\\.i\\.|mi$</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_middle_name_re">middle.*name|mname|middle$<!-- es -->|apellido.?materno|lastlastname</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_last_name_re">last.*name|lname|surname|last$<!-- de-DE -->|nachname<!-- es -->|apellidos<!-- fr-FR -->|famille|^nom<!-- it-IT -->|cognome<!-- ja-JP -->|姓<!-- pt-BR, pt-PT -->|morada|apelidos|surename|sobrenome<!-- ru -->|Фамилия</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_re">phone<!-- de-DE -->|telefonnummer<!-- es -->|telefono|teléfono<!-- fr-FR -->|telfixe<!-- ja-JP -->|電話<!-- pt-BR, pt-PT -->|telefone|telemovel<!-- ru -->|телефон<!-- zh-CN -->|电话</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_area_code_re">area.*code|acode|area</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_prefix_re">prefix<!-- fr-FR -->|preselection<!-- pt-BR, pt-PT -->|ddd</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_suffix_re">suffix</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_extension_re">ext<!-- pt-BR, pt-PT -->|ramal</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_on_card_re">card.?holder|name.?on.?card|ccname|owner<!-- de-DE -->|karteninhaber<!-- es -->|nombre.*tarjeta<!-- fr-FR -->|nom.*carte<!-- it-IT -->|nome.*cart<!-- ja-JP -->|名前<!-- ru -->|Имя.*карты<!-- zh-CN -->|信用卡开户名|开户名|持卡人姓名<!-- zh-TW -->|持卡人姓名</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_name_on_card_contextual_re">ئىسىم</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_cvc_re">verification|card identification|cvn|security code|cvv code|cvc</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_number_re">number|card.?#|card.?no|ccnum<!-- de-DE -->|nummer<!-- es -->|credito|numero|número<!-- fr-FR -->|numéro<!-- ja-JP -->|カード番号<!-- ru -->|Номер.*карты<!-- zh-CN -->|信用卡号|信用卡号码<!-- zh-TW -->|信用卡卡號</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_expiration_month_re">expir|exp.*month|exp.*date|ccmonth<!-- de-DE -->|gueltig|gültig|monat<!-- es -->|fecha<!-- fr-FR -->|date.*exp<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|月</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_expiration_date_re">exp|^/|year<!-- de-DE -->|ablaufdatum|gueltig|gültig|yahr<!-- es -->|fecha<!-- it-IT -->|scadenza<!-- ja-JP -->|有効期限<!-- pt-BR, pt-PT -->|validade<!-- ru -->|Срок действия карты<!-- zh-CN -->|年|有效期</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_card_ignored_re">^card</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_fax_re">fax<!-- fr-FR -->|télécopie|telecopie<!-- ja-JP -->|ファックス<!-- ru -->|факс<!-- zh-CN -->|传真<!-- zh-TW -->|傳真</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_country_code_re">country.*code|ccode|_cc</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_area_code_notext_re">^\\($</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_prefix_separator_re">^-$|^\\)$</string>
+  <!-- Do not translate. Regex used by AutoFill. -->
   <string name="autofill_phone_suffix_separator_re">^-$</string>
+  <!-- Label in a web form for "Province" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_province">ئۆلكە</string>
+  <!-- Label in a web form for "Postal code" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_postal_code">پوچتا نومۇر</string>
+  <!-- Label in a web form for "State" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_state">ئۆلكە</string>
+  <!-- Label in a web form for "ZIP code" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_zip_code">پوچتا نومۇرى</string>
+  <!-- Label in a web form for "County" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_county">دۆلەت</string>
+  <!-- Label in a web form for "Island" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_island">ئارال</string>
+  <!-- Label in a web form for "District" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_district">رايون</string>
+  <!-- Label in a web form for "Department" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_department">تارماق</string>
+  <!-- Label in a web form for "Prefecture" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_prefecture">تەۋە رايون</string>
+  <!-- Label in a web form for "Parish" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_parish">مەمۇرىي رايون</string>
+  <!-- Label in a web form for "Area" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_area">دائىرە</string>
+  <!-- Label in a web form for "Emirate" [CHAR-LIMIT=NONE]  -->
   <string name="autofill_emirate">خەلىپەلىك</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_readHistoryBookmarks">تور خەتكۈچى ۋە تارىخ خاتىرىڭىزنى ئوقۇيدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_readHistoryBookmarks">ئەپنىڭ توركۆرگۈدىكى بارلىق ئادرېس ۋە خەتكۈچلەرنى ئوقۇشىغا يول قويىدۇ. دىققەت:  بۇ ھوقۇق ئۈچىنچى تەرەپ توركۆرگۈ ياكى تور بەت كۆرۈش ئىقتىدارى بار باشقا ئەپكە ماس كەلمەسلىكى مۇمكىن</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_writeHistoryBookmarks">تور خەتكۈچى ۋە تارىخ خاتىرىسى يازىدۇ</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+    they want to allow the application to do this. -->
   <string name="permlab_setAlarm">قوڭغۇراق تەڭشەك</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
   <string name="permlab_addVoicemail">ئۈنخەت قوش</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. [CHAR LIMIT=NONE] -->
   <string name="permdesc_addVoicemail">ئەپنىڭ ئۈنخەت ساندۇقىڭىزنىڭ قوبۇللاش ساندۇقىغا ئۇچۇر قوشۇشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permlab_writeGeolocationPermissions">توركۆرگۈنىڭ جۇغراپىيەلىك ئورۇن ھوقۇقىنى ئۆزگەرت</string>
+  <!-- Description of an application permission, listed so the user can choose whether
+        they want to allow the application to do this. -->
   <string name="permdesc_writeGeolocationPermissions">ئەپنىڭ توركۆرگۈنىڭ جۇغراپىيەلىك ئورۇن ھوقۇقىنى ئۆزگەرتىشىگە يول قويىدۇ. زەھەرخەندە ئەپلەر بۇ ئارقىلىق توركۆرگۈنىڭ ئورنىنى خالىغان تور بىكەتكە يوللايدۇ.</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Text in the save password dialog, asking if the browser should remember a password. -->
   <string name="save_password_message">توركۆرگۈ ئىمنى ساقلىۋالسۇنمۇ؟</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying not to remember this password. -->
   <string name="save_password_notnow">ھازىرچە ياق</string>
+  <!-- If the user enters a password in a form on a website, a dialog will come up asking if they want to save the password. Button in the save password dialog, saying to remember this password. -->
   <string name="save_password_remember">ئەستە تۇت</string>
+  <!-- Button in the save password dialog, saying never to remember this password. This should be short. Should be "Never for this site". But it is too long, use "Never" instead -->
   <string name="save_password_never">ھەرگىز</string>
+  <!-- Displayed to the user when they do not have permission to open a particular web page. -->
   <string name="open_permission_deny">بۇ بەتنى ئېچىش ھوقۇقىڭىز يوق.</string>
+  <!-- Displayed to the user to confirm that they have copied text from a web page to the clipboard. -->
   <string name="text_copied">تېكىست كېسىپ چاپلاش تاختىسىغا كۆچۈرۈلدى.</string>
+  <!-- Menu item displayed at the end of a menu to allow users to see another page worth of menu items. This is shown on any app's menu as long as the app has too many items in the menu.-->
   <string name="more_item_label">تېخىمۇ كۆپ</string>
+  <!-- Prepended to the shortcut for a menu item to indicate that the user should hold the MENU button together with the shortcut to invoke the item. For example, if the shortcut to open a new tab in browser is MENU and B together, then this would be prepended to the letter "B" -->
   <string name="prepend_shortcut_label">Menu+</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+space for the shortcut. -->
   <string name="menu_space_shortcut_label">بوشلۇق</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+enter for the shortcut. -->
   <string name="menu_enter_shortcut_label">Enter</string>
+  <!-- Displayed in place of the regular shortcut letter when a menu item has Menu+delete for the shortcut. -->
   <string name="menu_delete_shortcut_label">ئۆچۈر</string>
+  <!-- Strings used for search bar -->
+  <!-- This is the default button label in the system-wide search UI.
+         It is also used by the home screen's search "widget". It should be short -->
   <string name="search_go">ئىزدە</string>
+  <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->
+  <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_search">ئىزدە</string>
+  <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->
   <string name="searchview_description_query">سۈرۈشتۈرۈش ئىزدە</string>
+  <!-- SearchView accessibility description for clear button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_clear">سۈرۈشتۈرۈش تازىلا</string>
+  <!-- SearchView accessibility description for submit button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_submit">سۈرۈشتۈرۈش تاپشۇر</string>
+  <!-- SearchView accessibility description for voice button [CHAR LIMIT=NONE] -->
   <string name="searchview_description_voice">تاۋۇش ئىزدەش</string>
+  <!-- Title for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=45] -->
   <string name="enable_explore_by_touch_warning_title">چېكىلگەندىكى كۆرگۈنى قوزغىتامدۇ؟</string>
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (tablet). [CHAR LIMIT=NONE] -->
   <string name="enable_explore_by_touch_warning_message" product="tablet"><xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> چېكىلگەندىكى كۆرگۈ ئىقتىدارى ئېچىلغاندا، چەككەن مەزمۇننىڭ چۈشەندۈرۈشىنى ئاڭلىيالايسىز ياكى كۆرەلەيسىز. يەنە قول ئىشارىتى مەشغۇلاتى ئارقىلىق تاختا كومپيۇتېر بىلەن ئۆز ئارا تەسىرلىشەلەيسىز.</string>
+  <!-- Summary for a warning message about the interaction model changes after allowing an accessibility
+         service to put the device into explore by touch mode, displayed as a dialog message when
+         the user selects to enables the service. (default). [CHAR LIMIT=NONE] -->
   <string name="enable_explore_by_touch_warning_message" product="default"><xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> چېكىلگەندىكى كۆرگۈ ئىقتىدارى ئېچىلغاندا، چەككەن مەزمۇننىڭ چۈشەندۈرۈشىنى ئاڭلىيالايسىز ياكى كۆرەلەيسىز. يەنە قول ئىشارىتى مەشغۇلاتى ئارقىلىق تېلېفون بىلەن ئۆز ئارا تەسىرلىشەلەيسىز.</string>
+  <!-- String used to display the date. This is the string to say something happened 1 month ago. -->
   <string name="oneMonthDurationPast">1 ئاي ئىلگىرى</string>
+  <!-- String used to display the date. This is the string to say something happened more than 1 month ago. -->
   <string name="beforeOneMonthDurationPast">1</string>
+  <!-- This is used to express that something occurred within the last X days (e.g., Last 7 days). -->
+  <!-- This is used to express that something has occurred within the last month -->
   <string name="last_month">ئالدىنقى ئاي</string>
+  <!-- This is used to express that something happened longer ago than the previous options -->
   <string name="older">كونىراق</string>
+  <!-- String used to display the date. Preposition for date display ("on May 29") -->
   <string name="preposition_for_date"><xliff:g id="DATE">%s</xliff:g> دىكى</string>
+  <!-- String used to display the date. Preposition for time display ("at 2:33am") -->
   <string name="preposition_for_time"><xliff:g id="TIME">%s</xliff:g> دا</string>
+  <!-- String used to display the date. Preposition for year display ("in 2008") -->
   <string name="preposition_for_year"><xliff:g id="YEAR">%s</xliff:g> دا</string>
+  <!-- Appened to express the value is this unit of time: singular day -->
   <string name="day">كۈن</string>
+  <!-- Appened to express the value is this unit of time: plural days -->
   <string name="days">كۈن</string>
+  <!-- Appened to express the value is this unit of time: singular hour -->
   <string name="hour">سائەت</string>
+  <!-- Appened to express the value is this unit of time: plural hours -->
   <string name="hours">سائەت</string>
+  <!-- Appened to express the value is this unit of time: singular minute -->
   <string name="minute">مىنۇت</string>
+  <!-- Appened to express the value is this unit of time: plural minutes -->
   <string name="minutes">مىنۇت</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="second">سېكۇنت</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="seconds">سېكۇنت</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="week">ھەپتە</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="weeks">ھەپتە</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="year">يىل</string>
+  <!-- Appened to express the value is this unit of time. -->
   <string name="years">يىل</string>
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=16] -->
+  <plurals name="duration_seconds">
+    <item quantity="other">1 سېكۇنت</item>
+  </plurals>
+  <!-- Phrase describing a time duration using minutes [CHAR LIMIT=16] -->
+  <plurals name="duration_minutes">
+    <item quantity="other">1 مىنۇت</item>
+  </plurals>
+  <!-- Phrase describing a time duration using hours [CHAR LIMIT=16] -->
+  <plurals name="duration_hours">
+    <item quantity="other">1 سائەت</item>
+  </plurals>
+  <!-- Title for error alert when a video cannot be played.  it can be used by any app. -->
   <string name="VideoView_error_title">سىن مەسىلىسى</string>
+  <!-- Text for error alert when a video container is not valid for progressive download/playback. -->
   <string name="VideoView_error_text_invalid_progressive_playback">كەچۈرۈڭ، بۇ سىننى مەزكۇر ئۈسكۈنىدە قويۇشقا ماس كەلمەيدۇ.</string>
+  <!-- Text for error alert when a video cannot be played. it can be used by any app. -->
   <string name="VideoView_error_text_unknown">سىننى قويالمايدۇ</string>
+  <!-- Button to close error alert when a video cannot be played -->
   <string name="VideoView_error_button">جەزملە</string>
+  <!-- Format indicating a relative expression and time.
+         Example: "4 hours ago, 11:00 am" -->
   <string name="relative_time">"<xliff:g id="DATE">%1$s</xliff:g>，<xliff:g id="TIME">%2$s</xliff:g>"</string>
+  <!-- Quoted name for 12pm, lowercase -->
   <string name="noon">"چۈش"</string>
+  <!-- Quoted name for 12pm, uppercase first letter -->
   <string name="Noon">"چۈش"</string>
+  <!-- Quoted name for 12am, lowercase -->
   <string name="midnight">"يېرىم كېچە"</string>
+  <!-- Quoted name for 12am, uppercase first letter -->
   <string name="Midnight">"يېرىم كېچە"</string>
+  <!-- Format string for durations like "01:23" (1 minute, 23 seconds) -->
   <string name="elapsed_time_short_format_mm_ss"><xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g></string>
+  <!-- Format string for times like "1:43:33" (1 hour, 43 minutes, 33 seconds) -->
   <string name="elapsed_time_short_format_h_mm_ss"><xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g></string>
+  <!-- Item on EditText context menu. This action is used to select all text in the edit field. -->
   <string name="selectAll">ھەممىنى تاللا</string>
+  <!-- Item on EditText context menu.  This action is used to cut selected the text into the clipboard.  -->
   <string name="cut">كەس</string>
+  <!-- Item on EditText context menu. This action is used to cut selected the text into the clipboard. -->
   <string name="copy">كۆچۈر</string>
+  <!-- Item on EditText context menu. This action is used to paste from the clipboard into the eidt field -->
   <string name="paste">چاپلا</string>
+  <!-- Item on EditText context menu. This action is used to replace the current word by other suggested words, suggested by the IME or the spell checker -->
   <string name="replace">ئالماشتۇر…</string>
+  <!-- Item on EditText pop-up window. This action is used to delete the text that the user recently added. [CHAR LIMIT=15] -->
   <string name="delete">ئۆچۈر</string>
+  <!-- Item on EditText context menu. This action is used to copy a URL from the edit field into the clipboard. -->
   <string name="copyUrl">تور ئادرېس كۆچۈر</string>
+  <!-- Item on EditText context menu. Added only when the context menu is not empty, it enable selection context mode. [CHAR LIMIT=20] -->
   <string name="selectTextMode">تېكىست تاللا</string>
+  <!-- Text selection contextual mode title, displayed in the CAB. [CHAR LIMIT=20] -->
   <string name="textSelectionCABTitle">تېكىست تاللاش</string>
+  <!-- Option to add the current misspelled word to the user dictionary. [CHAR LIMIT=25] -->
   <string name="addToDictionary">لۇغەتكە قوش</string>
+  <!-- Option to delete the highlighted part of the text from the suggestion popup. [CHAR LIMIT=25] -->
   <string name="deleteText">ئۆچۈر</string>
+  <!-- EditText context menu -->
   <string name="inputMethod">كىرگۈزگۈچ</string>
+  <!-- Title for EditText context menu [CHAR LIMIT=20] -->
   <string name="editTextMenuTitle">تېكىست مەشغۇلاتى</string>
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the title of that notification. -->
   <string name="low_internal_storage_view_title">ساقلىغۇچ تۈگەي دەپ قالدى</string>
+  <!-- If the device is getting low on internal storage, a notification is shown to the user.  This is the message of that notification. -->
   <string name="low_internal_storage_view_text">سىستېمىنىڭ بەزى ئىقتىدارلىرى ئىشلىمەسلىكى مۇمكىن</string>
+  <!-- If the device does not have storage for the main system classes, a notification is shown to the user.  This is the message of that notification. -->
+  <!-- [CHAR LIMIT=NONE] Stub notification title for an app running a service that has provided
+         a bad bad notification for itself. -->
   <string name="app_running_notification_title"><xliff:g id="APP_NAME">%1$s</xliff:g> ئىجرا قىلىنىۋاتىدۇ.</string>
+  <!-- [CHAR LIMIT=NONE] Stub notification text for an app running a service that has provided
+         a bad bad notification for itself. -->
   <string name="app_running_notification_text">چېكىلسە تەپسىلاتىنى بىلگىلى بولىدۇ ياكى ئەپنى توختىتىدۇ.</string>
+  <!-- Preference framework strings. -->
   <string name="ok">جەزملە</string>
+  <!-- Preference framework strings. -->
   <string name="cancel">ۋاز كەچ</string>
+  <!-- Preference framework strings. -->
   <string name="yes">جەزملە</string>
+  <!-- Preference framework strings. -->
   <string name="no">ۋاز كەچ</string>
+  <!-- This is the generic "attention" string to be used in attention dialogs.  Typically
+         combined with setIconAttribute(android.R.attr.alertDialogIcon)
+         (or setIcon(android.R.drawable.ic_dialog_alert) on legacy versions of the platform) -->
   <string name="dialog_alert_title">دىققەت</string>
+  <!-- Text shown by list fragment when waiting for data to display. -->
   <string name="loading">يۈكلەۋاتىدۇ…</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_on">ئوچۇق</string>
+  <!-- Default text for a button that can be toggled on and off. -->
   <string name="capital_off">تاقاق</string>
+  <!-- Title of intent resolver dialog when selecting an application to run. -->
   <string name="whichApplication">ئىشلىتىدىغان ئەپنى تاللاڭ</string>
+  <!-- Title of intent resolver dialog when selecting an application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run. -->
+  <!-- Title of intent resolver dialog when selecting a viewer application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run. -->
+  <!-- Title of intent resolver dialog when selecting an editor application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run. -->
+  <!-- Title of intent resolver dialog when selecting a sharing application to run
+         and a previously used application is known. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run. -->
+  <!-- Title of intent resolver dialog when selecting a HOME application to run
+         and a previously used application is known. -->
+  <!-- Option to always use the selected application resolution in the future. See the "Complete action using" dialog title-->
   <string name="alwaysUse">كۆڭۈلدىكى ئەھۋالدا مۇشۇ خىل ئۇسۇلنى ئىشلىتىدۇ.</string>
+  <!-- Title of the list of alternate options to complete an action shown when the
+         last used option is being displayed separately. -->
+  <!-- Text displayed when the user selects the check box for setting default application.  See the "Use by default for this action" check box. -->
   <string name="clearDefaultHintMsg">سىستېما تەڭشەكلەر &gt; ئەپلەر &gt; چۈشۈرگەنلەردىن كۆڭۈلدىكى تەڭشەكنى تازىلايدۇ.</string>
+  <!-- Default title for the activity chooser, when one is not given. Android allows multiple activities to perform an action.  for example, there may be many ringtone pickers installed.  A dialog is shown to the user allowing him to pick which activity should be used.  This is the title. -->
   <string name="chooseActivity">مەشغۇلات تاللاڭ</string>
+  <!-- title for the USB activity chooser. -->
   <string name="chooseUsbActivity">بۇ USB ئۈسكۈنە ئۈچۈن ئەپ تاللاڭ</string>
+  <!-- Text to display when there are no activities found to display in the
+         activity chooser. See the "Select an action" title. -->
   <string name="noApplications">بۇ مەشغۇلاتنى ئىجرا قىلىدىغان ئەپ يوق.</string>
+  <!-- Title of the alert when an application has crashed. -->
+  <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_application">ناھايىتى ئەپسۇس، <xliff:g id="APPLICATION">%1$s</xliff:g> توختىدى.</string>
+  <!-- Text of the alert that is displayed when an application has crashed. -->
   <string name="aerr_process">ناھايىتى ئەپسۇس، <xliff:g id="PROCESS">%1$s</xliff:g> جەريان توختىدى.</string>
+  <!-- Title of the alert when an application is not responding. -->
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_application"><xliff:g id="APPLICATION">%2$s</xliff:g> ئىنكاس يوق.\n\nئۇنى تاقامسىز؟</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_activity_process"><xliff:g id="ACTIVITY">%1$s</xliff:g> پائالىيەتتە ئىنكاس يوق.\n\nئۇنى تاقامسىز؟</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_application_process"><xliff:g id="APPLICATION">%1$s</xliff:g> ئىنكاس يوق. ئۇنى تاقامسىز؟</string>
+  <!-- Text of the alert that is displayed when an application is not responding. -->
   <string name="anr_process"><xliff:g id="PROCESS">%1$s</xliff:g> جەرياندا ئىنكاس يوق.\n\nئۇنى تاقامسىز؟</string>
+  <!-- Button allowing the user to close an application that is not responding. This will kill the application. -->
   <string name="force_close">جەزملە</string>
+  <!-- Button allowing the user to send a bug report for application which has encountered an error. -->
   <string name="report">دوكلات</string>
+  <!-- Button allowing the user to choose to wait for an application that is not responding to become responsive again. -->
   <string name="wait">كۈت</string>
+  <!-- Text of the alert that is displayed when a web page is not responding. [CHAR-LIMIT=NONE] -->
   <string name="webpage_unresponsive">بۇ بەتنىڭ ئىنكاسى ئاستىلاپ كەتتى.\n\nئۇنى تاقامسىز؟</string>
+  <!-- [CHAR LIMIT=25] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_title">ئەپ قايتا نىشانلاندى</string>
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_replace"><xliff:g id="APP_NAME">%1$s</xliff:g> ئىجرا قىلىنىۋاتىدۇ.</string>
+  <!-- [CHAR LIMIT=50] Title of the alert when application launches on top of another. -->
   <string name="launch_warning_original"><xliff:g id="APP_NAME">%1$s</xliff:g> قوزغىتىلدى.</string>
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
   <string name="screen_compat_mode_scale">نىسبىتى</string>
+  <!-- [CHAR LIMIT=50] Compat mode dialog: compat mode switch label. -->
   <string name="screen_compat_mode_show">ھەمىشە كۆرسەت</string>
+  <!-- [CHAR LIMIT=200] Compat mode dialog: hint to re-enable compat mode dialog. -->
   <string name="screen_compat_mode_hint">سىستېما تەڭشەكلەر &gt; ئەپلەر &gt; چۈشۈرگەنلەردىن بۇ ھالەتنى قايتا قوزغىتىدۇ.</string>
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
   <string name="smv_application"><xliff:g id="APPLICATION">%1$s</xliff:g> ئەپ (جەريان: <xliff:g id="PROCESS">%2$s</xliff:g>) ئۆزلۈكىدىن ئىجرا قىلىدىغان مەجبۇرىي ھالەت تەدبىرىگە خىلاپلىق قىلدى.</string>
+  <!-- Text of the alert that is displayed when an application has violated StrictMode. -->
   <string name="smv_process"><xliff:g id="PROCESS">%1$s</xliff:g> جەريان ئۆزلۈكىدىن ئىجرا قىلىدىغان مەجبۇرىي ھالەت تەدبىرىگە خىلاپلىق قىلدى</string>
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when performing a system upgrade. -->
   <string name="android_upgrading_title">Android يۈكسىلىۋاتىدۇ…</string>
+  <!-- [CHAR LIMIT=40] Title of dialog that is shown when system is starting. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog when doing an fstrim. -->
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk that is optimized. -->
   <string name="android_upgrading_apk"><xliff:g id="NUMBER_1">%2$d</xliff:g> ئەپتىن <xliff:g id="NUMBER_0">%1$d</xliff:g> نى ئەلالاشتۇرۇۋاتىدۇ.</string>
+  <!-- [CHAR LIMIT=NONE] Message shown in upgrading dialog for each .apk pre boot broadcast -->
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when reached the point of starting apps. -->
   <string name="android_upgrading_starting_apps">ئەپنى قوزغىتىۋاتىدۇ.</string>
+  <!-- [CHAR LIMIT=NONE] Message to show in upgrading dialog when the bulk of the upgrade work is done. -->
   <string name="android_upgrading_complete">قوزغىتىشنى تاماملاۋاتىدۇ.</string>
+  <!-- Notification text to tell the user that a heavy-weight application is running. -->
   <string name="heavy_weight_notification"><xliff:g id="APP">%1$s</xliff:g> ئىجرا قىلىنىۋاتىدۇ</string>
+  <!-- Notification details to tell the user that a heavy-weight application is running. -->
   <string name="heavy_weight_notification_detail">چېكىلسە ئەپكە ئالمىشىدۇ</string>
+  <!-- Title of dialog prompting whether user wants to switch between heavy-weight apps. -->
   <string name="heavy_weight_switcher_title">ئەپ ئالماشتۇرامدۇ؟</string>
+  <!-- Descriptive text for switching to a new heavy-weight application. -->
   <string name="heavy_weight_switcher_text">باشقا بىر ئەپ ئىجرا قىلىنىۋاتىدۇ، يېڭى ئەپ ئىجرا قىلىش ئۈچۈن شۇ ئەپنى توختىتىشىڭىز كېرەك.</string>
   <string name="old_app_action"><xliff:g id="OLD_APP">%1$s</xliff:g> غا قايت</string>
   <string name="old_app_description">يېڭى ئەپنى قوزغاتما.</string>
   <string name="new_app_action"><xliff:g id="OLD_APP">%1$s</xliff:g> نى قوزغات</string>
   <string name="new_app_description">كونا ئەپنى ساقلىمايلا توختات.</string>
+  <!-- Notification text to tell the user that a process has exceeded its memory limit. -->
+  <!-- Notification details to tell the user that a process has exceeded its memory limit. -->
+  <!-- Title of dialog prompting the user to share a heap dump. -->
+  <!-- Text of dialog prompting the user to share a heap dump. -->
+  <!-- Displayed in the title of the chooser for things to do with text that
+         is to be sent to another application. For example, I can send
+         text through SMS or IM.  A dialog with those choices would be shown,
+         and this would be the title. -->
   <string name="sendText">تېكىستكە ئېلىپ بېرىلىدىغان مەشغۇلاتنى تاللاڭ</string>
+  <!-- Title of the dialog where the user is adjusting the phone ringer volume -->
   <string name="volume_ringtone">قوڭغۇراق ئاۋازى</string>
+  <!-- Title of the dialog where the user is adjusting the music volume -->
   <string name="volume_music">ۋاسىتە ئاۋازى</string>
+  <!-- Hint shown in the volume toast to inform the user that the media audio is playing through Bluetooth. -->
   <string name="volume_music_hint_playing_through_bluetooth">كۆكچىشتا قويۇۋاتىدۇ</string>
+  <!-- Hint shown in the volume toast to inform the user that the current ringtone is the silent ringtone. -->
   <string name="volume_music_hint_silent_ringtone_selected">ئۈنسىز قوڭغۇراق تەڭشىكى</string>
+  <!-- Title of the dialog where the user is adjusting the phone call volume -->
   <string name="volume_call">سۆزلىشىش ئاۋازى</string>
+  <!-- Title of the dialog where the user is adjusting the phone call volume when connected on bluetooth-->
   <string name="volume_bluetooth_call">كۆكچىش ئىشلەتكەندىكى سۆزلىشىش ئاۋازى</string>
+  <!-- Title of the dialog where the user is adjusting the audio volume for alarms -->
   <string name="volume_alarm">قوڭغۇراق ئاۋازى</string>
+  <!-- Title of the dialog where the user is adjusting the audio volume for notifications -->
   <string name="volume_notification">ئۇقتۇرۇش ئاۋازى</string>
+  <!-- Title of the dialog where the user is adjusting the general audio volume -->
   <string name="volume_unknown">ئاۋاز مىقدارى</string>
+  <!-- Content description for bluetooth volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_bluetooth">كۆكچىش ئاۋازى</string>
+  <!-- Content description for ringer volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_ringer">قوڭغۇراق ئاۋازى</string>
+  <!-- Content description for in-call volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_incall">چاقىرىش ئاۋازى</string>
+  <!-- Content description for media volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_media">ۋاسىتە ئاۋازى</string>
+  <!-- Content description for notification volume icon [CHAR LIMIT=100] -->
   <string name="volume_icon_description_notification">ئۇقتۇرۇش ئاۋازى</string>
+  <!-- Ringtone picker strings -->
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. -->
   <string name="ringtone_default">كۆڭۈلدىكى قوڭغۇراق ئاۋازى</string>
+  <!-- Choice in the ringtone picker.  If chosen, the default ringtone will be used. This fills in the actual ringtone's title into the message. -->
   <string name="ringtone_default_with_actual">كۆڭۈلدىكى قوڭغۇراق ئاۋازى (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)</string>
+  <!-- Choice in the ringtone picker.  If chosen, there will be silence instead of a ringtone played. -->
   <string name="ringtone_silent">يوق</string>
+  <!-- The title of the ringtone picker dialog. -->
   <string name="ringtone_picker_title">قوڭغۇراق ئاۋازى</string>
+  <!-- If there is ever a ringtone set for some setting, but that ringtone can no longer be resolved, t his is shown instead.  For example, if the ringtone was on a SD card and it had been removed, this woudl be shown for ringtones on that SD card. -->
   <string name="ringtone_unknown">نامەلۇم قوڭغۇراق ئاۋازى</string>
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's title. -->
+  <plurals name="wifi_available">
+    <item quantity="other">ئىشلىتىلىشچان Wi-Fi تورى بار</item>
+  </plurals>
+  <!-- A notification is shown when there are open wireless networks nearby.  This is the notification's message. -->
+  <plurals name="wifi_available_detailed">
+    <item quantity="other">ئىشلىتىلىشچان Wi-Fi تورىنى ئاچ</item>
+  </plurals>
+  <!-- A notification is shown when a wifi captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's title. -->
+  <!-- A notification is shown when a captive portal network is detected.  This is the notification's message. -->
   <string name="network_available_sign_in_detailed"><xliff:g id="network_ssid">%1$s</xliff:g></string>
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's title. -->
+  <!-- A notification is shown when the user connects to a Wi-Fi network and the system detects that that network has no Internet access. This is the notification's message. -->
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  This is the notification's title / ticker. -->
   <string name="wifi_watchdog_network_disabled">Wi-Fi تورىغا باغلىنالمايدۇ</string>
+  <!-- A notification is shown when a user's selected SSID is later disabled due to connectivity problems.  The complete alert msg is: <hotspot name> + this string, i.e. "Linksys has a poor internet connection" -->
   <string name="wifi_watchdog_network_disabled_detailed"> ئىنتېرنېت باغلىنىشى ناچار</string>
+  <!-- Do not translate. Default access point SSID used for tethering -->
+  <!-- A notification is shown the first time a connection is attempted on an app owned AP -->
+  <!-- title for this message -->
+  <!-- message explaining who is connecting to what -->
+  <!-- default application in case name can not be found -->
   <string name="wifi_p2p_dialog_title">Wi-Fi Direct</string>
   <string name="wifi_p2p_turnon_message">Wi-Fi Direct مەشغۇلاتىنى قوزغات. بۇ مەشغۇلات Wi-Fi خېرىدارى/قىزىق نۇقتا مەشغۇلاتىنى تاقايدۇ.</string>
   <string name="wifi_p2p_failed_message">Wi-Fi Direct نى قوزغىتالمايدۇ</string>
@@ -783,74 +1833,210 @@
   <string name="wifi_p2p_show_pin_message">PIN:</string>
   <string name="wifi_p2p_frequency_conflict_message" product="tablet">تاختا كومپيۇتېر <xliff:g id="DEVICE_NAME">%1$s</xliff:g> غا باغلانغاندا Wi-FI باغلىنىشىنى ۋاقىتلىق ئۈزىدۇ</string>
   <string name="wifi_p2p_frequency_conflict_message" product="default">تېلېفون <xliff:g id="DEVICE_NAME">%1$s</xliff:g> غا باغلانغاندا Wi-FI باغلىنىشىنى ۋاقىتلىق ئۈزىدۇ</string>
+  <!-- Name of the dialog that lets the user choose an accented character to insert -->
   <string name="select_character">ھەرپ قىستۇر</string>
+  <!-- SMS per-application rate control Dialog -->
+  <!-- SMS_DIALOG: An SMS dialog is shown if an application tries to send too many SMSes.  This is the title of that dialog. -->
   <string name="sms_control_title">قىسقا ئۇچۇر يوللاۋاتىدۇ</string>
+  <!-- See SMS_DIALOG.  This is the message shown in that dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_control_message">&lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; كۆپ مىقداردا قىسقا ئۇچۇر يوللاۋاتىدۇ. بۇ ئەپنىڭ قىسقا ئۇچۇر يوللاشنى داۋاملاشتۇرۇشىغا يول قويامسىز؟</string>
+  <!-- See SMS_DIALOG.  This is a button choice to allow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_yes">يول قوي</string>
+  <!-- See SMS_DIALOG.  This is a button choice to disallow sending the SMSes. [CHAR LIMIT=30] -->
   <string name="sms_control_no">رەت قىل</string>
+  <!-- SMS short code verification dialog. -->
+  <!-- The message text for the SMS short code confirmation dialog. [CHAR LIMIT=NONE] -->
   <string name="sms_short_code_confirm_message">بىر ئۇچۇرنى &lt;b&gt;<xliff:g id="APP_NAME">%1$s</xliff:g>&lt;/b&gt; ئۆزى &lt;b&gt;<xliff:g id="DEST_ADDRESS">%2$s</xliff:g>&lt;/b&gt; غا يوللىماقچى.</string>
+  <!-- Message details for the SMS short code confirmation dialog (possible premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Message details for the SMS short code confirmation dialog (premium short code). [CHAR LIMIT=NONE] -->
+  <!-- Text of the approval button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_allow">يوللا</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_deny">ۋاز كەچ</string>
+  <!-- Text of the checkbox for the SMS short code confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="sms_short_code_remember_choice">تاللىشىمنى ئەستە تۇت</string>
+  <!-- Text shown when remember checkbox is checked to inform the user how they may undo the setting. [CHAR LIMIT=40] -->
   <string name="sms_short_code_remember_undo_instruction">كېيىن بۇنى تەڭشەكلەر › ئەپلەردىن ئۆزگەرتەلەيسىز</string>
+  <!-- Text of the approval button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_always_allow">ھەمىشە يول قوي*</string>
+  <!-- Text of the cancel button for the SMS short code confirmation dialog when checkbox is checked. [CHAR LIMIT=30] -->
   <string name="sms_short_code_confirm_never_allow">ھەرگىز يول قويما</string>
+  <!-- SIM swap and device reboot Dialog -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_removed_title">SIM كارتا چىقىرىۋېتىلدى</string>
+  <!-- See SIM_REMOVED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_REMOVED_DIALOG.  This is the button of that dialog. -->
   <string name="sim_done_button">تامام</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the title of that dialog. -->
   <string name="sim_added_title">SIM كارتا قوشۇلدى</string>
+  <!-- See SIM_ADDED_DIALOG.  This is the message of that dialog. -->
+  <!-- See SIM_ADDED_DIALOG.  This is the button of that dialog. -->
   <string name="sim_restart_button">قايتا قوزغات</string>
+  <!-- Date/Time picker dialogs strings -->
+  <!-- The title of the time picker dialog. [CHAR LIMIT=NONE] -->
   <string name="time_picker_dialog_title">ۋاقىت تەڭشەك</string>
+  <!-- The title of the date picker dialog. [CHAR LIMIT=NONE] -->
   <string name="date_picker_dialog_title">چېسلا تەڭشەك</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_set">تەڭشەك</string>
+  <!-- Name of the button in the date/time picker to accept the date/time change -->
   <string name="date_time_done">تامام</string>
+  <!-- Security Permissions strings-->
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
   <string name="perms_new_perm_prefix"><font size="12" fgcolor="#ff33b5e5">\"يېڭى: \"</font></string>
+  <!-- Text that is placed at the front of a permission name that is being added to an app [CHAR LIMIT=NONE] -->
   <string name="perms_description_app">تەمىنلىگۈچى <xliff:g id="APP_NAME">%1$s</xliff:g>.</string>
+  <!-- Shown for an application when it doesn't require any permission grants. -->
   <string name="no_permissions">ھىچقانداق ھوقۇق كېرەك ئەمەس</string>
+  <!-- [CHAR LIMIT=NONE] Additional text in permission description for perms that can cost money. -->
   <string name="perm_costs_money">بۇنىڭغا چىقىم پەيدا بولۇشى مۇمكىن</string>
+  <!-- USB storage dialog strings -->
+  <!-- This is the title for the activity's window. -->
   <string name="usb_storage_activity_title">يۇقىرى سىغىملىق USB ساقلىغۇچ</string>
+  <!-- See USB_STORAGE.  USB_STORAGE_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to mount.  This is the title. -->
   <string name="usb_storage_title">USB ئۇلاندى</string>
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_message" product="nosdcard">سىز USB ئارقىلىق كومپيۇتېرنى ئۇلىدىڭىز. كومپيۇتېر بىلەن ئاندىرويىد USB ساقلىغۇچ ئارىسىدا ھۆججەت كۆچۈرمەكچى بولسىڭىز، تۆۋەندىكى توپچىنى بېسىڭ.</string>
+  <!-- See USB_STORAGE.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_message" product="default">سىز USB ئارقىلىق كومپيۇتېرنى ئۇلىدىڭىز. كومپيۇتېر بىلەن ئاندىرويىد SD كارتا ئارىسىدا ھۆججەت كۆچۈرمەكچى بولسىڭىز، تۆۋەندىكى توپچىنى بېسىڭ.</string>
+  <!-- See USB_STORAGE.    This is the button text to mount the phone on the computer. -->
   <string name="usb_storage_button_mount">USB ساقلىغۇچنى ئاچ</string>
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_error_message" product="nosdcard">USB ساقلىغۇچنى USB ساقلىغۇچ سۈپىتىدە ئاچقاندا مەسىلە كۆرۈلدى.</string>
+  <!-- See USB_STORAGE_DIALOG.  If there was an error mounting, this is the text. -->
   <string name="usb_storage_error_message" product="default">SD كارتىڭىزنى USB ساقلىغۇچ سۈپىتىدە ئاچقاندا مەسىلە كۆرۈلدى.</string>
+  <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across.  This is the title -->
   <string name="usb_storage_notification_title">USB ئۇلاندى</string>
+  <!-- See USB_STORAGE. This is the message. -->
   <string name="usb_storage_notification_message">ھۆججەتنى كومپيۇتېرغا كۆچۈرۈش ياكى كومپيۇتېردىن ساقلىغۇچقا كۆچۈرۈشنى تاللاڭ.</string>
+  <!-- USB_STORAGE_STOP: While USB storage is enabled, we show a notification dialog asking if he wants to stop. This is the title -->
   <string name="usb_storage_stop_notification_title">USB ساقلىغۇچنى تاقا</string>
+  <!-- See USB_STORAGE. This is the message. -->
   <string name="usb_storage_stop_notification_message">چېكىسلە USB ساقلىغۇچنى تاقايدۇ.</string>
+  <!-- USB storage stop dialog strings -->
+  <!-- This is the label for the activity, and should never be visible to the user. -->
+  <!-- See USB_STORAGE_STOP.  USB_STORAGE_STOP_DIALOG:  After the user selects the notification, a dialog is shown asking if he wants to stop usb storage.  This is the title. -->
   <string name="usb_storage_stop_title">USB ساقلىغۇچ ئىشلىتىلىۋاتىدۇ </string>
+  <!-- See USB_STORAGE_STOP.    This is the message. [CHAR LIMIT=NONE] -->
   <string name="usb_storage_stop_message" product="nosdcard">USB ساقلىغۇچنى تاقاشتىن ئىلگىرى، كومپيۇتېردىن Android نىڭ USB ساقلىغۇچنى ئېگەرسىزلەپ (\"قاڭقىت\")قانلىقىڭىزنى تەكشۈرۈڭ.</string>
+  <!-- See USB_STORAGE_STOP.    This is the message. -->
   <string name="usb_storage_stop_message" product="default">USB ساقلىغۇچنى تاقاشتىن ئىلگىرى، كومپيۇتېردىن Android نىڭ SD ساقلىغۇچىسىنى ئېگەرسىزلەپ (\"قاڭقىت\")قانلىقىڭىزنى تەكشۈرۈڭ.</string>
+  <!-- See USB_STORAGE_STOP.    This is the button text to stop usb storage. -->
   <string name="usb_storage_stop_button_mount">USB ساقلىغۇچنى تاقا</string>
+  <!-- See USB_STORAGE_STOP_DIALOG.  If there was an error stopping, this is the text. -->
   <string name="usb_storage_stop_error_message">USB ساقلىغۇچنى تاقاشتا مەسىلە كۆرۈلدى. USB نى چىقىرىۋەتكەنلىكىڭىزنى تەكشۈرۈپ، قايتا سىناڭ.</string>
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog  -->
   <string name="dlg_confirm_kill_storage_users_title">USB ساقلىغۇچنى تاقا</string>
+  <!-- USB_STORAGE_KILL_STORAGE_USERS dialog message text -->
   <string name="dlg_confirm_kill_storage_users_text">ئەگەر سىز USB ساقلىغۇچنى ئاچسىڭىز، ئىشلىتىلىۋاتقان پىروگراممىلار ئىشتىن توختايدۇ ھەم USB نى تاقىغاندىن كېيىن ئاندىن قايتا ئىشلەيدۇ.</string>
+  <!-- USB_STORAGE_ERROR dialog  dialog-->
   <string name="dlg_error_title">USB مەشغۇلاتى مەغلۇب بولدى.</string>
+  <!-- USB_STORAGE_ERROR dialog  ok button-->
   <string name="dlg_ok">جەزملە</string>
+  <!-- USB_PREFERENCES: Notification for when the user connected to the charger only.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in PTP mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when the user connects the phone to a computer via USB in MIDI mode.  This is the title -->
+  <!-- USB_PREFERENCES: Notification for when a USB accessory is attached.  This is the title -->
   <string name="usb_accessory_notification_title">USB زاپچاس سۈپىتىدە باغلاندى</string>
+  <!-- See USB_PREFERENCES. This is the message. -->
+  <!-- Title of notification shown when ADB is actively connected to the phone. -->
   <string name="adb_active_notification_title">USB سازلاش ئۇلاندى</string>
+  <!-- Message of notification shown when ADB is actively connected to the phone. -->
   <string name="adb_active_notification_message">چېكىلسە USB سازلاش چەكلىنىدۇ.</string>
+  <!-- Used to replace %s in urls retreived from the signin server with locales.  For Some        -->
+  <!-- devices we don't support all the locales we ship to and need to replace the '%s' with a    -->
+  <!-- locale string based on mcc values.  By default (0-length string) we don't replace the %s   -->
+  <!-- at all and later replace it with a locale string based on the users chosen locale          -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. -->
+  <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] -->
+  <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical
+         keyboard is connected[CHAR LIMIT=25] -->
+  <!-- Title of the physical keyboard category in the input method selector [CHAR LIMIT=10] -->
   <string name="hardware">قاتتىق دېتال</string>
+  <!-- Title of the notification to prompt the user to select a keyboard layout. -->
   <string name="select_keyboard_layout_notification_title">ھەرپتاختا ئورۇنلاشتۇرۇشىنى تاللاڭ.</string>
+  <!-- Message of the notification to prompt the user to select a keyboard layout. -->
   <string name="select_keyboard_layout_notification_message">چېكىپ ھەرپتاختا ئورۇنلاشتۇرۇلۇشىدىن بىرنى تاللاڭ.</string>
   <string name="fast_scroll_alphabet"> ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="fast_scroll_numeric_alphabet"> 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
   <string name="candidates_style"><u>"نامزات"</u></string>
+  <!-- External media notification strings -->
+  <!-- Notification title when external media is being checked [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is being checked [CHAR LIMIT=NONE] -->
+  <!-- Notification body when new external media is detected [CHAR LIMIT=NONE] -->
+  <!-- Notification body when external media is ready for use [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmountable (corrupt) [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmountable (corrupt) [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsupported [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsupported [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unsafely removed [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unsafely removed [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=NONE] -->
+  <!-- Notification title when external media is unmounting [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is unmounting [CHAR LIMIT=NONE] -->
+  <!-- Notification action to setup external media [CHAR LIMIT=20] -->
+  <!-- Notification action to unmount external media [CHAR LIMIT=20] -->
+  <!-- Notification action to browse external media [CHAR LIMIT=20] -->
+  <!-- Notification title when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification body when external media is missing [CHAR LIMIT=30] -->
+  <!-- Notification title when moving an application to external storage [CHAR LIMIT=30] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage [CHAR LIMIT=64] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=32] -->
+  <!-- Notification title when moving data to external storage failed [CHAR LIMIT=64] -->
+  <!-- Short summary of storage media status when removed [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when checking [CHAR LIMIT=32] -->
   <string name="ext_media_status_checking">تەكشۈرۈۋاتىدۇ…</string>
+  <!-- Short summary of storage media status when mounted [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when mounted read-only [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when removed unsafely [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unmountable [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when unsupported [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when ejecting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when formatting [CHAR LIMIT=32] -->
+  <!-- Short summary of storage media status when missing [CHAR LIMIT=32] -->
+  <!-- Shown in LauncherActivity when the requested target Intent didn't return any matching Activities, leaving the list empty. -->
   <string name="activity_list_empty">ماس كەلگۈدەك پائالىيەت تاپالمىدى</string>
-  <string name="permlab_route_media_output">ۋاستە چىقىرىش يولىنى ئۆزگەرت</string>
+  <!-- Title of an application permission that lets an application route media output. -->
+  <!-- Description of an application permission that lets an application route media output. -->
   <string name="permdesc_route_media_output">ئەپنىڭ ۋاستە چىقىرىش يولىنى ئۆزگەرتىپ باشقا سىرتقى ئۈسكۈنىگە چىقىرىشىغا يول قويىدۇ.</string>
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Title of an application permission that lets it read install sessions. -->
+  <!-- Description of an application permission that lets it read install sessions. -->
+  <!-- Shown in the tutorial for tap twice for zoom control. -->
   <string name="tutorial_double_tap_to_zoom_message_short">قوش چىكىپ يىراق-يېقىنلىقىنى باشقۇرغىلى بولىدۇ.</string>
+  <!-- Shown in gadget hosts (e.g. the home screen) when there was an error inflating
+    the gadget. -->
   <string name="gadget_host_error_inflating">ئەپچە قوشالمىدى</string>
+  <!-- Long label for a button on a full-screen input method for the "Go" action. -->
   <string name="ime_action_go">يۆتكەل</string>
+  <!-- Long label for a button on a full-screen input method for the "Search" action. -->
   <string name="ime_action_search">ئىزدە</string>
+  <!-- Long label for a button on a full-screen input method for the "Send" action. -->
   <string name="ime_action_send">يوللا</string>
+  <!-- Long label for a button on a full-screen input method for the "Next" action. -->
   <string name="ime_action_next">كېيىنكى</string>
+  <!-- Long label for a button on a full-screen input method for the "Done" action. -->
   <string name="ime_action_done">تامام</string>
+  <!-- [CHAR LIMIT=6] Long label for a button on a full-screen input method for the "Previous" action. -->
   <string name="ime_action_previous">ئالدىنقى</string>
+  <!-- Long label for a button on a full-screen input method for an unknown action. -->
   <string name="ime_action_default">ئىجرا قىل</string>
+  <!-- Strings for search suggestions. These are going here because they are referenced by both
+         ContactsProvider and GoogleContactsProvider -->
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you dial the phone number you typed.  The first line will be in bigger type than the second. -->
   <string name="dial_number_using"><xliff:g id="NUMBER">%s</xliff:g> دا نومۇر بۇرا</string>
+  <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed.  The first line will be in bigger type than the second. -->
   <string name="create_contact_using"><xliff:g id="NUMBER">%s</xliff:g> دا ئالاقەداش قۇر</string>
+  <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale. The wifi regulatory domain is extracted from the locale information. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array -->
+  <!-- An Array of [[Carrier-ID]                     -->
+  <!--              [default-locale]]                -->
   <string name="grant_credentials_permission_message_header">تۆۋەندىكى بىر ياكى بىرقانچە ئەپ سىزنىڭ ھىساباتىڭىزنى زىيارەت قىلىش ھوقۇقىنى تەلەپ قىلىۋاتىدۇ.</string>
   <string name="grant_credentials_permission_message_footer">بۇ ئىلتىماسقا يول قويامسىز؟</string>
   <string name="grant_permissions_header_text">ئىلتىماسقا يول قوي</string>
@@ -858,290 +2044,728 @@
   <string name="deny">رەت قىل</string>
   <string name="permission_request_notification_title">ئىلتىماس قىلغان ھوقۇق</string>
   <string name="permission_request_notification_with_subtitle"><xliff:g id="ACCOUNT">%s</xliff:g> ھېساباتقا\nھوقۇق ئىلتىماس قىلدى.</string>
+  <!-- Message to show when an intent automatically switches users into the personal profile. -->
+  <!-- Message to show when an intent automatically switches users into a work profile. -->
+  <!-- Label to show for a service that is running because it is an input method. -->
   <string name="input_method_binding_label">كىرگۈزگۈچ</string>
+  <!-- Label to show for a service that is running because it is a sync adapter. -->
   <string name="sync_binding_label">قەدەمداش</string>
+  <!-- Label to show for a service that is running because it is an accessibility module. -->
   <string name="accessibility_binding_label">قوشۇمچە ئىقتىدار</string>
+  <!-- Label to show for a service that is running because it is a wallpaper. -->
   <string name="wallpaper_binding_label">تام قەغىزى</string>
+  <!-- Dialog title for user to select a different wallpaper from service list -->
   <string name="chooser_wallpaper">تام قەغەز ئۆزگەرت</string>
+  <!-- Label to show for a service that is running because it is observing
+         the user's notifications. -->
   <string name="notification_listener_binding_label">ئۇقتۇرۇش تىڭشىغۇچ</string>
+  <!-- Label to show for a service that is running because it is providing conditions. -->
+  <!-- Do Not Translate: Alternate eri.xml -->
+  <!-- The title of the notification when VPN is active. -->
   <string name="vpn_title">VPN ئاكتىپلاندى</string>
+  <!-- The title of the notification when VPN is active with an application name. -->
   <string name="vpn_title_long">VPN نى <xliff:g id="APP">%s</xliff:g> ئاكتىپلىدى</string>
+  <!-- The text of the notification when VPN is active. -->
   <string name="vpn_text">چېكىلسە تورنى باشقۇرىدۇ.</string>
+  <!-- The text of the notification when VPN is active with a session name. -->
   <string name="vpn_text_long"><xliff:g id="SESSION">%s</xliff:g> غا باغلاندى. چېكىلسە تورنى باشقۇرىدۇ.</string>
+  <!-- Notification title when connecting to lockdown VPN. -->
   <string name="vpn_lockdown_connecting">ھەمىشە ئوچۇق VPN غا باغلىنىۋاتىدۇ…</string>
+  <!-- Notification title when connected to lockdown VPN. -->
   <string name="vpn_lockdown_connected">ھەمىشە ئوچۇق VPN غا باغلاندى</string>
+  <!-- Notification title when error connecting to lockdown VPN. -->
   <string name="vpn_lockdown_error">ھەمىشە ئوچۇق VPN خاتالىقى</string>
+  <!-- Notification body that indicates user can touch to configure lockdown VPN connection. -->
   <string name="vpn_lockdown_config">چېكىلسە سەپلەيدۇ</string>
+  <!-- Localized strings for WebView -->
+  <!-- Label for button in a WebView that will open a chooser to choose a file to upload -->
   <string name="upload_file">ھۆججەت تاللاڭ</string>
+  <!-- Label for the file upload control when no file has been chosen yet -->
   <string name="no_file_chosen">ھۆججەت تاللانمىغان</string>
+  <!-- Label for <input type="reset"> button in html -->
   <string name="reset">ئەسلىگە قايتۇر</string>
+  <!-- Label for <input type="submit"> button in html -->
   <string name="submit">تاپشۇر</string>
+  <!-- Strings for car mode notification -->
+  <!-- Shown when car mode is enabled -->
   <string name="car_mode_disable_notification_title">ماشىنا ھالىتى قوزغىتىلدى</string>
   <string name="car_mode_disable_notification_message">چېكىلسە ماشىنا ھالىتىدىن چېكىنىدۇ.</string>
+  <!-- Strings for tethered notification -->
+  <!-- Shown when the device is tethered -->
   <string name="tethered_notification_title">USB غا باغلاش ياكى قىزىق نۇقتىنى قوزغىتىش</string>
   <string name="tethered_notification_message">چېكىسلە تەڭشەيدۇ.</string>
+  <!--  Strings for possible PreferenceActivity Back/Next buttons -->
   <string name="back_button_label">قايت</string>
   <string name="next_button_label">كېيىنكى</string>
+  <!-- Optional button to Skip a PreferenceActivity [CHAR LIMIT=20] -->
   <string name="skip_button_label">ئاتلا</string>
+  <!-- Displayed on the Find dialog when there are no matches [CHAR LIMIT=NONE]-->
   <string name="no_matches">ماس كەلگىنى يوق</string>
+  <!-- Find dialog hint text.  Also used in the menu item to open find on page [CHAR LIMIT=NONE] -->
   <string name="find_on_page">بەتتىن ئىزدە</string>
+  <!-- Displayed on the Find dialog to display the index of the highlighted
+         match and total number of matches found in the current page. [CHAR LIMIT=NONE] -->
+  <plurals name="matches_found">
+    <!-- Case of one match -->
+    <!-- Case of multiple total matches -->
+    <item quantity="other">ماس كەلگىنى 1</item>
+  </plurals>
+  <!-- Label for the "Done" button on the far left of action mode toolbars. -->
   <string name="action_mode_done">تامام</string>
+  <!-- Strings for MasterClearReceiver. -->
+  <!-- Text for progress dialog while erasing USB storage volume [CHAR LIMIT=NONE] -->
   <string name="progress_erasing" product="nosdcard">USB ساقلىغۇچنى ئۆچۈرۈۋاتىدۇ…</string>
+  <!-- Text for progress dialog while erasing SD card [CHAR LIMIT=NONE] -->
   <string name="progress_erasing" product="default">SD كارتىنى ئۆچۈرۈۋاتىدۇ…</string>
+  <!-- Text for WebView's text selection Action Mode -->
+  <!-- ActionBar action to share the current selection [CHAR LIMIT=10] -->
   <string name="share">ھەمبەھىر</string>
+  <!-- ActionBar action to use the current selection to open the Find on page functionality [CHAR LIMIT=10]-->
   <string name="find">ئىزدە</string>
+  <!-- ActionBar action to use the current selection to perform a web search [CHAR-LIMIT=16] -->
   <string name="websearch">توردىن ئىزدە</string>
+  <!-- ActionBar action to find the next match in the page [CHAR LIMIT=24] -->
   <string name="find_next">كېيىنكىنى ئىزدە</string>
+  <!-- ActionBar action to find the previous match in the page [CHAR LIMIT=24] -->
   <string name="find_previous">ئالدىنقىنى ئىزدە</string>
+  <!-- Network positioning notification ticker. The name of the user (e.g. John Doe) who sent
+         the request is shown as a dynamic string. -->
   <string name="gpsNotifTicker"><xliff:g id="NAME">%s</xliff:g> نىڭ ئورۇن ئىلتىماسى</string>
+  <!-- Network positioning notification and verification title to inform the user about
+         an incoming location request. -->
   <string name="gpsNotifTitle">ئورۇن ئىلتىماسى</string>
+  <!-- Network positioning notification message. The name of the user (e.g. John Doe) and
+         service (SUPL-service) who sent the request is shown as dynamic strings.
+         Translation should not be longer than master text. -->
   <string name="gpsNotifMessage">ئىلتىماس قىلغۇچى <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)</string>
+  <!-- Network positioning verification Yes. Button to push to share location information. -->
   <string name="gpsVerifYes">ھەئە</string>
+  <!-- Network positioning verification No. Button to push to deny sharing of location
+         information. -->
   <string name="gpsVerifNo">ياق</string>
+  <!-- Error message when the sync tried to delete too many things -->
   <string name="sync_too_many_deletes">ئۆچۈرۈش چېكىدىن ئېشىپ كەتتى</string>
+  <!-- Dialog message for when there are too many deletes that would take place and we want user confirmation -->
   <string name="sync_too_many_deletes_desc">ھېسابات <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g> نىڭ <xliff:g id="TYPE_OF_SYNC">%1$d</xliff:g> دانە <xliff:g id="NUMBER_OF_DELETED_ITEMS">%2$s</xliff:g> غا ئائىت ئۆچۈرۈلگەن تۈرى بار. قانداق مەشغۇلات قىلىسىز؟</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to delete the items -->
   <string name="sync_really_delete">تۈرلەرنى ئۆچۈر.</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to undo the deletions -->
   <string name="sync_undo_deletes">ئۆچۈرۈشتىن يېنىۋال.</string>
+  <!-- Dialog action for when there are too many deletes that would take place and we want user confirmation, and the user wants to do nothing for now -->
   <string name="sync_do_nothing">ھازىر ھېچقانداق مەشغۇلات قىلما.</string>
+  <!-- Choose Account Activity label -->
   <string name="choose_account_label">بىر ھېسابات تاللاڭ</string>
   <string name="add_account_label">"بىر ھېسابات قوش"</string>
+  <!-- List item to add an account [CHAR LIMIT=20] -->
   <string name="add_account_button_label">ھېسابات قوش</string>
+  <!-- NumberPicker - accessibility support -->
+  <!-- Description of the button to increase the NumberPicker value. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_button">چوڭايت</string>
+  <!-- Description of the button to decrease the NumberPicker value. [CHAR LIMIT=NONE] -->
   <string name="number_picker_decrement_button">كىچىكلەت</string>
+  <!-- Description of the tap and hold action to get into scroll mode in NumberPicker. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_scroll_mode"><xliff:g id="VALUE">%s</xliff:g> نى چېكىپ بېسىڭ.</string>
+  <!-- Description of the scrolling action in NumberPicker. [CHAR LIMIT=NONE] -->
   <string name="number_picker_increment_scroll_action">ئۈستىگە سۈرۈلسە قىممىتى ئاشىدۇ، ئاستىغا سۈرۈلسە قىممىتى كېمىيىدۇ.</string>
+  <!-- TimePicker - accessibility support -->
+  <!-- Description of the button to increase the TimePicker's minute value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_minute_button">مىنۇت ئاشىدۇ</string>
+  <!-- Description of the button to decrease the TimePicker's minute value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_minute_button">مىنۇت كېمىيىدۇ</string>
+  <!-- Description of the button to increase the TimePicker's hour value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_hour_button">سائەت ئاشىدۇ</string>
+  <!-- Description of the button to decrease the TimePicker's hour value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_hour_button">سائەت كېمىيىدۇ</string>
+  <!-- Description of the button to increase the TimePicker's set PM value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_increment_set_pm_button">چ ك تەڭشەك</string>
+  <!-- Description of the button to decrease the TimePicker's set AM value. [CHAR LIMIT=NONE] -->
   <string name="time_picker_decrement_set_am_button">چ ب تەڭشەك</string>
+  <!-- DatePicker - accessibility support -->
+  <!-- Description of the button to increase the DatePicker's month value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_month_button">ئاي ئاشىدۇ</string>
+  <!-- Description of the button to decrease the DatePicker's month value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_month_button">ئاي كېمىيىدۇ</string>
+  <!-- Description of the button to increase the DatePicker's day value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_day_button">كۈن ئاشىدۇ</string>
+  <!-- Description of the button to decrease the DatePicker's day value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_day_button">كۈن كېمىيىدۇ</string>
+  <!-- Description of the button to increase the DatePicker's year value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_increment_year_button">يىل ئاشىدۇ</string>
+  <!-- Description of the button to decrease the DatePicker's year value. [CHAR LIMIT=NONE] -->
   <string name="date_picker_decrement_year_button">يىل كېمىيىدۇ</string>
+  <!-- Description of the button to move to the previous month. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button to move to the next month. [CHAR LIMIT=NONE] -->
+  <!-- KeyboardView - accessibility support -->
+  <!-- Description of the Alt button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_alt">Alt</string>
+  <!-- Description of the Cancel button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_cancel">ۋاز كەچ</string>
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">ئۆچۈر</string>
+  <!-- Description of the Done button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_done">تامام</string>
+  <!-- Description of the Mode change button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_mode_change">ھالەت ئۆزگەرت</string>
+  <!-- Description of the Shift button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_shift">Shift</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_enter">Enter</string>
+  <!-- ActivityChooserView - accessibility support -->
+  <!-- Description of the shwoing of a popup window with activities to choose from. [CHAR LIMIT=NONE] -->
   <string name="activitychooserview_choose_application">ئەپ تاللاڭ</string>
+  <!-- Error message if the share target app cannto be launched. [CHAR LIMIT=NONE] -->
   <string name="activitychooserview_choose_application_error">قوزغىتالمايدىغىنى <xliff:g id="application_name" example="Acme">%s</xliff:g></string>
+  <!-- ShareActionProvider - accessibility support -->
+  <!-- Description of the choose target button in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
   <string name="shareactionprovider_share_with">ھەمبەھىر</string>
+  <!-- Description of a share target (both in the list of such or the default share button) in a ShareActionProvider (share UI). [CHAR LIMIT=NONE] -->
   <string name="shareactionprovider_share_with_application"><xliff:g id="APPLICATION_NAME">%s</xliff:g> ئىلە ھەمبەھىر</string>
+  <!-- Slide lock screen -->
+  <!-- Description of the sliding handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="content_description_sliding_handle">"تۇتقۇچنى سۈرۈڭ. چېكىپ بېسىڭ."</string>
+  <!-- Description of the unlock handle in the Slide unlock screen for tablets. [CHAR LIMIT=NONE] -->
   <string name="description_target_unlock_tablet">سۈرۈلسە قۇلۇپ ئاچىدۇ.</string>
+  <!-- Announce that a headset is required to hear keyboard keys while typing a password. [CHAR LIMIT=NONE] -->
   <string name="keyboard_headset_required_to_hear_password">قۇلاقلىق قىستۇرۇلغاندىلا ئاندىن ئىم ئاۋازىنى ئاڭلىغىلى بولىدۇ.</string>
+  <!-- The value of a keyboard key announced when accessibility is enabled and no headsed is used. [CHAR LIMIT=NONE] -->
   <string name="keyboard_password_character_no_headset">چېكىت</string>
+  <!-- Content description for the action bar "home" affordance. [CHAR LIMIT=NONE] -->
   <string name="action_bar_home_description">يولباشچى باش بەت</string>
+  <!-- Content description for the action bar "up" affordance. [CHAR LIMIT=NONE] -->
   <string name="action_bar_up_description">ئۈستىگە يولباشچى</string>
+  <!-- Content description for the action menu overflow button. [CHAR LIMIT=NONE] -->
   <string name="action_menu_overflow_description">تېخىمۇ كۆپ تاللانما</string>
+  <!-- Formatting string for describing the action bar's title/home/up affordance.
+         This is a single tappable "button" that includes the app icon, the Up indicator
+         (usually a "<" chevron) and the window title text.
+         %1$s is the title. %2$s is the description of what tapping/clicking the whole
+         thing is going to do. -->
   <string name="action_bar_home_description_format">%1$s, %2$s</string>
+  <!-- Just like action_bar_home_description_format, but this one will be used
+         if the window is also providing subtitle text.
+         %1$s is the title. %2$s is the subtitle. %3$s is the description of what
+         tapping/clicking the whole thing is going to do. -->
   <string name="action_bar_home_subtitle_description_format">%1$s, %2$s, %3$s</string>
+  <!-- Storage description for internal storage. [CHAR LIMIT=NONE] -->
   <string name="storage_internal">ئىچىدىكى ساقلىغۇچ</string>
+  <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] -->
   <string name="storage_sd_card">SD كارتا</string>
+  <!-- Storage description for a SD card from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a generic USB drive. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for a USB drive from a specific manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Storage description for USB storage. [CHAR LIMIT=NONE] -->
   <string name="storage_usb">USB ساقلىغۇچ</string>
+  <!-- Notification title when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_warning_title">سانلىق مەلۇمات ئىشلىتىش ئاگاھلاندۇرۇشى</string>
+  <!-- Notification body when data usage has exceeded warning threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_warning_body">چېكىلسە ئىشلىتىلىشى ۋە تەڭشەكلەرنى كۆرسىتىدۇ</string>
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 4G data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when mobile data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification body when data usage has exceeded limit threshold, and has been disabled. [CHAR LIMIT=32] -->
+  <!-- Notification title when 2G-3G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_3g_limit_snoozed_title">2G-3G سانلىق مەلۇمات ئېقىمىدىن ئېشىپ كەتتى</string>
+  <!-- Notification title when 4G data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_4g_limit_snoozed_title">4G سانلىق مەلۇمات ئېقىمىدىن ئېشىپ كەتتى</string>
+  <!-- Notification title when mobile data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
+  <!-- Notification title when Wi-Fi data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_wifi_limit_snoozed_title">Wi-Fi سانلىق مەلۇمات ئېقىمىدىن ئېشىپ كەتتى</string>
+  <!-- Notification body when data usage has exceeded limit threshold. [CHAR LIMIT=32] -->
   <string name="data_usage_limit_snoozed_body"><xliff:g id="SIZE">%s</xliff:g> بەلگىلەنگەن چەكتىن ئېشىپ كەتتى</string>
+  <!-- Notification title when background data usage is limited. [CHAR LIMIT=32] -->
   <string name="data_usage_restricted_title">تەگلىك سانلىق مەلۇماتى چەكلىمىگە ئۇچرايدۇ</string>
+  <!-- Notification body when background data usage is limited. [CHAR LIMIT=32] -->
   <string name="data_usage_restricted_body">چېكىلسە چەكلىمە چىقىرىۋېتىلىدۇ.</string>
+  <!-- SSL Certificate dialogs -->
+  <!-- Title for an SSL Certificate dialog -->
   <string name="ssl_certificate">بىخەتەرلىك گۇۋاھنامىسى</string>
+  <!-- Message on an SSL Certificate dialog -->
   <string name="ssl_certificate_is_valid">بۇ گۇۋاھنامە كۈچكە ئىگە.</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_to">تارقىتىلغۇچى:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="common_name">ئورتاق ئات:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="org_name">تەشكىل:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="org_unit">تەشكىل بىرلىكى:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_by">تارقاتقۇچى:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="validity_period">ئۈنۈملۈكلۈكى:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="issued_on">تارقاتقان ۋاقىت:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="expires_on">توشىدىغان ۋاقىت:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="serial_number">تەرتىپ نومۇرى:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="fingerprints">بارماق ئىزى:</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="sha256_fingerprint">SHA-256 بارماق ئىزى</string>
+  <!-- Label for an information field on an SSL Certificate Dialog -->
   <string name="sha1_fingerprint">SHA-1 بارماق ئىزى</string>
+  <!-- Title for a button to expand the list of activities in ActivityChooserView [CHAR LIMIT=25] -->
   <string name="activity_chooser_view_see_all">ھەممىنى كۆرسەت</string>
+  <!-- Title default for a dialog showing possible activities in ActivityChooserView [CHAR LIMIT=25] -->
   <string name="activity_chooser_view_dialog_title_default">پائالىيەت تاللاڭ</string>
+  <!-- Title for a dialog showing possible activities for sharing in ShareActionProvider [CHAR LIMIT=25] -->
   <string name="share_action_provider_share_with">ھەمبەھىر</string>
+  <!-- Delimeter used between each item in a textual list; for example "Alpha, Beta". [CHAR LIMIT=3] -->
   <string name="list_delimeter">"« ،»"</string>
+  <!-- STK sending DTMF, SMS, USSD, SS -->
   <string name="sending">يوللاۋاتىدۇ…</string>
+  <!-- STK launch Browser -->
   <string name="launchBrowserDefault">توركۆرگۈ قوزغىتامدۇ؟</string>
+  <!-- STK setup Call -->
   <string name="SetupCallDefault">چاقىرىشنى قوبۇللامسىز؟</string>
+  <!-- Title for a button to choose the currently selected activity
+         as the default in the activity resolver. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_always">ھەمىشە</string>
+  <!-- Title for a button to choose the currently selected activity
+         from the activity resolver to use just this once. [CHAR LIMIT=25] -->
   <string name="activity_resolver_use_once">بىر قېتىملا</string>
+  <!-- Text for the toast that is shown when the user clicks on a launcher that
+         doesn't support the work profile. [CHAR LIMIT=100] -->
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="tablet">تاختا كومپيۇتېر</string>
+  <!-- Name of the default audio route for tablets when nothing
+         is connected to a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
+  <!-- Name of the default audio route when nothing is connected to
+         a headphone or other wired audio output jack. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name" product="default">تېلېفون</string>
+  <!-- Name of the default audio route when wired headphones are
+         connected. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name_headphones">تىڭشىغۇچ</string>
+  <!-- Name of the default audio route when an audio dock is connected. [CHAR LIMIT=50] -->
   <string name="default_audio_route_name_dock_speakers">لەڭگەر ياڭراتقۇ</string>
+  <!-- Name of the default media route when HDMI is connected. [CHAR LIMIT=50] -->
   <string name="default_media_route_name_hdmi">HDMI</string>
+  <!-- Name of the default audio route category. [CHAR LIMIT=50] -->
   <string name="default_audio_route_category_name">سىستېما</string>
+  <!-- Description of the bluetooth a2dp audio route. [CHAR LIMIT=50] -->
   <string name="bluetooth_a2dp_audio_route_name">كۆكچىش ئاۋازى</string>
+  <!-- Description of a wireless display route. [CHAR LIMIT=50] -->
   <string name="wireless_display_route_description">سىمسىز كۆرسەتكۈچ</string>
+  <!-- Content description of a MediaRouteButton for accessibility support.
+        Cast is the standard android verb for sending content to a remote device. [CHAR LIMIT=50] -->
+  <!-- Title of the media route chooser dialog. [CHAR LIMIT=40] -->
   <string name="media_route_chooser_title">ئۈسكۈنىگە باغلىنىدۇ</string>
+  <!-- Title of the media route chooser dialog for selecting remote display routes. [CHAR LIMIT=40] -->
   <string name="media_route_chooser_title_for_remote_display">ئالمىشىش ئېكرانىدىن ئۈسكۈنىگە</string>
+  <!-- Placeholder text to show when no devices have been found. [CHAR LIMIT=50] -->
   <string name="media_route_chooser_searching">ئۈسكۈنىلەرنى ئىزدەۋاتىدۇ\u2026</string>
+  <!-- Button to access extended settings.  [CHAR LIMIT=30] -->
   <string name="media_route_chooser_extended_settings">تەڭشەكلەر</string>
+  <!-- Button to disconnect from a media route.  [CHAR LIMIT=30] -->
   <string name="media_route_controller_disconnect">ئۈز</string>
+  <!-- Status message for remote routes attempting to scan/determine availability -->
   <string name="media_route_status_scanning">تەكشۈرۈۋاتىدۇ…</string>
+  <!-- Status message for a remote route attempting to connect -->
   <string name="media_route_status_connecting">باغلىنىۋاتىدۇ…</string>
+  <!-- Status message for a remote route that is confirmed to be available for connection -->
   <string name="media_route_status_available">ئىشلىتىلىشچان</string>
+  <!-- Status message for remote routes that are not available for connection right now -->
   <string name="media_route_status_not_available">ئىشلەتكىلى بولمايدۇ</string>
+  <!-- Status message for a remote route that is in use (and thus unavailabe) right now -->
   <string name="media_route_status_in_use">ئىشلىتىلىۋاتىدۇ</string>
+  <!-- Display manager service -->
+  <!-- Name of the built-in display.  [CHAR LIMIT=50] -->
   <string name="display_manager_built_in_display_name">ئىچكى ئېكران</string>
+  <!-- Name of the HDMI display.  [CHAR LIMIT=50] -->
   <string name="display_manager_hdmi_display_name">بۇ HDMI ئېكران</string>
+  <!-- Name of the N'th overlay display for testing.  [CHAR LIMIT=50] -->
   <string name="display_manager_overlay_display_name">دەستىلەنمە ئېكران #<xliff:g id="ID">%1$d</xliff:g></string>
+  <!-- Title text to show within the overlay.  [CHAR LIMIT=50] -->
   <string name="display_manager_overlay_display_title"><xliff:g id="NAME">%1$s</xliff:g>：<xliff:g id="WIDTH">%2$d</xliff:g>x<xliff:g id="HEIGHT">%3$d</xliff:g>，<xliff:g id="DPI">%4$d</xliff:g> dpi</string>
+  <!-- Title text to append when the display is secure.  [CHAR LIMIT=30] -->
   <string name="display_manager_overlay_display_secure_suffix">، بىخەتەرلىك</string>
+  <!-- Keyguard strings -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">ئەندىزە ئۇنتۇلغان</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">ئەندىزە خاتا</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">ئىم خاتا</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">بۇ PIN خاتا</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown"><xliff:g id="NUMBER">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">قۇلۇپ ئاچىدىغان ئەندىزە سىزىڭ</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">كىرگۈزىدىغىنىڭىز SIM PIN</string>
+  <!-- Instructions for using the PIN unlock screen -->
   <string name="kg_pin_instructions">كىرگۈزىدىغىنىڭىز PIN</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">ئىم كىرگۈزۈڭ</string>
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint">بۇ SIM كارتا توختىتىلغان. PUK كودى كىرگۈزۈلگەندىلا ئاندىن ئىشلەتكىلى بولىدۇ. مۇناسىۋەتلىك تەپسىلاتلار ئۈچۈن مۇلازىمەت تەمىنلىگۈچىڭىز بىلەن ئالاقە قىلىڭ.</string>
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
   <string name="kg_puk_enter_pin_hint">لازىملىق PIN كودىنى كىرگۈزۈڭ</string>
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
   <string name="kg_enter_confirm_pin_hint">لازىملىق PIN كودىنى جەزملەڭ</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">SIM كارتا قۇلۇپىنى ئېچىۋاتىدۇ…</string>
+  <!-- Message shown when the user enters the wrong PIN code -->
   <string name="kg_password_wrong_pin_code">PIN كودى خاتا.</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">4-8 خانىلىق PIN نى كىرگۈزۈڭ.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">توغرا PUK كودىنى قايتا كىرگۈزۈڭ. ئەگەر خاتا كىرگۈزۈشنىڭ قېتىم سانى بەك كۆپ بولۇپ كەتسە SIM كارتا مەڭگۈلۈك توختىتىلىدۇ.</string>
+  <!-- String shown in PUK screen when PIN codes don't match -->
   <string name="kg_invalid_confirm_pin_hint" product="default">بۇ PIN كودى ماسلاشمىدى</string>
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
   <string name="kg_login_too_many_attempts">ئەندىزىسىنى سىناش قېتىم سانى بەك كۆپ بولۇپ كەتتى</string>
+  <!-- Instructions show in account unlock screen allowing user to enter their email password -->
   <string name="kg_login_instructions">قۇلۇپ ئېچىشتا، Google ھېساباتىڭىزدا تىزىمغا كىرىڭ</string>
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_username_hint">ئىشلەتكۈچى ئاتى(تورخەت)</string>
+  <!-- Hint shown in TextView in account unlock screen of keyguard -->
   <string name="kg_login_password_hint">ئىم</string>
+  <!-- Label shown on sign in button on account unlock screen of keyguard -->
   <string name="kg_login_submit_button">تىزىمغا كىر</string>
+  <!-- Message shown when the user enters an invalid username/password combination in account unlock screen of keyguard -->
   <string name="kg_login_invalid_input">ئىشلەتكۈچى ئاتى ۋە ياكى ئىم خاتا.</string>
+  <!-- Hint text shown when user has too many failed password attempts in account unlock screen of keyguard -->
   <string name="kg_login_account_recovery_hint">ئىشلەتكۈچى ئاتىڭىز ياكى ئىمنى ئۇنۇتتىڭىزمۇ؟\n\"<b>"google.com/accounts/recovery"</b>\" زىيارەت قىلىڭ.</string>
+  <!-- Message shown while device checks username/password in account unlock screen of keyguard -->
   <string name="kg_login_checking_password">ھېساباتنى تەكشۈرۈۋاتىدۇ…</string>
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
   <string name="kg_too_many_failed_pin_attempts_dialog_message">سىز PIN نى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
   <string name="kg_too_many_failed_password_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئىمنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
   <string name="kg_too_many_failed_pattern_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="tablet">سىز تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، تاختا كومپيۇتېرنى زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتۇرىدۇ، ھەممە ئىشلەتكۈچى سانلىق مەلۇماتلىرى يوقىلىدۇ.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. -->
   <string name="kg_failed_attempts_almost_at_wipe" product="default">سىز تېلېفون قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، تېلېفوننى زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتۇرىدۇ، ھەممە ئىشلەتكۈچى سانلىق مەلۇماتلىرى يوقىلىدۇ.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="tablet">سىز تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. تاختا كومپيۇتېر زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتىدۇ، </string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped -->
   <string name="kg_failed_attempts_now_wiping" product="default">سىز تېلېفون قۇلۇپىنى ئېچىشنى <xliff:g id="NUMBER">%d</xliff:g> قېتىم خاتا سىنىدىڭىز. تېلېفون زاۋۇتتىن چىققان ھالەتكە ئەسلىگە قايتىدۇ، </string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tablet">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما تورخەت ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ.\n\nيەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="default">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما تورخەت ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تېلېفون قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ.\n\nيەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Sequence of characters used to separate message strings in keyguard. Typically just em-dash
+         with spaces on either side. [CHAR LIMIT=3] -->
   <string name="kg_text_message_separator" product="default">" — "</string>
+  <!-- The delete-widget drop target button text -->
   <string name="kg_reordering_delete_drop_target_text">چىقىرىۋەت</string>
+  <!-- Message shown in dialog when user is attempting to set the music volume above the
+    recommended maximum level for headphones -->
+  <!-- Text spoken when the user is performing a gesture that will enable accessibility. [CHAR LIMIT=none] -->
   <string name="continue_to_enable_accessibility">ئىككى بارماقنى بېسىپ تۇرغاندا قوشۇمچە ئىقتىدارنى قوزغىتىدۇ.</string>
+  <!-- Text spoken when the user enabled accessibility. [CHAR LIMIT=none] -->
   <string name="accessibility_enabled">قوشۇمچە ئىقتىدار قوزغىتىلدى.</string>
+  <!-- Text spoken when the user stops preforming a gesture that would enable accessibility. [CHAR LIMIT=none] -->
   <string name="enable_accessibility_canceled">قوشۇمچە ئىقتىدار بىكار قىلىندى.</string>
+  <!-- Text spoken when the current user is switched if accessibility is enabled. [CHAR LIMIT=none] -->
   <string name="user_switched">نۆۋەتتىكى ئىشلەتكۈچى <xliff:g id="NAME">%1$s</xliff:g>.</string>
+  <!-- Message shown when switching to a user [CHAR LIMIT=none] -->
+  <!-- Default name of the owner user [CHAR LIMIT=20] -->
   <string name="owner_name" msgid="3879126011135546571">ئىگىدار</string>
+  <!-- Error message title [CHAR LIMIT=35] -->
   <string name="error_message_title">خاتالىق</string>
+  <!-- Message informing user that the change was disallowed by an administrator. [CHAR LIMIT=none] -->
+  <!-- Message informing user that the requested activity could not be found [CHAR LIMIT=none] -->
   <string name="app_not_found">بۇ مەشغۇلاتنى بىر تەرەپ قىلىدىغان ئەپ يوق</string>
   <string name="revoke">قايتۇرۇۋال</string>
+  <!-- Printing -->
+  <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" -->
   <string name="mediasize_iso_a0">ISO A0</string>
+  <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" -->
   <string name="mediasize_iso_a1">ISO A1</string>
+  <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" -->
   <string name="mediasize_iso_a2">ISO A2</string>
+  <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" -->
   <string name="mediasize_iso_a3">ISO A3</string>
+  <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" -->
   <string name="mediasize_iso_a4">ISO A4</string>
+  <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" -->
   <string name="mediasize_iso_a5">ISO A5</string>
+  <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" -->
   <string name="mediasize_iso_a6">ISO A6</string>
+  <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" -->
   <string name="mediasize_iso_a7">ISO A7</string>
+  <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" -->
   <string name="mediasize_iso_a8">ISO A8</string>
+  <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" -->
   <string name="mediasize_iso_a9">ISO A9</string>
+  <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" -->
   <string name="mediasize_iso_a10">ISO A10</string>
+  <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" -->
   <string name="mediasize_iso_b0">ISO B0</string>
+  <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" -->
   <string name="mediasize_iso_b1">ISO B1</string>
+  <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" -->
   <string name="mediasize_iso_b2">ISO B2</string>
+  <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" -->
   <string name="mediasize_iso_b3">ISO B3</string>
+  <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" -->
   <string name="mediasize_iso_b4">ISO B4</string>
+  <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" -->
   <string name="mediasize_iso_b5">ISO B5</string>
+  <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" -->
   <string name="mediasize_iso_b6">ISO B6</string>
+  <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" -->
   <string name="mediasize_iso_b7">ISO B7</string>
+  <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" -->
   <string name="mediasize_iso_b8">ISO B8</string>
+  <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" -->
   <string name="mediasize_iso_b9">ISO B9</string>
+  <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" -->
   <string name="mediasize_iso_b10">ISO B10</string>
+  <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" -->
   <string name="mediasize_iso_c0">ISO C0</string>
+  <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" -->
   <string name="mediasize_iso_c1">ISO C1</string>
+  <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" -->
   <string name="mediasize_iso_c2">ISO C2</string>
+  <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" -->
   <string name="mediasize_iso_c3">ISO C3</string>
+  <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" -->
   <string name="mediasize_iso_c4">ISO C4</string>
+  <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" -->
   <string name="mediasize_iso_c5">ISO C5</string>
+  <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" -->
   <string name="mediasize_iso_c6">ISO C6</string>
+  <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" -->
   <string name="mediasize_iso_c7">ISO C7</string>
+  <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" -->
   <string name="mediasize_iso_c8">ISO C8</string>
+  <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" -->
   <string name="mediasize_iso_c9">ISO C9</string>
+  <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" -->
   <string name="mediasize_iso_c10">ISO C10</string>
+  <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) -->
   <string name="mediasize_na_letter">خەت-چەك</string>
+  <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) -->
   <string name="mediasize_na_gvrnmt_letter">ھۆكۈمەت خەت-چەك</string>
+  <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) -->
   <string name="mediasize_na_legal">Legal</string>
+  <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) -->
   <string name="mediasize_na_junior_legal">Junior Legal</string>
+  <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) -->
   <string name="mediasize_na_ledger">Ledger</string>
+  <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) -->
   <string name="mediasize_na_tabloid">Tabloid</string>
+  <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) -->
   <string name="mediasize_na_index_3x5">Index Card 3 x 5</string>
+  <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) -->
   <string name="mediasize_na_index_4x6">Index Card 4 x 6</string>
+  <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) -->
   <string name="mediasize_na_index_5x8">Index Card 5 x 8</string>
+  <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) -->
   <string name="mediasize_na_monarch">Monarch</string>
+  <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) -->
   <string name="mediasize_na_quarto">Quarto</string>
+  <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) -->
   <string name="mediasize_na_foolscap">Foolscap</string>
+  <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") -->
   <string name="mediasize_chinese_roc_8k">ROC 8K</string>
+  <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") -->
   <string name="mediasize_chinese_roc_16k">ROC 16K</string>
+  <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") -->
   <string name="mediasize_chinese_prc_1">PRC 1</string>
+  <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") -->
   <string name="mediasize_chinese_prc_2">PRC 2</string>
+  <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") -->
   <string name="mediasize_chinese_prc_3">PRC 3</string>
+  <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") -->
   <string name="mediasize_chinese_prc_4">PRC 4</string>
+  <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") -->
   <string name="mediasize_chinese_prc_5">PRC 5</string>
+  <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") -->
   <string name="mediasize_chinese_prc_6">PRC 6</string>
+  <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") -->
   <string name="mediasize_chinese_prc_7">PRC 7</string>
+  <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") -->
   <string name="mediasize_chinese_prc_8">PRC 8</string>
+  <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") -->
   <string name="mediasize_chinese_prc_9">PRC 9</string>
+  <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") -->
   <string name="mediasize_chinese_prc_10">PRC 10</string>
+  <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_prc_16k">PRC 16K</string>
+  <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") -->
   <string name="mediasize_chinese_om_pa_kai">8 كەسلەم</string>
+  <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_dai_pa_kai">چوڭ 8 كەسلەم</string>
+  <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") -->
   <string name="mediasize_chinese_om_jurro_ku_kai">16 كەسلەم</string>
+  <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") -->
   <string name="mediasize_japanese_jis_b10">JIS B10</string>
+  <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") -->
   <string name="mediasize_japanese_jis_b9">JIS B9</string>
+  <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") -->
   <string name="mediasize_japanese_jis_b8">JIS B8</string>
+  <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") -->
   <string name="mediasize_japanese_jis_b7">JIS B7</string>
+  <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") -->
   <string name="mediasize_japanese_jis_b6">JIS B6</string>
+  <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") -->
   <string name="mediasize_japanese_jis_b5">JIS B5</string>
+  <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") -->
   <string name="mediasize_japanese_jis_b4">JIS B4</string>
+  <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") -->
   <string name="mediasize_japanese_jis_b3">JIS B3</string>
+  <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") -->
   <string name="mediasize_japanese_jis_b2">JIS B2</string>
+  <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") -->
   <string name="mediasize_japanese_jis_b1">JIS B1</string>
+  <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") -->
   <string name="mediasize_japanese_jis_b0">JIS B0</string>
+  <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") -->
   <string name="mediasize_japanese_jis_exec">JIS Exec</string>
+  <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") -->
   <string name="mediasize_japanese_chou4">Chou4</string>
+  <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") -->
   <string name="mediasize_japanese_chou3">Chou3</string>
+  <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") -->
   <string name="mediasize_japanese_chou2">Chou2</string>
+  <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") -->
   <string name="mediasize_japanese_hagaki">Hagaki</string>
+  <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") -->
   <string name="mediasize_japanese_oufuku">Oufuku</string>
+  <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") -->
   <string name="mediasize_japanese_kahu">Kahu</string>
+  <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") -->
   <string name="mediasize_japanese_kaku2">Kaku2</string>
+  <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") -->
   <string name="mediasize_japanese_you4">You4</string>
+  <!-- Media (paper) size for specifying any paper size in portrait.-->
   <string name="mediasize_unknown_portrait">يوچۇن بويىغا</string>
+  <!-- Media (paper) size for specifying any paper size in landscape.-->
   <string name="mediasize_unknown_landscape">يوچۇن توغرىسىغا</string>
+  <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] -->
   <string name="write_fail_reason_cancelled">ۋاز كەچتى</string>
+  <!-- Write fail reason: couldn't write the printed content. [CHAR LIMIT=none] -->
   <string name="write_fail_reason_cannot_write">مەزمۇن يازغاندا خاتالىق كۆرۈلدى</string>
+  <!-- Print fail reason: unknown. [CHAR LIMIT=25] -->
   <string name="reason_unknown">يوچۇن</string>
+  <!-- Print fail reason: the print service that has to process the print job is not available. [CHAR LIMIT=none] -->
   <string name="reason_service_unavailable">بېسىش مۇلازىمىتى قوزغىتىلمىغان</string>
+  <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] -->
   <string name="print_service_installed_title"><xliff:g id="NAME">%s</xliff:g> مۇلازىمىتى ئورنىتىلدى</string>
+  <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] -->
   <string name="print_service_installed_message">چېكىلسە قوزغىتىدۇ</string>
+  <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_admin_pin">باشقۇرغۇچى PIN نى كىرگۈزۈڭ</string>
+  <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_pin">كىرگۈزىدىغىنىڭىز PIN</string>
+  <!-- PIN entry dialog label/hint for incorrect PIN entry [CHAR LIMIT=none] -->
   <string name="restr_pin_incorrect">خاتا</string>
+  <!-- PIN entry dialog label/hint for old PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_old_pin">نۆۋەتتىكى PIN:</string>
+  <!-- PIN entry dialog label for new PIN [CHAR LIMIT=none] -->
   <string name="restr_pin_enter_new_pin">يېڭى PIN</string>
+  <!-- PIN entry dialog label for new PIN confirmation [CHAR LIMIT=none] -->
   <string name="restr_pin_confirm_pin">يېڭى PIN جەزملە</string>
+  <!-- PIN creation dialog message [CHAR LIMIT=none] -->
   <string name="restr_pin_create_pin">بىر PIN كودى قۇرۇپ، باشقىلارنىڭ ئۆزگەرتىشىنى چەكلەيدۇ</string>
+  <!-- PIN entry dialog error when PINs are not the same [CHAR LIMIT=none] -->
   <string name="restr_pin_error_doesnt_match">PIN ماس كەلمىدى، قايتا سىناڭ.</string>
+  <!-- PIN entry dialog error when PIN is too short [CHAR LIMIT=none] -->
   <string name="restr_pin_error_too_short">PIN بەك قىسقا. ئاز دېگەندە 4 خانە سان بولۇشى كېرەك.</string>
+  <!-- PIN entry dialog countdown message for next chance to enter the PIN [CHAR LIMIT=none] -->
+  <!-- Phrase describing a time duration using seconds [CHAR LIMIT=none] -->
+  <plurals name="restr_pin_countdown">
+    <item quantity="other">1 سېكۇنتتىن كېيىن قايتا سىناڭ</item>
+  </plurals>
+  <!-- PIN entry dialog tells the user to not enter a PIN for a while. [CHAR LIMIT=none] -->
   <string name="restr_pin_try_later">سەل تۇرۇپ قايتا سىناڭ</string>
+  <!-- Cling help message title when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message description when hiding the navigation bar entering immersive mode [CHAR LIMIT=none] -->
+  <!-- Cling help message confirmation button when hiding the navigation bar entering immersive mode [CHAR LIMIT=30] -->
+  <!-- Label for button to confirm chosen date or time [CHAR LIMIT=30] -->
+  <!--
+         Content description for the hour selector in the time picker, which displays
+         selectable hours of the day along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!--
+         Content description for the minute selector in the time picker, which displays
+         selectable five-minute intervals along the inside edge of a circle, as in an analog clock.
+         [CHAR LIMIT=50]
+    -->
+  <!-- Accessibility announcement for hour circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for minute circular picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the day picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement for the year picker [CHAR LIMIT=NONE] -->
+  <!-- Accessibility announcement when a number that had been typed in is deleted [CHAR_LIMIT=NONE] -->
+  <!--
+        Used to wrap a label for content description for a work profile, e.g. "Work Email" instead
+        of email when there are two email apps.
+        [CHAR LIMIT=20]
+     -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- DO NOT TRANSLATE -->
+  <!-- Notify use that they are in Lock-to-app -->
+  <!-- Notify use that they are in Lock-to-app in accessibility mode -->
+  <!-- Notify user that they are locked in lock-to-app mode -->
+  <!-- Starting lock-to-app indication. -->
+  <!-- Exting lock-to-app indication. -->
+  <!-- Lock-to-app unlock pin string -->
+  <!-- Lock-to-app unlock pattern string -->
+  <!-- Lock-to-app unlock password string -->
+  <!-- Notification shown when device owner silently installs a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently updates a package [CHAR LIMIT=NONE] -->
+  <!-- Notification shown when device owner silently deletes a package [CHAR LIMIT=NONE] -->
+  <!-- [CHAR_LIMIT=NONE] Battery saver: Feature description -->
+  <!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - summary: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in minutes (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: time duration in hours (short version). [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line two: ending time. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition - line one: Until next alarm. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode active automatic rule name separator. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the Toolbar icon used to collapse an expanded action mode. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode - feature name. [CHAR LIMIT=40] -->
   <string name="zen_mode_feature_name">ئاۋارە قىلماڭ</string>
+  <!-- Zen mode - downtime legacy feature name. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weeknights. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic schedule for weekends. [CHAR LIMIT=40] -->
+  <!-- Zen mode - name of default automatic calendar event-based rule. [CHAR LIMIT=40] -->
+  <!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
+  <!-- Error message shown when there is a system error which can be solved by user performing factory reset. [CHAR LIMIT=NONE] -->
+  <!-- Error message shown when there is a system error which can be solved by the manufacturer. [CHAR LIMIT=NONE] -->
+  <!-- Displayed when the USSD/SS request is modified by STK CC to a
+    different request. This will be displayed in a toast. -->
+  <!-- Content description of the work profile icon in the notification. -->
+  <!-- User visible name for USB MIDI Peripheral port -->
+  <!-- Manufacturer name for USB MIDI Peripheral port -->
+  <!-- Product name for USB MIDI Peripheral port -->
+  <!-- Floating toolbar strings -->
+  <!-- Content description for the button that opens the floating toolbar overflow. [CHAR LIMIT=NONE] -->
   <string name="floating_toolbar_open_overflow_description">تېخىمۇ كۆپ تاللانما</string>
+  <!-- Content description for the button that closes the floating toolbar overflow. [CHAR LIMIT=NONE] -->
+  <!-- Ellipsis character to appear in notification templates, e.g.
+         notification_template_material_inbox.xml.
+         DO NOT TRANSLATE -->
+  <!-- Label describing the number of selected items [CHAR LIMIT=48] -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (three dots). -->
+  <!-- Used to replace a range of characters in text that is too wide
+         for the space allocated to it (two dots). -->
 </resources>
diff --git a/core/res/res/values-uk/cm_strings.xml b/core/res/res/values-uk/cm_strings.xml
index 368219f..03b49d7 100644
--- a/core/res/res/values-uk/cm_strings.xml
+++ b/core/res/res/values-uk/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Скріншот</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">отримувати захищені SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Дозволяє програмі отримувати захищені SMS.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">змінювати список захищених SMS</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Дозволяє програмі змінювати список адрес захищених SMS.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Безпека</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Дозволи, пов\'язані з безпекою даних на пристрії.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">перегляд чорного списку</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Дозволяє програмі читати інформацію про список абонентів, від яких заблоковані вхідні дзвінки або повідомлення.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">зміна чорного списку</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Дозволяє програмі змінювати список абонентів, від яких заблоковані вхідні дзвінки або повідомлення.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">встановлення шпалер екрану блокування</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Дозволяє програмі міняти шпалери екрану блокування.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Перезавантаження</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Поточний</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Перезавантаження</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Швидке перезавантаження</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Перезавантаження</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Ваш планшет перезавантажиться.</string>
   <string name="reboot_confirm" product="default">Ваш телефон перезавантажиться.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Перезавантаження\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Програму закрито</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">ADB по мережі увімкнено</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">ADB по USB та мережі увімкнено</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Торкніться, аби вимкнути налагодження.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB та мережі</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Мережа</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">Перехоплення запуску додатку</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s не встановлено</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Пріоритет</string>
   <string name="silent_mode_none">Немає</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Точку доступу Wi-Fi вимкнено через зміну SIM-картки</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Вимкнути Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">увімк. або вимк. Сторожа Приватності</string>
   <string name="permdesc_changePrivacyGuardState">Програма може вибрати, чи буде друга програма працювати в захищеному режимі. Коли програму запущено в захищеному режимі, вона не отримає доступ до персональних даних, таких як контакти, повідомлення чи журнал дзвінків.</string>
   <string name="privacy_guard_notification">Сторож Приватності активний</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> буде заборонено доступ до персональних даних</string>
   <string name="privacy_guard_dialog_title">Сторож Приватності</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> намагається <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Запам\'ятати мій вибір</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">доступ до камери</string>
   <string name="app_ops_access_location">доступ до місцезнаходження</string>
   <string name="app_ops_access_notifications">читати ваші сповіщення</string>
@@ -128,23 +166,26 @@
   <string name="app_ops_get_accounts">Отримати інформацію про акаунти</string>
   <string name="app_ops_wifi_change">Змінити стан Wi-Fi</string>
   <string name="app_ops_su">отримати root-доступ</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Щоб відкріпити цей екран, торкніться й утримуйте кнопку назад.</string>
-  <string name="live_display_auto">Автоматично</string>
-  <string name="live_display_auto_summary">Автоматичне підлаштування температури кольору екрана після сходу та заходу сонця</string>
-  <string name="live_display_off">Вимк</string>
-  <string name="live_display_off_summary">Вимкнути авторегулювання</string>
-  <string name="live_display_day">День</string>
-  <string name="live_display_day_summary">Використовувати параметри для денного освітлення</string>
-  <string name="live_display_night">Ніч</string>
-  <string name="live_display_night_summary">Використовувати параметри для нічного освітлення</string>
-  <string name="live_display_outdoor">Надворі (яскраве сонце)</string>
-  <string name="live_display_outdoor_summary">Використовувати параметри для яскравого освітлення надворі</string>
-  <string name="live_display_hint">LiveDisplay допоможе зменшити навантаження на зір та покращить Ваш сон. Натисніть тут, щоб спробувати його!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Немає під\'єднаного пристрою</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> підключений пристрій</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> підключених пристроїв</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">Запуск програми заборонений</string>
   <string name="notify_package_component_protected_text">Запуск <xliff:g id="app_name">%1$s</xliff:g> заблоковано. Натисніть, щоб ввести пароль і запустити програму.</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">Батарея повністю заряджена</string>
   <string name="notify_battery_fully_charged_text">Від’єднайте зарядку задля покращення витривалості батареї.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">скинути статистику акумулятора</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Дозволити програмі скидати дані про використання акумулятора.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-ur-rPK/cm_strings.xml b/core/res/res/values-ur-rPK/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-ur-rPK/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-uz-rUZ/cm_strings.xml b/core/res/res/values-uz-rUZ/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-uz-rUZ/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values-vi/cm_strings.xml b/core/res/res/values-vi/cm_strings.xml
index 2aab8bc..035cb15 100644
--- a/core/res/res/values-vi/cm_strings.xml
+++ b/core/res/res/values-vi/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">Ảnh chụp màn hình</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">nhận SMS được bảo vệ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">Cho phép ứng dụng nhận tin nhắn SMS đến được bảo vệ.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">thay đổi danh sách SMS được bảo vệ</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">Cho phép ứng dụng sửa đổi danh sách địa chỉ SMS được bảo vệ.</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">Bảo mật</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">Quyền liên quan đến thông tin bảo mật của thiết bị.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">đọc danh sách đen của điện thoại</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">Cho phép ứng dụng đọc thông tin về các số điện thoại bị chặn cuộc gọi hoặc tin nhắn đến.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">thay đổi danh sách đen của điện thoại</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">Cho phép ứng dụng thay đổi số điện thoại bị chặn cuộc gọi hoặc tin nhắn đến.</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">thiết lập hình nền bảo vệ phím</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">Cho phép ứng dụng thay đổi hình nền màn hình khoá.</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">Khởi động lại</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">Hiện tại</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">Khởi động lại</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Phục hồi</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Trình nạp khởi động</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Tải về</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">Khởi động lại nhanh</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">Khởi động lại</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">Máy tính bảng của bạn sẽ khởi động lại.</string>
   <string name="reboot_confirm" product="default">Điện thoại của bạn sẽ khởi động lại.</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">Đang khởi động lại\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">Ứng dụng đã tắt</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">Đã bật ADB qua mạng</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">Đã kích hoạt ADB qua USB &amp; mạng</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">Chạm để tắt gỡ lỗi.</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; mạng</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">Mạng</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">chặn ứng dụng khởi chạy</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s chưa được cài đặt</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">Ưu tiên</string>
   <string name="silent_mode_none">Không có</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">Đã vô hiệu hóa điểm truy cập WiFi vì thay đổi đăng ký SIM</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">Tắt WiFi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">bật hoặc tắt Bảo vệ quyền riêng tư</string>
   <string name="permdesc_changePrivacyGuardState">Cho phép ứng dụng thay đổi ứng dụng khác chạy với Bảo vệ quyền riêng tư. Khi một ứng dụng chạy với Bảo vệ quyền riêng tư, nó sẽ không có quyền truy cập dữ liệu cá nhân như số liên lạc, nhật ký cuộc gọi hoặc tin nhắn.</string>
   <string name="privacy_guard_notification">Bảo vệ quyền riêng tư đang hoạt động</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> sẽ không thể truy cập dữ liệu cá nhân</string>
   <string name="privacy_guard_dialog_title">Bảo vệ quyền riêng tư</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> muốn <xliff:g id="op">%2$s</xliff:g>.</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">Nhớ lựa chọn của tôi</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">truy cập máy ảnh</string>
   <string name="app_ops_access_location">truy cập vị trí của bạn</string>
   <string name="app_ops_access_notifications">đọc thông báo của bạn</string>
@@ -97,7 +135,9 @@
   <string name="app_ops_start_at_bootup">chạy lúc khởi động</string>
   <string name="app_ops_toast_window">hiện thông báo nhanh</string>
   <string name="app_ops_toggle_bluetooth">bật/tắt Bluetooth</string>
+  <string name="app_ops_toggle_mobile_data">bật/tắt dữ liệu di động</string>
   <string name="app_ops_toggle_nfc">bật/tắt NFC</string>
+  <string name="app_ops_toggle_wifi">bật/tắt WiFi</string>
   <string name="app_ops_use_alarm_volume">điều khiển âm lượng báo thức</string>
   <string name="app_ops_use_audio_focus">điều khiển trọng tâm âm thanh</string>
   <string name="app_ops_use_bluetooth_volume">điều khiển âm lượng Bluetooth</string>
@@ -110,20 +150,44 @@
   <string name="app_ops_use_voice_volume">điều khiển âm lượng cuộc gọi thoại</string>
   <string name="app_ops_write_mms">soạn tin nhắn MMS</string>
   <string name="app_ops_write_sms">soạn tin nhắn SMS</string>
+  <string name="app_ops_use_fingerprint">sử dụng vân tay</string>
+  <string name="app_ops_add_voicemail">thêm một thư thoại</string>
+  <string name="app_ops_read_phone_state">truy nhập tình trạng điện thoại</string>
+  <string name="app_ops_scan_wifi">quét mạng Wi-Fi</string>
+  <string name="app_ops_change_wallpaper">thay đổi hình nền</string>
+  <string name="app_ops_assist_structure">sử dụng cấu trúc hỗ trợ</string>
+  <string name="app_ops_assist_screenshot">chụp ảnh màn hình</string>
+  <string name="app_ops_use_body_sensors">sử dụng cảm biến cơ thể</string>
+  <string name="app_ops_read_cell_broadcasts">đọc tin nhắn quảng bá</string>
+  <string name="app_ops_mock_location">giả vị trí của bạn</string>
+  <string name="app_ops_read_external_storage">đọc bộ nhớ ngoài</string>
+  <string name="app_ops_write_external_storage">ghi bộ nhớ ngoài</string>
+  <string name="app_ops_turn_on_screen">bật màn hình</string>
+  <string name="app_ops_get_accounts">lấy thông tin tài khoản thiết bị</string>
+  <string name="app_ops_wifi_change">thay đổi tình trạng Wi-Fi</string>
   <string name="app_ops_su">lấy quyền truy cập root</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">Để bỏ ghim màn hình này, hãy chạm và giữ phím Quay lại.</string>
-  <string name="live_display_auto">Tự động</string>
-  <string name="live_display_auto_summary">Tự động chỉnh nhiệt độ màu của màn hình theo ngày và đêm</string>
-  <string name="live_display_off">Tắt</string>
-  <string name="live_display_off_summary">Vô hiệu hoá tất cả điều chỉnh</string>
-  <string name="live_display_day">Ngày</string>
-  <string name="live_display_day_summary">Chỉ sử dụng cài đặt ban ngày</string>
-  <string name="live_display_night">Đêm</string>
-  <string name="live_display_night_summary">Chỉ sử dụng cài đặt ban đêm</string>
-  <string name="live_display_outdoor">Ngoài trời (ánh sáng mặt trời)</string>
-  <string name="live_display_outdoor_summary">Chỉ sử dụng cài đặt ngoài trời</string>
-  <string name="live_display_hint">LiveDisplay có thể giúp giảm mỏi mắt và giúp bạn ngủ vào ban đêm. Nhấn vào đây để thử!</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">Không có thiết bị kết nối</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> thiết bị đã kết nối</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> thiết bị đã kết nối</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <string name="notify_package_component_protected_title">Đã chặn khởi chạy hoạt động</string>
+  <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> được bảo vệ ngăn không khởi chạy. Chạm để xác thực và khởi chạy ứng dụng.</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">Pin đã được sạc đầy</string>
+  <string name="notify_battery_fully_charged_text">Rút cáp sạc ra khỏi thiết bị của bạn để cải thiện tuổi thọ pin.</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">đặt lại thống kê pin</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">Cho phép ứng dụng thiết lập lại dữ liệu cấp thấp của mức tiêu thụ pin hiện tại.</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">Thẻ SIM đã thay đổi</string>
+  <string name="uicc_hot_swapped_event_text">Chạm để thiết lập các ưu tiên mặc định cho thẻ SIM</string>
 </resources>
diff --git a/core/res/res/values-zh-rCN/cm_strings.xml b/core/res/res/values-zh-rCN/cm_strings.xml
index 8e8920d..6f522d1 100644
--- a/core/res/res/values-zh-rCN/cm_strings.xml
+++ b/core/res/res/values-zh-rCN/cm_strings.xml
@@ -17,51 +17,89 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">屏幕截图</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">接收受保护的短信</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">允许应用接收受保护的短信。</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">修改受保护的短信列表</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">允许应用修改受保护的短信地址列表。</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">安全</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">与设备安全信息相关的权限。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">读取手机黑名单</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">允许应用读取有关被阻止来电或信息的电话号码的信息。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">更改手机黑名单</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">允许应用更改被阻止来电或信息的电话号码。</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">设置锁屏壁纸</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">允许应用更改锁屏壁纸。</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">重启</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">当前</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">重启</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">恢复模式</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">引导程序</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">下载模式</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">软重启</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">重启</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">您的平板电脑将会重启。</string>
   <string name="reboot_confirm" product="default">您的手机将会重启。</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">正在重启\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">应用已被终止</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">网络 ADB 调试已启用</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USB 和网络 ADB 调试已启用</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">触摸以禁用调试。</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB &amp; 网络</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">网络</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">拦截应用启动</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">%s 尚未被安装</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">优先级</string>
   <string name="silent_mode_none">无</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
   <string name="subscription_change_disabled_wifi_ap">由于 SIM 卡订阅改变，已禁用 Wi-Fi 热点。</string>
+  <!-- WiFi turn off notification action text -->
   <string name="notify_turn_wifi_off_title">关闭 Wi-Fi</string>
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">启用或禁用隐私防护</string>
   <string name="permdesc_changePrivacyGuardState">允许应用更改其他应用是否启用隐私防护。当一个应用运行时启用了隐私防护，它将不能访问个人数据，如联系人、通话记录、短信。</string>
   <string name="privacy_guard_notification">隐私防护激活</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> 将不能访问个人数据</string>
   <string name="privacy_guard_dialog_title">隐私防护</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g> 希望 <xliff:g id="op">%2$s</xliff:g>。</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">记住我的选择</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">存取相机</string>
   <string name="app_ops_access_location">访问你的地理位置信息</string>
   <string name="app_ops_access_notifications">读取通知</string>
@@ -128,23 +166,28 @@
   <string name="app_ops_get_accounts">获取设备帐户</string>
   <string name="app_ops_wifi_change">更改 Wi-Fi 状态</string>
   <string name="app_ops_su">获取 Root 权限</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">要取消固定此屏幕，触摸并按住返回键。</string>
-  <string name="live_display_auto">自动</string>
-  <string name="live_display_auto_summary">在日出和日落后自动调节屏幕色温</string>
-  <string name="live_display_off">关闭</string>
-  <string name="live_display_off_summary">禁用所有调整</string>
-  <string name="live_display_day">白天</string>
-  <string name="live_display_day_summary">仅使用白天设置</string>
-  <string name="live_display_night">夜晚</string>
-  <string name="live_display_night_summary">仅使用夜晚设置</string>
-  <string name="live_display_outdoor">户外（阳光）</string>
-  <string name="live_display_outdoor_summary">仅使用户外设置</string>
-  <string name="live_display_hint">LiveDisplay 可以帮助减少眼睛疲劳，帮助您的夜间睡眠。点击此处来试一试！</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">没有已连接设备</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> 个已连接的设备</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> 个已连接的设备</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">已阻止活动启动</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s</xliff:g> 正被保护防止启动。点击以认证并启动应用。</string>
+  <!-- Battery fully charged notification -->
   <string name="notify_battery_fully_charged_title">电池已完全充满</string>
   <string name="notify_battery_fully_charged_text">请将您的设备从充电器断开，以便获得更长的电池寿命。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">重置电池统计信息</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">允许应用重置当前低电量电池使用数据。</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM 卡已更换</string>
+  <string name="uicc_hot_swapped_event_text">触摸以重置 SIM 卡首选项</string>
 </resources>
diff --git a/core/res/res/values-zh-rHK/cm_strings.xml b/core/res/res/values-zh-rHK/cm_strings.xml
index 6bbe9b7..7a738ea 100644
--- a/core/res/res/values-zh-rHK/cm_strings.xml
+++ b/core/res/res/values-zh-rHK/cm_strings.xml
@@ -17,40 +17,78 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">螢幕截圖</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">接收受保護的短訊</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">允許應用程式接收受保護的短訊</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">修改受保護的短訊清單</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">安全性</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">與裝置安全性資訊相關的權限。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">讀取手機黑名單</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">允許應用程式讀取關於被封鎖來電或訊息的電話號碼的資訊。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">更改手機黑名單</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">允許應用程式更改被封鎖來電或訊息的電話號碼。</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">設定鎖定畫面牆紙</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">允許應用程式更改鎖定畫面牆紙。</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">重新啟動</string>
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">重新啟動</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">修復模式</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">啟動載入程式 (Bootloader)</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">下載</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">軟重新啟動</string>
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">您的平板電腦將重新啟動。</string>
   <string name="reboot_confirm" product="default">您的電話將重新啟動。</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">正在重新啟動\u2026</string>
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">網絡 ADB 偵錯</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">USB &amp; 網絡 ADB 偵錯</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">觸碰以停用調試。</string>
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">未安裝 %s</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">優先級</string>
   <string name="silent_mode_none">無</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">啟用或停用私隱守衛</string>
   <string name="permdesc_changePrivacyGuardState">允許應用程式變更其他應用程式執行時是否啟用私隱守衛。當應用程式執行時啟用了私隱守衛，應用程式將無法存取個人資料，例如：聯絡人、通話記錄或訊息。</string>
   <string name="privacy_guard_notification">私隱守衛啟用</string>
   <string name="privacy_guard_notification_detail"><xliff:g id="app">%1$s</xliff:g> 將無法存取個人資料</string>
   <string name="privacy_guard_dialog_title">私隱守衛</string>
   <string name="privacy_guard_dialog_summary"><xliff:g id="app">%1$s</xliff:g>想要<xliff:g id="op">%2$s</xliff:g>。</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">記住我的選擇</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">存取相機</string>
   <string name="app_ops_access_location">存取您的位置</string>
   <string name="app_ops_access_notifications">讀取您的通知</string>
@@ -92,17 +130,20 @@
   <string name="app_ops_use_voice_volume">控制語音通話音量</string>
   <string name="app_ops_write_mms">撰寫多媒體短訊</string>
   <string name="app_ops_write_sms">編寫短訊</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">要解鎖此螢幕，觸碰並按住返回鍵。</string>
-  <string name="live_display_auto">自動</string>
-  <string name="live_display_auto_summary">在白天和夜晚自動調節螢幕顏色溫度</string>
-  <string name="live_display_off">關閉</string>
-  <string name="live_display_off_summary">停用所有調整</string>
-  <string name="live_display_day">白天</string>
-  <string name="live_display_day_summary">僅使用白天設定</string>
-  <string name="live_display_night">夜間</string>
-  <string name="live_display_night_summary">僅使用夜間設定</string>
-  <string name="live_display_outdoor">戶外（陽光）</string>
-  <string name="live_display_outdoor_summary">僅使用戶外設定</string>
-  <string name="live_display_hint">LiveDisplay 可有助減少眼睛疲勞，有助晚上睡眠。按下此處試試！</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">沒有已連接的裝置</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">重設電池統計資訊</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">允許應用程式重設目前低電量的電池使用數據。</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
 </resources>
diff --git a/core/res/res/values-zh-rTW/cm_strings.xml b/core/res/res/values-zh-rTW/cm_strings.xml
index 0c55eaa..950c435 100644
--- a/core/res/res/values-zh-rTW/cm_strings.xml
+++ b/core/res/res/values-zh-rTW/cm_strings.xml
@@ -17,49 +17,87 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
   <string name="global_action_screenshot">螢幕擷取</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_receiveProtectedSms">接收受保護的簡訊</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_receiveProtectedSms">允許應用程式接收受保護的簡訊。</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_modifyProtectedSmsList">修改受保護的簡訊清單</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_modifyProtectedSmsList">允許應用程式修改受保護的簡訊地址清單。</string>
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgrouplab_security">安全</string>
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permgroupdesc_security">與裝置安全資訊相關的權限。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_readPhoneBlacklist">讀取手機黑名單</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_readPhoneBlacklist">允許應用程式讀取關於被封鎖來電或訊息的電話號碼的資訊。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permlab_changePhoneBlacklist">變更手機黑名單</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_changePhoneBlacklist">允許應用程式變更被封鎖來電或訊息的電話號碼。</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_setKeyguardWallpaper">設定鎖定畫面桌布</string>
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
   <string name="permdesc_setKeyguardWallpaper">允許應用程式變更鎖定畫面桌布。</string>
+  <!-- label for item that reboots the phone in phone options dialog -->
   <string name="global_action_reboot">重新啟動</string>
+  <!-- label for current user in phone options dialog -->
   <string name="global_action_current_user">現在</string>
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
   <string name="reboot_reboot">重新啟動</string>
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
   <string name="reboot_recovery">Recovery</string>
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
   <string name="reboot_bootloader">Bootloader</string>
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
   <string name="reboot_download">Download</string>
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
   <string name="reboot_soft">軟件重新啟動</string>
+  <!-- Title of dialog to confirm rebooting. -->
   <string name="reboot_title">重新啟動</string>
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
   <string name="reboot_confirm" product="tablet">您的平板電腦將會重新啟動。</string>
   <string name="reboot_confirm" product="default">您的手機將會重新啟動。</string>
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
   <string name="reboot_progress">正在重新啟動\u2026</string>
+  <!-- Long-press back kill application -->
   <string name="app_killed_message">已終止應用程式</string>
+  <!-- ADB over network notification -->
   <string name="adb_net_active_notification_title">已啟用網路 ADB</string>
+  <!-- ADB over USB and network notification -->
   <string name="adb_both_active_notification_title">已啟用 USB 及網路 ADB</string>
+  <!-- ADB notification message-->
   <string name="adb_active_generic_notification_message">輕觸即可停用偵錯。</string>
+  <!-- ADB custom tile -->
   <string name="adb_active_custom_tile">ADB - <xliff:g id="adb_type" example="USB">%1$s</xliff:g></string>
   <string name="adb_active_custom_tile_both">USB和網路</string>
   <string name="adb_active_custom_tile_usb">USB</string>
   <string name="adb_active_custom_tile_net">網路</string>
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
   <string name="permlab_interceptPackageLaunch">限制應用程式執行</string>
+  <!-- stylus gestures support -->
   <string name="stylus_app_not_installed">未安裝 %s</string>
+  <!-- Zen mode buttons -->
   <string name="silent_mode_priority">優先度</string>
   <string name="silent_mode_none">無</string>
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
   <string name="permlab_changePrivacyGuardState">啟用或停用隱私守衛</string>
   <string name="permdesc_changePrivacyGuardState">允許應用程式變更其他應用程式執行時是否啟用隱私守衛。當應用程式執行時啟用了隱私守衛，它將無法存取個人資料，例如聯絡人、通話記錄或訊息。</string>
   <string name="privacy_guard_notification">隱私守衛正在運作</string>
   <string name="privacy_guard_notification_detail">「<xliff:g id="app">%1$s</xliff:g>」將無法存取個人資料</string>
   <string name="privacy_guard_dialog_title">隱私守衛</string>
   <string name="privacy_guard_dialog_summary">「<xliff:g id="app">%1$s</xliff:g>」想要<xliff:g id="op">%2$s</xliff:g>。</string>
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
   <string name="permission_remember_choice">記住我的選擇</string>
+  <!-- App ops requests -->
   <string name="app_ops_access_camera">存取相機</string>
   <string name="app_ops_access_location">存取您的位置</string>
   <string name="app_ops_access_notifications">讀取您的通知</string>
@@ -95,6 +133,7 @@
   <string name="app_ops_start_at_bootup">開機時啟動</string>
   <string name="app_ops_toast_window">顯示彈出信息</string>
   <string name="app_ops_toggle_bluetooth">開關藍牙</string>
+  <string name="app_ops_toggle_mobile_data">切換數據用量</string>
   <string name="app_ops_toggle_nfc">開關 NFC</string>
   <string name="app_ops_toggle_wifi">切換 Wi-Fi</string>
   <string name="app_ops_use_alarm_volume">控制鬧鐘音量</string>
@@ -125,21 +164,28 @@
   <string name="app_ops_get_accounts">取得裝置帳號</string>
   <string name="app_ops_wifi_change">變更 Wi-Fi 狀態</string>
   <string name="app_ops_su">取得 Root 權限</string>
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
   <string name="lock_to_app_toast_no_navbar">要解鎖此螢幕，觸摸並按住返回鍵。</string>
-  <string name="live_display_auto">自動</string>
-  <string name="live_display_auto_summary">在白天和夜晚自動調節螢幕顏色溫度</string>
-  <string name="live_display_off">關閉</string>
-  <string name="live_display_off_summary">禁用所有的調整</string>
-  <string name="live_display_day">白天</string>
-  <string name="live_display_day_summary">僅使用白天設定</string>
-  <string name="live_display_night">夜間</string>
-  <string name="live_display_night_summary">僅使用夜間設定</string>
-  <string name="live_display_outdoor">戶外 (陽光)</string>
-  <string name="live_display_outdoor_summary">僅使用戶外設定</string>
-  <string name="live_display_hint">LiveDisplay 可以幫助減少眼睛的疲勞及睡前使用造成的不適。輕觸此處來試試！</string>
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
   <string name="tethered_notification_no_device_message">沒有已連接的裝置</string>
   <string name="tethered_notification_one_device_message"><xliff:g id="count">%1$s</xliff:g> 個已連接裝置</string>
   <string name="tethered_notification_multi_device_message"><xliff:g id="count">%1$s</xliff:g> 個已連接裝置</string>
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
   <string name="notify_package_component_protected_title">已阻止啟動活動</string>
   <string name="notify_package_component_protected_text"><xliff:g id="app_name">%1$s </xliff:g> 正被防止啟動。按一下以進行身份驗證並啟動應用程式。</string>
+  <!-- Battery fully charged notification -->
+  <string name="notify_battery_fully_charged_title">電池完全充滿</string>
+  <string name="notify_battery_fully_charged_text">請將設備與充電線拔除，以提高電池壽命。</string>
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permlab_resetBatteryStats">重設電池統計資訊</string>
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <string name="permdesc_resetBatteryStats">允許應用程式重設目前低電量的電池使用資料。</string>
+  <!-- Uicc hotswapped event configuration needed notification -->
+  <string name="uicc_hot_swapped_event_title">SIM 卡已變更</string>
+  <string name="uicc_hot_swapped_event_text">點按以設定SIM卡預設選項</string>
 </resources>
diff --git a/core/res/res/values-zu/cm_strings.xml b/core/res/res/values-zu/cm_strings.xml
new file mode 100644
index 0000000..2ce9b8b
--- /dev/null
+++ b/core/res/res/values-zu/cm_strings.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod Project
+     Copyright (c) 2013, The Linux Foundation. All rights reserved.
+
+     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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- label for item that screenshots in phone options dialog -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. -->
+  <!-- label for item that reboots the phone in phone options dialog -->
+  <!-- label for current user in phone options dialog -->
+  <!-- Reboot menu -->
+  <!-- Button to reboot the phone, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into recovery, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into bootloader, within the Reboot Options dialog -->
+  <!-- Button to reboot the phone into download, within the Reboot Options dialog -->
+  <!-- Button to soft reboot the device, within the Reboot Options dialog -->
+  <!-- Title of dialog to confirm rebooting. -->
+  <!-- Reboot Confirmation Dialog.  When the user chooses to reboot the device, there will
+         be a confirmation dialog.  This is the message. -->
+  <!-- Reboot Progress Dialog. This is shown if the user chooses to reboot the phone. -->
+  <!-- Long-press back kill application -->
+  <!-- ADB over network notification -->
+  <!-- ADB over USB and network notification -->
+  <!-- ADB notification message-->
+  <!-- ADB custom tile -->
+  <!-- Title of an application permission, listed so the user can choose whether they want the application to do this. -->
+  <!-- stylus gestures support -->
+  <!-- Zen mode buttons -->
+  <!-- Wifi Hotspot disabled due to subscription change -->
+  <!-- WiFi turn off notification action text -->
+  <!-- Privacy Guard -->
+  <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->
+  <!-- App ops requests -->
+  <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
+  <!-- Template for showing cellular network operator name while LTE calling is enabled -->
+  <!-- Keyguard strings -->
+  <!-- Sequence of characters used to separate carrier message strings in keyguard. Typically just vertical line
+         with spaces on either side. [CHAR LIMIT=3] -->
+  <!-- Protected Apps Notification -->
+  <!-- Battery fully charged notification -->
+  <!-- [CHAR LIMIT=NONE] Title of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- [CHAR LIMIT=NONE] Description of an application permission, listed so the user can choose
+         whether they want to allow the application to do this. -->
+  <!-- Uicc hotswapped event configuration needed notification -->
+</resources>
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index a0b92b9..6da5941 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -1595,6 +1595,7 @@
          {@link #AndroidManifest manifest} tag. -->
     <declare-styleable name="AndroidManifestProtectedBroadcast" parent="AndroidManifest">
         <attr name="name" />
+        <attr name="permission" />
     </declare-styleable>
 
     <!-- Private tag to declare the original package name that this package is
diff --git a/core/res/res/values/cm_arrays.xml b/core/res/res/values/cm_arrays.xml
index 6629b4f..f66cb06 100644
--- a/core/res/res/values/cm_arrays.xml
+++ b/core/res/res/values/cm_arrays.xml
@@ -188,31 +188,6 @@
         <item>@string/app_ops_su</item>
     </string-array>
 
-    <string-array name="live_display_entries" translatable="false">
-        <item>@string/live_display_auto</item>
-        <item>@string/live_display_off</item>
-        <item>@string/live_display_day</item>
-        <item>@string/live_display_night</item>
-        <item>@string/live_display_outdoor</item>
-    </string-array>
-
-    <string-array name="live_display_summaries" translatable="false">
-        <item>@string/live_display_auto_summary</item>
-        <item>@string/live_display_off_summary</item>
-        <item>@string/live_display_day_summary</item>
-        <item>@string/live_display_night_summary</item>
-        <item>@string/live_display_outdoor_summary</item>
-    </string-array>
-
-    <string-array name="live_display_values" translatable="false">
-        <item>2</item>
-        <item>0</item>
-        <item>4</item>
-        <item>1</item>
-        <item>3</item>
-    </string-array>
-
-
     <!-- A list of pre-installed applications that will be treated as carrier apps,
          regardless of the SIM inserted. These applications will be granted phone and
          location permissions, and must obtain user content through other means -->
diff --git a/core/res/res/values/cm_strings.xml b/core/res/res/values/cm_strings.xml
index d8f2b7c..a8fcbe5 100644
--- a/core/res/res/values/cm_strings.xml
+++ b/core/res/res/values/cm_strings.xml
@@ -192,19 +192,6 @@
     <!-- Notify user that they are in Lock-to-app (for devices without navbar) -->
     <string name="lock_to_app_toast_no_navbar">To unpin this screen, touch and hold the Back button.</string>
 
-    <!-- LiveDisplay strings -->
-    <string name="live_display_title" translatable="false">LiveDisplay</string>
-    <string name="live_display_auto">Automatic</string>
-    <string name="live_display_auto_summary">Automatically adjust color temperature of screen after sunset and sunrise</string>
-    <string name="live_display_off">Off</string>
-    <string name="live_display_off_summary">Disable all adjustments</string>
-    <string name="live_display_day">Day</string>
-    <string name="live_display_day_summary">Use day settings only</string>
-    <string name="live_display_night">Night</string>
-    <string name="live_display_night_summary">Use night settings only</string>
-    <string name="live_display_outdoor">Outdoor (bright sun)</string>
-    <string name="live_display_outdoor_summary">Use outdoor settings only</string>
-    <string name="live_display_hint">LiveDisplay can help reduce eyestrain and help you sleep at night. Click here to try it out!</string>
 
     <!-- Template for showing cellular network operator name while LTE calling is enabled -->
     <string name="high_definition_tag" translatable="false">%s</string>
diff --git a/core/res/res/values/cm_styles.xml b/core/res/res/values/cm_styles.xml
new file mode 100644
index 0000000..1d0de05
--- /dev/null
+++ b/core/res/res/values/cm_styles.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2016 The CyanogenMod 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.
+-->
+<resources>
+
+    <!-- Exposed styles for framework activities -->
+    <style name="Theme.Material.Light.Dialog.HeavyWeightSwitcherActivity" />
+    <style name="Theme.Material.Light.Dialog.ChooseAccountActivity" />
+    <style name="Theme.Material.Light.Dialog.ChooseTypeAndAccountActivity" />
+    <style name="Theme.Material.Light.Dialog.ChooseAccountTypeActivity" />
+    <style name="Theme.Material.Light.Dialog.NoActionBar.CantAddAccountActivity" />
+    <style name="Theme.Material.Light.DialogWhenLarge.GrantCredentialsPermissionActivity" />
+    <style name="Theme.Material.Light.Dialog.SyncActivityTooManyDeletes" />
+    <style name="Theme.Material.Light.Dialog.Alert.NetInitiatedActivity" />
+
+    <!-- Exposed style for power menu  -->
+
+    <style name="Theme.Power.Dialog" parent="@style/Theme.DeviceDefault.Light.DarkActionBar" />
+
+</resources>
diff --git a/core/res/res/values/cm_symbols.xml b/core/res/res/values/cm_symbols.xml
index a76b3c2..a56e5ac 100644
--- a/core/res/res/values/cm_symbols.xml
+++ b/core/res/res/values/cm_symbols.xml
@@ -107,21 +107,6 @@
     <!-- Automatic brightness enhancements -->
     <java-symbol type="integer" name="config_autoBrightnessBrighteningLightFastDebounce"/>
 
-    <!-- LiveDisplay -->
-    <java-symbol type="string" name="live_display_title" />
-    <java-symbol type="string" name="live_display_hint" />
-    <java-symbol type="string" name="live_display_auto" />
-    <java-symbol type="string" name="live_display_auto_summary" />
-    <java-symbol type="string" name="live_display_day" />
-    <java-symbol type="string" name="live_display_day_summary" />
-    <java-symbol type="string" name="live_display_night" />
-    <java-symbol type="string" name="live_display_night_summary" />
-    <java-symbol type="string" name="live_display_outdoor" />
-    <java-symbol type="string" name="live_display_outdoor_summary" />
-    <java-symbol type="array" name="live_display_entries" />
-    <java-symbol type="array" name="live_display_summaries" />
-    <java-symbol type="array" name="live_display_values" />
-    <java-symbol type="integer" name="config_dayColorTemperature" />
 
     <java-symbol type="string" name="high_definition_tag" />
 
@@ -154,4 +139,13 @@
     <!-- Uicc hotswapped event configuration needed notification -->
     <java-symbol type="string" name="uicc_hot_swapped_event_title" />
     <java-symbol type="string" name="uicc_hot_swapped_event_text" />
+
+    <!-- Usb drive persistent notification -->
+    <java-symbol type="bool" name="config_persistUsbDriveNotification" />
+
+    <!--Exposed style for power menu -->
+    <java-symbol type="style" name="Theme.Power.Dialog" />
+
+    <!-- On-device lights (LED) capabilities -->
+    <java-symbol type="array" name="config_deviceLightCapabilities" />
 </resources>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index 5cdce93..0bbc730 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -504,6 +504,12 @@
     <!-- Integer indicating RSSI boost given to current network -->
     <integer translatable="false" name="config_wifi_framework_current_network_boost">25</integer>
 
+    <!-- Integer indicating the number of selective channel scan when Wifi turn on -->
+    <integer translatable="false" name="config_max_initial_scans_on_selective_channels">2</integer>
+
+    <!-- Integer indicating the interval for selective channel scan when Wifi turn on -->
+    <integer translatable="false" name="config_initial_saved_channel_scan_interval">2000</integer>
+
     <!-- Integer indicating how to handle beacons with uninitialized RSSI value of 0 -->
     <integer translatable="false" name="config_wifi_framework_scan_result_rssi_level_patchup_value">-85</integer>
 
@@ -2482,7 +2488,7 @@
    <!-- Configuration to play sms ringtone during MO/MT call -->
    <bool name="config_sms_ringtone_incall">false</bool>
     <!-- IpReachability monitor enable/Disable -->
-    <bool translatable="false" name="config_wifi_ipreachability_monitor">false</bool>
+    <bool translatable="false" name="config_wifi_ipreachability_monitor">true</bool>
 
     <!-- Configuration that determines if ACTIVATE_REJECT_GGSN is to be treated as
          a permanent error -->
@@ -2559,7 +2565,6 @@
     <!-- The BT name of the keyboard packaged with the device. If this is defined, SystemUI will
          automatically try to pair with it when the device exits tablet mode. -->
     <string translatable="false" name="config_packagedKeyboardName"></string>
-    <integer name="config_dayColorTemperature">6500</integer>
 
     <!-- Show battery fully charged notification -->
     <bool name="config_showBatteryFullyChargedNotification">false</bool>
@@ -2567,4 +2572,36 @@
     <!-- Older rotation sensors are not setting event.timestamp correctly. Setting to
          true will use SystemClock.elapsedRealtimeNanos() to set timestamp. -->
     <bool name="config_useSystemClockforRotationSensor">false</bool>
+
+    <!-- Whether to persist the notification for when a usb drive device is plugged in -->
+    <bool name="config_persistUsbDriveNotification">false</bool>
+
+    <!-- What can the LEDs on this device do? If defined, this overrides all of the
+         older settings:
+
+         com.android.internal.R.bool.config_multiColorNotificationLed
+         com.android.internal.R.bool.config_multiColorBatteryLed
+         org.cyanogenmod.platform.internal.R.bool.config_multipleNotificationLeds
+         com.android.internal.R.bool.config_ledCanPulse
+         org.cyanogenmod.platform.internal.R.bool.config_useSegmentedBatteryLed
+         org.cyanogenmod.platform.internal.R.bool.config_adjustableNotificationLedBrightness
+
+         Use the following values from NotificationManager:
+         LIGHTS_RGB_NOTIFICATION = 0
+         LIGHTS_RGB_BATTERY = 1
+         LIGHTS_MULTIPLE_LED = 2
+         LIGHTS_LED_PULSE = 3
+         LIGHTS_SEGMENTED_BATTERY_LIGHTS = 4
+         LIGHTS_ADJUSTABLE_NOTIFICATION_BRIGHTNESS = 5
+    -->
+
+    <integer-array translatable="false" name="config_deviceLightCapabilities">
+    </integer-array>
+
+    <!-- Zero Balance redirect URL config -->
+    <string name="operator_config_url" translatable="false"></string>
+    <!-- Zero Balance ping URL config -->
+    <string name="operator_ping_url" translatable="false"></string>
+    <!-- Zero Balance feature enable config -->
+    <bool name="config_zero_balance_operator">false</bool>
 </resources>
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 92b3b2d..ccc80c7 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -363,6 +363,8 @@
   <java-symbol type="integer" name="config_wifi_framework_max_auth_errors_to_blacklist" />
   <java-symbol type="integer" name="config_wifi_framework_network_black_list_min_time_milli" />
   <java-symbol type="integer" name="config_wifi_framework_current_network_boost" />
+  <java-symbol type="integer" name="config_max_initial_scans_on_selective_channels" />
+  <java-symbol type="integer" name="config_initial_saved_channel_scan_interval"/>
   <java-symbol type="bool" name="config_send_sms1x_on_voice_call" />
   <java-symbol type="integer" name="config_bluetooth_max_advertisers" />
   <java-symbol type="integer" name="config_bluetooth_max_scan_filters" />
@@ -2416,4 +2418,8 @@
   <java-symbol type="string" name="config_packagedKeyboardName" />
 
   <java-symbol type="bool" name="config_useSystemClockforRotationSensor" />
+
+  <java-symbol type="string" name="operator_config_url" />
+  <java-symbol type="string" name="operator_ping_url" />
+  <java-symbol type="bool" name="config_zero_balance_operator"/>
 </resources>
diff --git a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java
index 8b4030a..b0057bb 100644
--- a/core/tests/coretests/src/android/content/pm/PackageManagerTests.java
+++ b/core/tests/coretests/src/android/content/pm/PackageManagerTests.java
@@ -3854,7 +3854,7 @@ public class PackageManagerTests extends AndroidTestCase {
         ComponentName testComponentName = new ComponentName("com.android.test",
                 "com.android.test.component.protected");
         getPm().setComponentProtectedSetting(testComponentName, true);
-        assertFalse(getPm().isComponentProtected(testComponentName.getPackageName(),
+        assertFalse(getPm().isComponentProtected(testComponentName.getPackageName(), getContext().getUserId(),
                 testComponentName));
     }
 
@@ -3862,7 +3862,7 @@ public class PackageManagerTests extends AndroidTestCase {
         ComponentName testComponentName = new ComponentName("com.android.test",
                 "com.android.test.component.protected");
         getPm().setComponentProtectedSetting(testComponentName, true);
-        assertFalse(getPm().isComponentProtected(testComponentName.getPackageName(),
+        assertFalse(getPm().isComponentProtected(testComponentName.getPackageName(), getContext().getUserId(),
                 testComponentName));
     }
 }
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 5fe0d66..6b498cd 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -62,9 +62,10 @@ namespace android {
 #define APP_PACKAGE_ID      0x7f
 #define CMSDK_PACKAGE_ID    0x3f
 #define SYS_PACKAGE_ID      0x01
-#define OVERLAY_APP_PACKAGE_ID  0x61
-#define OVERLAY_SYS_PACKAGE_ID  0x60
-#define OVERLAY_COMMON_PACKAGE_ID  0x5f
+#define OVERLAY_CMSDK_PACKAGE_ID    0x63
+#define OVERLAY_APP_PACKAGE_ID      0x61
+#define OVERLAY_SYS_PACKAGE_ID      0x60
+#define OVERLAY_COMMON_PACKAGE_ID   0x5f
 
 // Define attributes from android.R.attr to protect from theme changes
 #define ATTR_WINDOW_NO_TITLE 0x01010056 // windowNoTitle
@@ -6391,6 +6392,7 @@ DynamicRefTable::DynamicRefTable(uint8_t packageId)
     mLookupTable[OVERLAY_APP_PACKAGE_ID] = OVERLAY_APP_PACKAGE_ID;
     mLookupTable[OVERLAY_SYS_PACKAGE_ID] = OVERLAY_SYS_PACKAGE_ID;
     mLookupTable[OVERLAY_COMMON_PACKAGE_ID] = OVERLAY_COMMON_PACKAGE_ID;
+    mLookupTable[OVERLAY_CMSDK_PACKAGE_ID] = OVERLAY_CMSDK_PACKAGE_ID;
 }
 
 status_t DynamicRefTable::load(const ResTable_lib_header* const header)
@@ -6470,7 +6472,8 @@ status_t DynamicRefTable::lookupResourceId(uint32_t* resId) const {
     size_t packageId = Res_GETPACKAGE(res) + 1;
 
     if (packageId == APP_PACKAGE_ID || packageId == OVERLAY_APP_PACKAGE_ID ||
-                packageId == OVERLAY_SYS_PACKAGE_ID || packageId == OVERLAY_COMMON_PACKAGE_ID) {
+                packageId == OVERLAY_SYS_PACKAGE_ID || packageId == OVERLAY_COMMON_PACKAGE_ID ||
+                packageId == OVERLAY_CMSDK_PACKAGE_ID) {
         // No lookup needs to be done, app package IDs are absolute.
         return NO_ERROR;
     }
@@ -6801,7 +6804,8 @@ bool ResTable::isResTypeAllowed(const char* type) const {
 bool ResTable::isDynamicPackageId(const uint32_t pkgId) const {
     return pkgId != APP_PACKAGE_ID && pkgId != SYS_PACKAGE_ID
             && pkgId != OVERLAY_APP_PACKAGE_ID && pkgId != OVERLAY_SYS_PACKAGE_ID
-            && pkgId != OVERLAY_COMMON_PACKAGE_ID && pkgId != CMSDK_PACKAGE_ID;
+            && pkgId != OVERLAY_COMMON_PACKAGE_ID && pkgId != CMSDK_PACKAGE_ID
+            && pkgId != OVERLAY_CMSDK_PACKAGE_ID;
 }
 
 status_t ResTable::removeIdmappedTypesFromPackageGroup(PackageGroup* packageGroup) const {
diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp
index 88a6979..2173c07 100644
--- a/libs/hwui/OpenGLRenderer.cpp
+++ b/libs/hwui/OpenGLRenderer.cpp
@@ -181,7 +181,6 @@ void OpenGLRenderer::discardFramebuffer(float left, float top, float right, floa
 }
 
 void OpenGLRenderer::clear(float left, float top, float right, float bottom, bool opaque) {
-#ifdef QCOM_HARDWARE
     mRenderState.scissor().setEnabled(true);
     mRenderState.scissor().set(left, getViewportHeight() - bottom, right - left, bottom - top);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -190,17 +189,6 @@ void OpenGLRenderer::clear(float left, float top, float right, float bottom, boo
         mRenderState.scissor().reset();
         return;
     }
-#else
-    if (!opaque) {
-        mRenderState.scissor().setEnabled(true);
-        mRenderState.scissor().set(left, getViewportHeight() - bottom, right - left, bottom - top);
-        glClear(GL_COLOR_BUFFER_BIT);
-        mDirty = true;
-        return;
-    }
-
-    mRenderState.scissor().reset();
-#endif
 }
 
 void OpenGLRenderer::startTilingCurrentClip(bool opaque, bool expand) {
diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp
index beb2e1d..3da3a57 100644
--- a/libs/hwui/Snapshot.cpp
+++ b/libs/hwui/Snapshot.cpp
@@ -40,6 +40,7 @@ Snapshot::Snapshot()
         , mClipArea(&mClipAreaRoot) {
     transform = &mTransformRoot;
     region = nullptr;
+    mRelativeLightCenter.x = mRelativeLightCenter.y = mRelativeLightCenter.z = 0;
 }
 
 /**
diff --git a/media/java/android/media/AudioRecord.java b/media/java/android/media/AudioRecord.java
index e819b8a..c96690b 100644
--- a/media/java/android/media/AudioRecord.java
+++ b/media/java/android/media/AudioRecord.java
@@ -974,7 +974,14 @@ public class AudioRecord
         final IBinder b = ServiceManager.getService(android.content.Context.AUDIO_SERVICE);
         final IAudioService ias = IAudioService.Stub.asInterface(b);
         try {
-            ias.handleHotwordInput(listening);
+            // If the caller tries to start recording with the HOTWORD input
+            // before AUDIO_SERVICE has started, IAudioService may not be available.
+            if (ias != null) {
+                ias.handleHotwordInput(listening);
+            } else {
+                Log.e(TAG, "Error talking to AudioService when handling hotword input, "
+                        + "AudioService unavailable");
+            }
         } catch (RemoteException e) {
             Log.e(TAG, "Error talking to AudioService when handling hotword input.", e);
         }
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index 8bf1604..927cd87 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -268,54 +268,6 @@ public class AudioSystem
     }
 
 
-   /**
-     * Handles events for the audio policy manager about effect sessions
-     * @see android.media.audiopolicy.AudioPolicy
-     */
-    public interface EffectSessionCallback
-    {
-        void onSessionAdded(int stream, int sessionId);
-
-        void onSessionRemoved(int stream, int sessionId);
-    }
-
-    //keep in sync with include/media/AudioPolicy.h
-    private final static int AUDIO_OUTPUT_SESSION_EFFECTS_UPDATE = 10;
-
-    private static EffectSessionCallback sEffectSessionCallback;
-
-    public static void setEffectSessionCallback(EffectSessionCallback cb)
-    {
-        synchronized (AudioSystem.class) {
-            sEffectSessionCallback = cb;
-            native_register_effect_session_callback();
-        }
-    }
-
-    private static void effectSessionCallbackFromNative(int event, int stream, int sessionId, boolean added)
-    {
-        EffectSessionCallback cb = null;
-        synchronized (AudioSystem.class) {
-            if (sEffectSessionCallback != null) {
-                cb = sEffectSessionCallback;
-            }
-        }
-        if (cb != null) {
-            switch(event) {
-                case AUDIO_OUTPUT_SESSION_EFFECTS_UPDATE:
-                    if (added) {
-                        cb.onSessionAdded(stream, sessionId);
-                    } else {
-                        cb.onSessionRemoved(stream, sessionId);
-                    }
-                    break;
-                default:
-                    Log.e(TAG, "effectSessionCallbackFromNative: unknown event " + event);
-            }
-        }
-    }
-
-
     /*
      * Error codes used by public APIs (AudioTrack, AudioRecord, AudioManager ...)
      * Must be kept in sync with frameworks/base/core/jni/android_media_AudioErrors.h
@@ -696,8 +648,6 @@ public class AudioSystem
     // declare this instance as having a dynamic policy callback handler
     private static native final void native_register_dynamic_policy_callback();
 
-    private static native final void native_register_effect_session_callback();
-
     // must be kept in sync with value in include/system/audio.h
     public static final int AUDIO_HW_SYNC_INVALID = 0;
 
diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java
index 6bf5721..a2ccdc8 100644
--- a/media/java/android/media/ExifInterface.java
+++ b/media/java/android/media/ExifInterface.java
@@ -16,85 +16,307 @@
 
 package android.media;
 
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.util.Log;
+import android.util.Pair;
+
+import libcore.io.IoUtils;
+import libcore.io.Streams;
+
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.FilterOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.charset.Charset;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.TimeZone;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * This is a class for reading and writing Exif tags in a JPEG file.
  */
 public class ExifInterface {
+    private static final String TAG = "ExifInterface";
+    private static final boolean DEBUG = false;
+
     // The Exif tag names
-    /** Type is int. */
-    public static final String TAG_ORIENTATION = "Orientation";
+    /** Type is String. @hide */
+    public static final String TAG_ARTIST = "Artist";
+    /** Type is int. @hide */
+    public static final String TAG_BITS_PER_SAMPLE = "BitsPerSample";
+    /** Type is int. @hide */
+    public static final String TAG_COMPRESSION = "Compression";
+    /** Type is String. @hide */
+    public static final String TAG_COPYRIGHT = "Copyright";
     /** Type is String. */
     public static final String TAG_DATETIME = "DateTime";
-    /** Type is String. */
-    public static final String TAG_MAKE = "Make";
-    /** Type is String. */
-    public static final String TAG_MODEL = "Model";
+    /** Type is String. @hide */
+    public static final String TAG_IMAGE_DESCRIPTION = "ImageDescription";
     /** Type is int. */
-    public static final String TAG_FLASH = "Flash";
+    public static final String TAG_IMAGE_LENGTH = "ImageLength";
     /** Type is int. */
     public static final String TAG_IMAGE_WIDTH = "ImageWidth";
-    /** Type is int. */
-    public static final String TAG_IMAGE_LENGTH = "ImageLength";
-    /** String. Format is "num1/denom1,num2/denom2,num3/denom3". */
-    public static final String TAG_GPS_LATITUDE = "GPSLatitude";
-    /** String. Format is "num1/denom1,num2/denom2,num3/denom3". */
-    public static final String TAG_GPS_LONGITUDE = "GPSLongitude";
+    /** Type is int. @hide */
+    public static final String TAG_JPEG_INTERCHANGE_FORMAT = "JPEGInterchangeFormat";
+    /** Type is int. @hide */
+    public static final String TAG_JPEG_INTERCHANGE_FORMAT_LENGTH = "JPEGInterchangeFormatLength";
     /** Type is String. */
-    public static final String TAG_GPS_LATITUDE_REF = "GPSLatitudeRef";
+    public static final String TAG_MAKE = "Make";
     /** Type is String. */
-    public static final String TAG_GPS_LONGITUDE_REF = "GPSLongitudeRef";
+    public static final String TAG_MODEL = "Model";
+    /** Type is int. */
+    public static final String TAG_ORIENTATION = "Orientation";
+    /** Type is int. @hide */
+    public static final String TAG_PHOTOMETRIC_INTERPRETATION = "PhotometricInterpretation";
+    /** Type is int. @hide */
+    public static final String TAG_PLANAR_CONFIGURATION = "PlanarConfiguration";
+    /** Type is rational. @hide */
+    public static final String TAG_PRIMARY_CHROMATICITIES = "PrimaryChromaticities";
+    /** Type is rational. @hide */
+    public static final String TAG_REFERENCE_BLACK_WHITE = "ReferenceBlackWhite";
+    /** Type is int. @hide */
+    public static final String TAG_RESOLUTION_UNIT = "ResolutionUnit";
+    /** Type is int. @hide */
+    public static final String TAG_ROWS_PER_STRIP = "RowsPerStrip";
+    /** Type is int. @hide */
+    public static final String TAG_SAMPLES_PER_PIXEL = "SamplesPerPixel";
+    /** Type is String. @hide */
+    public static final String TAG_SOFTWARE = "Software";
+    /** Type is int. @hide */
+    public static final String TAG_STRIP_BYTE_COUNTS = "StripByteCounts";
+    /** Type is int. @hide */
+    public static final String TAG_STRIP_OFFSETS = "StripOffsets";
+    /** Type is int. @hide */
+    public static final String TAG_TRANSFER_FUNCTION = "TransferFunction";
+    /** Type is rational. @hide */
+    public static final String TAG_WHITE_POINT = "WhitePoint";
+    /** Type is rational. @hide */
+    public static final String TAG_X_RESOLUTION = "XResolution";
+    /** Type is rational. @hide */
+    public static final String TAG_Y_CB_CR_COEFFICIENTS = "YCbCrCoefficients";
+    /** Type is int. @hide */
+    public static final String TAG_Y_CB_CR_POSITIONING = "YCbCrPositioning";
+    /** Type is int. @hide */
+    public static final String TAG_Y_CB_CR_SUB_SAMPLING = "YCbCrSubSampling";
+    /** Type is rational. @hide */
+    public static final String TAG_Y_RESOLUTION = "YResolution";
+    /** Type is rational. @hide */
+    public static final String TAG_APERTURE_VALUE = "ApertureValue";
+    /** Type is rational. @hide */
+    public static final String TAG_BRIGHTNESS_VALUE = "BrightnessValue";
+    /** Type is String. @hide */
+    public static final String TAG_CFA_PATTERN = "CFAPattern";
+    /** Type is int. @hide */
+    public static final String TAG_COLOR_SPACE = "ColorSpace";
+    /** Type is String. @hide */
+    public static final String TAG_COMPONENTS_CONFIGURATION = "ComponentsConfiguration";
+    /** Type is rational. @hide */
+    public static final String TAG_COMPRESSED_BITS_PER_PIXEL = "CompressedBitsPerPixel";
+    /** Type is int. @hide */
+    public static final String TAG_CONTRAST = "Contrast";
+    /** Type is int. @hide */
+    public static final String TAG_CUSTOM_RENDERED = "CustomRendered";
     /** Type is String. */
+    public static final String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";
+    /** Type is String. @hide */
+    public static final String TAG_DATETIME_ORIGINAL = "DateTimeOriginal";
+    /** Type is String. @hide */
+    public static final String TAG_DEVICE_SETTING_DESCRIPTION = "DeviceSettingDescription";
+    /** Type is double. @hide */
+    public static final String TAG_DIGITAL_ZOOM_RATIO = "DigitalZoomRatio";
+    /** Type is String. @hide */
+    public static final String TAG_EXIF_VERSION = "ExifVersion";
+    /** Type is double. @hide */
+    public static final String TAG_EXPOSURE_BIAS_VALUE = "ExposureBiasValue";
+    /** Type is rational. @hide */
+    public static final String TAG_EXPOSURE_INDEX = "ExposureIndex";
+    /** Type is int. @hide */
+    public static final String TAG_EXPOSURE_MODE = "ExposureMode";
+    /** Type is int. @hide */
+    public static final String TAG_EXPOSURE_PROGRAM = "ExposureProgram";
+    /** Type is double. */
     public static final String TAG_EXPOSURE_TIME = "ExposureTime";
-    /** Type is String. */
+    /** Type is double. */
     public static final String TAG_APERTURE = "FNumber";
-    /** Type is String. */
+    /** Type is String. @hide */
+    public static final String TAG_FILE_SOURCE = "FileSource";
+    /** Type is int. */
+    public static final String TAG_FLASH = "Flash";
+    /** Type is rational. @hide */
+    public static final String TAG_FLASH_ENERGY = "FlashEnergy";
+    /** Type is String. @hide */
+    public static final String TAG_FLASHPIX_VERSION = "FlashpixVersion";
+    /** Type is rational. */
+    public static final String TAG_FOCAL_LENGTH = "FocalLength";
+    /** Type is int. @hide */
+    public static final String TAG_FOCAL_LENGTH_IN_35MM_FILM = "FocalLengthIn35mmFilm";
+    /** Type is int. @hide */
+    public static final String TAG_FOCAL_PLANE_RESOLUTION_UNIT = "FocalPlaneResolutionUnit";
+    /** Type is rational. @hide */
+    public static final String TAG_FOCAL_PLANE_X_RESOLUTION = "FocalPlaneXResolution";
+    /** Type is rational. @hide */
+    public static final String TAG_FOCAL_PLANE_Y_RESOLUTION = "FocalPlaneYResolution";
+    /** Type is int. @hide */
+    public static final String TAG_GAIN_CONTROL = "GainControl";
+    /** Type is int. */
     public static final String TAG_ISO = "ISOSpeedRatings";
+    /** Type is String. @hide */
+    public static final String TAG_IMAGE_UNIQUE_ID = "ImageUniqueID";
+    /** Type is int. @hide */
+    public static final String TAG_LIGHT_SOURCE = "LightSource";
+    /** Type is String. @hide */
+    public static final String TAG_MAKER_NOTE = "MakerNote";
+    /** Type is rational. @hide */
+    public static final String TAG_MAX_APERTURE_VALUE = "MaxApertureValue";
+    /** Type is int. @hide */
+    public static final String TAG_METERING_MODE = "MeteringMode";
+    /** Type is String. @hide */
+    public static final String TAG_OECF = "OECF";
+    /** Type is int. @hide */
+    public static final String TAG_PIXEL_X_DIMENSION = "PixelXDimension";
+    /** Type is int. @hide */
+    public static final String TAG_PIXEL_Y_DIMENSION = "PixelYDimension";
+    /** Type is String. @hide */
+    public static final String TAG_RELATED_SOUND_FILE = "RelatedSoundFile";
+    /** Type is int. @hide */
+    public static final String TAG_SATURATION = "Saturation";
+    /** Type is int. @hide */
+    public static final String TAG_SCENE_CAPTURE_TYPE = "SceneCaptureType";
+    /** Type is String. @hide */
+    public static final String TAG_SCENE_TYPE = "SceneType";
+    /** Type is int. @hide */
+    public static final String TAG_SENSING_METHOD = "SensingMethod";
+    /** Type is int. @hide */
+    public static final String TAG_SHARPNESS = "Sharpness";
+    /** Type is rational. @hide */
+    public static final String TAG_SHUTTER_SPEED_VALUE = "ShutterSpeedValue";
+    /** Type is String. @hide */
+    public static final String TAG_SPATIAL_FREQUENCY_RESPONSE = "SpatialFrequencyResponse";
+    /** Type is String. @hide */
+    public static final String TAG_SPECTRAL_SENSITIVITY = "SpectralSensitivity";
     /** Type is String. */
-    public static final String TAG_DATETIME_DIGITIZED = "DateTimeDigitized";
-    /** Type is int. */
     public static final String TAG_SUBSEC_TIME = "SubSecTime";
-    /** Type is int. */
+    /** Type is String. */
+    public static final String TAG_SUBSEC_TIME_DIG = "SubSecTimeDigitized";
+    /** Type is String. */
     public static final String TAG_SUBSEC_TIME_ORIG = "SubSecTimeOriginal";
+    /** Type is int. @hide */
+    public static final String TAG_SUBJECT_AREA = "SubjectArea";
+    /** Type is double. @hide */
+    public static final String TAG_SUBJECT_DISTANCE = "SubjectDistance";
+    /** Type is int. @hide */
+    public static final String TAG_SUBJECT_DISTANCE_RANGE = "SubjectDistanceRange";
+    /** Type is int. @hide */
+    public static final String TAG_SUBJECT_LOCATION = "SubjectLocation";
+    /** Type is String. @hide */
+    public static final String TAG_USER_COMMENT = "UserComment";
     /** Type is int. */
-    public static final String TAG_SUBSEC_TIME_DIG = "SubSecTimeDigitized";
-
-
-
-    /**
-     * @hide
-     */
-    public static final String TAG_SUBSECTIME = "SubSecTime";
-
+    public static final String TAG_WHITE_BALANCE = "WhiteBalance";
     /**
      * The altitude (in meters) based on the reference in TAG_GPS_ALTITUDE_REF.
      * Type is rational.
      */
     public static final String TAG_GPS_ALTITUDE = "GPSAltitude";
-
     /**
      * 0 if the altitude is above sea level. 1 if the altitude is below sea
      * level. Type is int.
      */
     public static final String TAG_GPS_ALTITUDE_REF = "GPSAltitudeRef";
-
-    /** Type is String. */
-    public static final String TAG_GPS_TIMESTAMP = "GPSTimeStamp";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_AREA_INFORMATION = "GPSAreaInformation";
+    /** Type is rational. @hide */
+    public static final String TAG_GPS_DOP = "GPSDOP";
     /** Type is String. */
     public static final String TAG_GPS_DATESTAMP = "GPSDateStamp";
-    /** Type is int. */
-    public static final String TAG_WHITE_BALANCE = "WhiteBalance";
-    /** Type is rational. */
-    public static final String TAG_FOCAL_LENGTH = "FocalLength";
+    /** Type is rational. @hide */
+    public static final String TAG_GPS_DEST_BEARING = "GPSDestBearing";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_DEST_BEARING_REF = "GPSDestBearingRef";
+    /** Type is rational. @hide */
+    public static final String TAG_GPS_DEST_DISTANCE = "GPSDestDistance";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_DEST_DISTANCE_REF = "GPSDestDistanceRef";
+    /** Type is rational. @hide */
+    public static final String TAG_GPS_DEST_LATITUDE = "GPSDestLatitude";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_DEST_LATITUDE_REF = "GPSDestLatitudeRef";
+    /** Type is rational. @hide */
+    public static final String TAG_GPS_DEST_LONGITUDE = "GPSDestLongitude";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_DEST_LONGITUDE_REF = "GPSDestLongitudeRef";
+    /** Type is int. @hide */
+    public static final String TAG_GPS_DIFFERENTIAL = "GPSDifferential";
+    /** Type is rational. @hide */
+    public static final String TAG_GPS_IMG_DIRECTION = "GPSImgDirection";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_IMG_DIRECTION_REF = "GPSImgDirectionRef";
+    /** Type is rational. Format is "num1/denom1,num2/denom2,num3/denom3". */
+    public static final String TAG_GPS_LATITUDE = "GPSLatitude";
+    /** Type is String. */
+    public static final String TAG_GPS_LATITUDE_REF = "GPSLatitudeRef";
+    /** Type is rational. Format is "num1/denom1,num2/denom2,num3/denom3". */
+    public static final String TAG_GPS_LONGITUDE = "GPSLongitude";
+    /** Type is String. */
+    public static final String TAG_GPS_LONGITUDE_REF = "GPSLongitudeRef";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_MAP_DATUM = "GPSMapDatum";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_MEASURE_MODE = "GPSMeasureMode";
     /** Type is String. Name of GPS processing method used for location finding. */
     public static final String TAG_GPS_PROCESSING_METHOD = "GPSProcessingMethod";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_SATELLITES = "GPSSatellites";
+    /** Type is rational. @hide */
+    public static final String TAG_GPS_SPEED = "GPSSpeed";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_SPEED_REF = "GPSSpeedRef";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_STATUS = "GPSStatus";
+    /** Type is String. Format is "hh:mm:ss". */
+    public static final String TAG_GPS_TIMESTAMP = "GPSTimeStamp";
+    /** Type is rational. @hide */
+    public static final String TAG_GPS_TRACK = "GPSTrack";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_TRACK_REF = "GPSTrackRef";
+    /** Type is String. @hide */
+    public static final String TAG_GPS_VERSION_ID = "GPSVersionID";
+    /** Type is String. @hide */
+    public static final String TAG_INTEROPERABILITY_INDEX = "InteroperabilityIndex";
+    /** Type is int. @hide */
+    public static final String TAG_THUMBNAIL_IMAGE_LENGTH = "ThumbnailImageLength";
+    /** Type is int. @hide */
+    public static final String TAG_THUMBNAIL_IMAGE_WIDTH = "ThumbnailImageWidth";
+
+    // Private tags used for pointing the other IFD offset. The types of the following tags are int.
+    private static final String TAG_EXIF_IFD_POINTER = "ExifIFDPointer";
+    private static final String TAG_GPS_INFO_IFD_POINTER = "GPSInfoIFDPointer";
+    private static final String TAG_INTEROPERABILITY_IFD_POINTER = "InteroperabilityIFDPointer";
+
+    // Private tags used for thumbnail information.
+    private static final String TAG_HAS_THUMBNAIL = "HasThumbnail";
+    private static final String TAG_THUMBNAIL_OFFSET = "ThumbnailOffset";
+    private static final String TAG_THUMBNAIL_LENGTH = "ThumbnailLength";
+    private static final String TAG_THUMBNAIL_DATA = "ThumbnailData";
 
     // Constants used for the Orientation Exif tag.
     public static final int ORIENTATION_UNDEFINED = 0;
@@ -102,34 +324,731 @@ public class ExifInterface {
     public static final int ORIENTATION_FLIP_HORIZONTAL = 2;  // left right reversed mirror
     public static final int ORIENTATION_ROTATE_180 = 3;
     public static final int ORIENTATION_FLIP_VERTICAL = 4;  // upside down mirror
-    public static final int ORIENTATION_TRANSPOSE = 5;  // flipped about top-left <--> bottom-right axis
+    // flipped about top-left <--> bottom-right axis
+    public static final int ORIENTATION_TRANSPOSE = 5;
     public static final int ORIENTATION_ROTATE_90 = 6;  // rotate 90 cw to right it
-    public static final int ORIENTATION_TRANSVERSE = 7;  // flipped about top-right <--> bottom-left axis
+    // flipped about top-right <--> bottom-left axis
+    public static final int ORIENTATION_TRANSVERSE = 7;
     public static final int ORIENTATION_ROTATE_270 = 8;  // rotate 270 to right it
 
     // Constants used for white balance
     public static final int WHITEBALANCE_AUTO = 0;
     public static final int WHITEBALANCE_MANUAL = 1;
+
     private static SimpleDateFormat sFormatter;
 
+    // See Exchangeable image file format for digital still cameras: Exif version 2.2.
+    // The following values are for parsing EXIF data area. There are tag groups in EXIF data area.
+    // They are called "Image File Directory". They have multiple data formats to cover various
+    // image metadata from GPS longitude to camera model name.
+
+    // Types of Exif byte alignments (see JEITA CP-3451 page 10)
+    private static final short BYTE_ALIGN_II = 0x4949;  // II: Intel order
+    private static final short BYTE_ALIGN_MM = 0x4d4d;  // MM: Motorola order
+
+    // Formats for the value in IFD entry (See TIFF 6.0 spec Types page 15).
+    private static final int IFD_FORMAT_BYTE = 1;
+    private static final int IFD_FORMAT_STRING = 2;
+    private static final int IFD_FORMAT_USHORT = 3;
+    private static final int IFD_FORMAT_ULONG = 4;
+    private static final int IFD_FORMAT_URATIONAL = 5;
+    private static final int IFD_FORMAT_SBYTE = 6;
+    private static final int IFD_FORMAT_UNDEFINED = 7;
+    private static final int IFD_FORMAT_SSHORT = 8;
+    private static final int IFD_FORMAT_SLONG = 9;
+    private static final int IFD_FORMAT_SRATIONAL = 10;
+    private static final int IFD_FORMAT_SINGLE = 11;
+    private static final int IFD_FORMAT_DOUBLE = 12;
+    // Names for the data formats for debugging purpose.
+    private static final String[] IFD_FORMAT_NAMES = new String[] {
+            "", "BYTE", "STRING", "USHORT", "ULONG", "URATIONAL", "SBYTE", "UNDEFINED", "SSHORT",
+            "SLONG", "SRATIONAL", "SINGLE", "DOUBLE"
+    };
+    // Sizes of the components of each IFD value format
+    private static final int[] IFD_FORMAT_BYTES_PER_FORMAT = new int[] {
+            0, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8
+    };
+    private static final byte[] EXIF_ASCII_PREFIX = new byte[] {
+            0x41, 0x53, 0x43, 0x49, 0x49, 0x0, 0x0, 0x0
+    };
+
+    // A class for indicating EXIF rational type.
+    private static class Rational {
+        public final long numerator;
+        public final long denominator;
+
+        private Rational(long numerator, long denominator) {
+            // Handle erroneous case
+            if (denominator == 0) {
+                this.numerator = 0;
+                this.denominator = 1;
+                return;
+            }
+            this.numerator = numerator;
+            this.denominator = denominator;
+        }
+
+        @Override
+        public String toString() {
+            return numerator + "/" + denominator;
+        }
+
+        public double calculate() {
+            return (double) numerator / denominator;
+        }
+    }
+
+    // A class for indicating EXIF attribute.
+    private static class ExifAttribute {
+        public final int format;
+        public final int numberOfComponents;
+        public final byte[] bytes;
+
+        private ExifAttribute(int format, int numberOfComponents, byte[] bytes) {
+            this.format = format;
+            this.numberOfComponents = numberOfComponents;
+            this.bytes = bytes;
+        }
+
+        public static ExifAttribute createUShort(int[] values, ByteOrder byteOrder) {
+            final ByteBuffer buffer = ByteBuffer.wrap(
+                    new byte[IFD_FORMAT_BYTES_PER_FORMAT[IFD_FORMAT_USHORT] * values.length]);
+            buffer.order(byteOrder);
+            for (int value : values) {
+                buffer.putShort((short) value);
+            }
+            return new ExifAttribute(IFD_FORMAT_USHORT, values.length, buffer.array());
+        }
+
+        public static ExifAttribute createUShort(int value, ByteOrder byteOrder) {
+            return createUShort(new int[] {value}, byteOrder);
+        }
+
+        public static ExifAttribute createULong(long[] values, ByteOrder byteOrder) {
+            final ByteBuffer buffer = ByteBuffer.wrap(
+                    new byte[IFD_FORMAT_BYTES_PER_FORMAT[IFD_FORMAT_ULONG] * values.length]);
+            buffer.order(byteOrder);
+            for (long value : values) {
+                buffer.putInt((int) value);
+            }
+            return new ExifAttribute(IFD_FORMAT_ULONG, values.length, buffer.array());
+        }
+
+        public static ExifAttribute createULong(long value, ByteOrder byteOrder) {
+            return createULong(new long[] {value}, byteOrder);
+        }
+
+        public static ExifAttribute createSLong(int[] values, ByteOrder byteOrder) {
+            final ByteBuffer buffer = ByteBuffer.wrap(
+                    new byte[IFD_FORMAT_BYTES_PER_FORMAT[IFD_FORMAT_SLONG] * values.length]);
+            buffer.order(byteOrder);
+            for (int value : values) {
+                buffer.putInt(value);
+            }
+            return new ExifAttribute(IFD_FORMAT_SLONG, values.length, buffer.array());
+        }
+
+        public static ExifAttribute createSLong(int value, ByteOrder byteOrder) {
+            return createSLong(new int[] {value}, byteOrder);
+        }
+
+        public static ExifAttribute createByte(String value) {
+            // Exception for GPSAltitudeRef tag
+            if (value.length() == 1 && value.charAt(0) >= '0' && value.charAt(0) <= '1') {
+                final byte[] bytes = new byte[] { (byte) (value.charAt(0) - '0') };
+                return new ExifAttribute(IFD_FORMAT_BYTE, bytes.length, bytes);
+            }
+            final byte[] ascii = value.getBytes(ASCII);
+            return new ExifAttribute(IFD_FORMAT_BYTE, ascii.length, ascii);
+        }
+
+        public static ExifAttribute createString(String value) {
+            final byte[] ascii = (value + '\0').getBytes(ASCII);
+            return new ExifAttribute(IFD_FORMAT_STRING, ascii.length, ascii);
+        }
+
+        public static ExifAttribute createURational(Rational[] values, ByteOrder byteOrder) {
+            final ByteBuffer buffer = ByteBuffer.wrap(
+                    new byte[IFD_FORMAT_BYTES_PER_FORMAT[IFD_FORMAT_URATIONAL] * values.length]);
+            buffer.order(byteOrder);
+            for (Rational value : values) {
+                buffer.putInt((int) value.numerator);
+                buffer.putInt((int) value.denominator);
+            }
+            return new ExifAttribute(IFD_FORMAT_URATIONAL, values.length, buffer.array());
+        }
+
+        public static ExifAttribute createURational(Rational value, ByteOrder byteOrder) {
+            return createURational(new Rational[] {value}, byteOrder);
+        }
+
+        public static ExifAttribute createSRational(Rational[] values, ByteOrder byteOrder) {
+            final ByteBuffer buffer = ByteBuffer.wrap(
+                    new byte[IFD_FORMAT_BYTES_PER_FORMAT[IFD_FORMAT_SRATIONAL] * values.length]);
+            buffer.order(byteOrder);
+            for (Rational value : values) {
+                buffer.putInt((int) value.numerator);
+                buffer.putInt((int) value.denominator);
+            }
+            return new ExifAttribute(IFD_FORMAT_SRATIONAL, values.length, buffer.array());
+        }
+
+        public static ExifAttribute createSRational(Rational value, ByteOrder byteOrder) {
+            return createSRational(new Rational[] {value}, byteOrder);
+        }
+
+        public static ExifAttribute createDouble(double[] values, ByteOrder byteOrder) {
+            final ByteBuffer buffer = ByteBuffer.wrap(
+                    new byte[IFD_FORMAT_BYTES_PER_FORMAT[IFD_FORMAT_DOUBLE] * values.length]);
+            buffer.order(byteOrder);
+            for (double value : values) {
+                buffer.putDouble(value);
+            }
+            return new ExifAttribute(IFD_FORMAT_DOUBLE, values.length, buffer.array());
+        }
+
+        public static ExifAttribute createDouble(double value, ByteOrder byteOrder) {
+            return createDouble(new double[] {value}, byteOrder);
+        }
+
+        @Override
+        public String toString() {
+            return "(" + IFD_FORMAT_NAMES[format] + ", data length:" + bytes.length + ")";
+        }
+
+        private Object getValue(ByteOrder byteOrder) {
+            try {
+                ByteOrderAwarenessDataInputStream inputStream =
+                        new ByteOrderAwarenessDataInputStream(bytes);
+                inputStream.setByteOrder(byteOrder);
+                switch (format) {
+                    case IFD_FORMAT_BYTE:
+                    case IFD_FORMAT_SBYTE: {
+                        // Exception for GPSAltitudeRef tag
+                        if (bytes.length == 1 && bytes[0] >= 0 && bytes[0] <= 1) {
+                            return new String(new char[] { (char) (bytes[0] + '0') });
+                        }
+                        return new String(bytes, ASCII);
+                    }
+                    case IFD_FORMAT_UNDEFINED:
+                    case IFD_FORMAT_STRING: {
+                        int index = 0;
+                        if (numberOfComponents >= EXIF_ASCII_PREFIX.length) {
+                            boolean same = true;
+                            for (int i = 0; i < EXIF_ASCII_PREFIX.length; ++i) {
+                                if (bytes[i] != EXIF_ASCII_PREFIX[i]) {
+                                    same = false;
+                                    break;
+                                }
+                            }
+                            if (same) {
+                                index = EXIF_ASCII_PREFIX.length;
+                            }
+                        }
+
+                        StringBuilder stringBuilder = new StringBuilder();
+                        while (index < numberOfComponents) {
+                            int ch = bytes[index];
+                            if (ch == 0) {
+                                break;
+                            }
+                            if (ch >= 32) {
+                                stringBuilder.append((char) ch);
+                            } else {
+                                stringBuilder.append('?');
+                            }
+                            ++index;
+                        }
+                        return stringBuilder.toString();
+                    }
+                    case IFD_FORMAT_USHORT: {
+                        final int[] values = new int[numberOfComponents];
+                        for (int i = 0; i < numberOfComponents; ++i) {
+                            values[i] = inputStream.readUnsignedShort();
+                        }
+                        return values;
+                    }
+                    case IFD_FORMAT_ULONG: {
+                        final long[] values = new long[numberOfComponents];
+                        for (int i = 0; i < numberOfComponents; ++i) {
+                            values[i] = inputStream.readUnsignedInt();
+                        }
+                        return values;
+                    }
+                    case IFD_FORMAT_URATIONAL: {
+                        final Rational[] values = new Rational[numberOfComponents];
+                        for (int i = 0; i < numberOfComponents; ++i) {
+                            final long numerator = inputStream.readUnsignedInt();
+                            final long denominator = inputStream.readUnsignedInt();
+                            values[i] = new Rational(numerator, denominator);
+                        }
+                        return values;
+                    }
+                    case IFD_FORMAT_SSHORT: {
+                        final int[] values = new int[numberOfComponents];
+                        for (int i = 0; i < numberOfComponents; ++i) {
+                            values[i] = inputStream.readShort();
+                        }
+                        return values;
+                    }
+                    case IFD_FORMAT_SLONG: {
+                        final int[] values = new int[numberOfComponents];
+                        for (int i = 0; i < numberOfComponents; ++i) {
+                            values[i] = inputStream.readInt();
+                        }
+                        return values;
+                    }
+                    case IFD_FORMAT_SRATIONAL: {
+                        final Rational[] values = new Rational[numberOfComponents];
+                        for (int i = 0; i < numberOfComponents; ++i) {
+                            final long numerator = inputStream.readInt();
+                            final long denominator = inputStream.readInt();
+                            values[i] = new Rational(numerator, denominator);
+                        }
+                        return values;
+                    }
+                    case IFD_FORMAT_SINGLE: {
+                        final double[] values = new double[numberOfComponents];
+                        for (int i = 0; i < numberOfComponents; ++i) {
+                            values[i] = inputStream.readFloat();
+                        }
+                        return values;
+                    }
+                    case IFD_FORMAT_DOUBLE: {
+                        final double[] values = new double[numberOfComponents];
+                        for (int i = 0; i < numberOfComponents; ++i) {
+                            values[i] = inputStream.readDouble();
+                        }
+                        return values;
+                    }
+                    default:
+                        return null;
+                }
+            } catch (IOException e) {
+                Log.w(TAG, "IOException occurred during reading a value", e);
+                return null;
+            }
+        }
+
+        public double getDoubleValue(ByteOrder byteOrder) {
+            Object value = getValue(byteOrder);
+            if (value == null) {
+                throw new NumberFormatException("NULL can't be converted to a double value");
+            }
+            if (value instanceof String) {
+                return Double.parseDouble((String) value);
+            }
+            if (value instanceof long[]) {
+                long[] array = (long[]) value;
+                if (array.length == 1) {
+                    return array[0];
+                }
+                throw new NumberFormatException("There are more than one component");
+            }
+            if (value instanceof int[]) {
+                int[] array = (int[]) value;
+                if (array.length == 1) {
+                    return array[0];
+                }
+                throw new NumberFormatException("There are more than one component");
+            }
+            if (value instanceof double[]) {
+                double[] array = (double[]) value;
+                if (array.length == 1) {
+                    return array[0];
+                }
+                throw new NumberFormatException("There are more than one component");
+            }
+            if (value instanceof Rational[]) {
+                Rational[] array = (Rational[]) value;
+                if (array.length == 1) {
+                    return array[0].calculate();
+                }
+                throw new NumberFormatException("There are more than one component");
+            }
+            throw new NumberFormatException("Couldn't find a double value");
+        }
+
+        public int getIntValue(ByteOrder byteOrder) {
+            Object value = getValue(byteOrder);
+            if (value == null) {
+                throw new NumberFormatException("NULL can't be converted to a integer value");
+            }
+            if (value instanceof String) {
+                return Integer.parseInt((String) value);
+            }
+            if (value instanceof long[]) {
+                long[] array = (long[]) value;
+                if (array.length == 1) {
+                    return (int) array[0];
+                }
+                throw new NumberFormatException("There are more than one component");
+            }
+            if (value instanceof int[]) {
+                int[] array = (int[]) value;
+                if (array.length == 1) {
+                    return array[0];
+                }
+                throw new NumberFormatException("There are more than one component");
+            }
+            throw new NumberFormatException("Couldn't find a integer value");
+        }
+
+        public String getStringValue(ByteOrder byteOrder) {
+            Object value = getValue(byteOrder);
+            if (value == null) {
+                return null;
+            }
+            if (value instanceof String) {
+                return (String) value;
+            }
+
+            final StringBuilder stringBuilder = new StringBuilder();
+            if (value instanceof long[]) {
+                long[] array = (long[]) value;
+                for (int i = 0; i < array.length; ++i) {
+                    stringBuilder.append(array[i]);
+                    if (i + 1 != array.length) {
+                        stringBuilder.append(",");
+                    }
+                }
+                return stringBuilder.toString();
+            }
+            if (value instanceof int[]) {
+                int[] array = (int[]) value;
+                for (int i = 0; i < array.length; ++i) {
+                    stringBuilder.append(array[i]);
+                    if (i + 1 != array.length) {
+                        stringBuilder.append(",");
+                    }
+                }
+                return stringBuilder.toString();
+            }
+            if (value instanceof double[]) {
+                double[] array = (double[]) value;
+                for (int i = 0; i < array.length; ++i) {
+                    stringBuilder.append(array[i]);
+                    if (i + 1 != array.length) {
+                        stringBuilder.append(",");
+                    }
+                }
+                return stringBuilder.toString();
+            }
+            if (value instanceof Rational[]) {
+                Rational[] array = (Rational[]) value;
+                for (int i = 0; i < array.length; ++i) {
+                    stringBuilder.append(array[i].numerator);
+                    stringBuilder.append('/');
+                    stringBuilder.append(array[i].denominator);
+                    if (i + 1 != array.length) {
+                        stringBuilder.append(",");
+                    }
+                }
+                return stringBuilder.toString();
+            }
+            return null;
+        }
+
+        public int size() {
+            return IFD_FORMAT_BYTES_PER_FORMAT[format] * numberOfComponents;
+        }
+    }
+
+    // A class for indicating EXIF tag.
+    private static class ExifTag {
+        public final int number;
+        public final String name;
+        public final int primaryFormat;
+        public final int secondaryFormat;
+
+        private ExifTag(String name, int number, int format) {
+            this.name = name;
+            this.number = number;
+            this.primaryFormat = format;
+            this.secondaryFormat = -1;
+        }
+
+        private ExifTag(String name, int number, int primaryFormat, int secondaryFormat) {
+            this.name = name;
+            this.number = number;
+            this.primaryFormat = primaryFormat;
+            this.secondaryFormat = secondaryFormat;
+        }
+    }
+
+    // Primary image IFD TIFF tags (See JEITA CP-3451 Table 14. page 54).
+    private static final ExifTag[] IFD_TIFF_TAGS = new ExifTag[] {
+            new ExifTag(TAG_IMAGE_WIDTH, 256, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_IMAGE_LENGTH, 257, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_BITS_PER_SAMPLE, 258, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_COMPRESSION, 259, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_PHOTOMETRIC_INTERPRETATION, 262, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_IMAGE_DESCRIPTION, 270, IFD_FORMAT_STRING),
+            new ExifTag(TAG_MAKE, 271, IFD_FORMAT_STRING),
+            new ExifTag(TAG_MODEL, 272, IFD_FORMAT_STRING),
+            new ExifTag(TAG_STRIP_OFFSETS, 273, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_ORIENTATION, 274, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SAMPLES_PER_PIXEL, 277, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_ROWS_PER_STRIP, 278, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_STRIP_BYTE_COUNTS, 279, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_X_RESOLUTION, 282, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_Y_RESOLUTION, 283, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_PLANAR_CONFIGURATION, 284, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_RESOLUTION_UNIT, 296, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_TRANSFER_FUNCTION, 301, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SOFTWARE, 305, IFD_FORMAT_STRING),
+            new ExifTag(TAG_DATETIME, 306, IFD_FORMAT_STRING),
+            new ExifTag(TAG_ARTIST, 315, IFD_FORMAT_STRING),
+            new ExifTag(TAG_WHITE_POINT, 318, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_PRIMARY_CHROMATICITIES, 319, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT, 513, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_Y_CB_CR_COEFFICIENTS, 529, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_Y_CB_CR_SUB_SAMPLING, 530, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_Y_CB_CR_POSITIONING, 531, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_REFERENCE_BLACK_WHITE, 532, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_COPYRIGHT, 33432, IFD_FORMAT_STRING),
+            new ExifTag(TAG_EXIF_IFD_POINTER, 34665, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, IFD_FORMAT_ULONG),
+    };
+
+    // Primary image IFD Exif Private tags (See JEITA CP-3451 Table 15. page 55).
+    private static final ExifTag[] IFD_EXIF_TAGS = new ExifTag[] {
+            new ExifTag(TAG_EXPOSURE_TIME, 33434, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_APERTURE, 33437, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_EXPOSURE_PROGRAM, 34850, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SPECTRAL_SENSITIVITY, 34852, IFD_FORMAT_STRING),
+            new ExifTag(TAG_ISO, 34855, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_OECF, 34856, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_EXIF_VERSION, 36864, IFD_FORMAT_STRING),
+            new ExifTag(TAG_DATETIME_ORIGINAL, 36867, IFD_FORMAT_STRING),
+            new ExifTag(TAG_DATETIME_DIGITIZED, 36868, IFD_FORMAT_STRING),
+            new ExifTag(TAG_COMPONENTS_CONFIGURATION, 37121, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_COMPRESSED_BITS_PER_PIXEL, 37122, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_SHUTTER_SPEED_VALUE, 37377, IFD_FORMAT_SRATIONAL),
+            new ExifTag(TAG_APERTURE_VALUE, 37378, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_BRIGHTNESS_VALUE, 37379, IFD_FORMAT_SRATIONAL),
+            new ExifTag(TAG_EXPOSURE_BIAS_VALUE, 37380, IFD_FORMAT_SRATIONAL),
+            new ExifTag(TAG_MAX_APERTURE_VALUE, 37381, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_SUBJECT_DISTANCE, 37382, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_METERING_MODE, 37383, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_LIGHT_SOURCE, 37384, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_FLASH, 37385, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_FOCAL_LENGTH, 37386, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_SUBJECT_AREA, 37396, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_MAKER_NOTE, 37500, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_USER_COMMENT, 37510, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_SUBSEC_TIME, 37520, IFD_FORMAT_STRING),
+            new ExifTag(TAG_SUBSEC_TIME_ORIG, 37521, IFD_FORMAT_STRING),
+            new ExifTag(TAG_SUBSEC_TIME_DIG, 37522, IFD_FORMAT_STRING),
+            new ExifTag(TAG_FLASHPIX_VERSION, 40960, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_COLOR_SPACE, 40961, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_PIXEL_X_DIMENSION, 40962, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_PIXEL_Y_DIMENSION, 40963, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_RELATED_SOUND_FILE, 40964, IFD_FORMAT_STRING),
+            new ExifTag(TAG_INTEROPERABILITY_IFD_POINTER, 40965, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_FLASH_ENERGY, 41483, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_SPATIAL_FREQUENCY_RESPONSE, 41484, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_FOCAL_PLANE_X_RESOLUTION, 41486, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_FOCAL_PLANE_Y_RESOLUTION, 41487, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_FOCAL_PLANE_RESOLUTION_UNIT, 41488, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SUBJECT_LOCATION, 41492, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_EXPOSURE_INDEX, 41493, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_SENSING_METHOD, 41495, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_FILE_SOURCE, 41728, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_SCENE_TYPE, 41729, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_CFA_PATTERN, 41730, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_CUSTOM_RENDERED, 41985, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_EXPOSURE_MODE, 41986, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_WHITE_BALANCE, 41987, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_DIGITAL_ZOOM_RATIO, 41988, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_FOCAL_LENGTH_IN_35MM_FILM, 41989, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SCENE_CAPTURE_TYPE, 41990, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_GAIN_CONTROL, 41991, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_CONTRAST, 41992, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SATURATION, 41993, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SHARPNESS, 41994, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_DEVICE_SETTING_DESCRIPTION, 41995, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_SUBJECT_DISTANCE_RANGE, 41996, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_IMAGE_UNIQUE_ID, 42016, IFD_FORMAT_STRING),
+    };
+
+    // Primary image IFD GPS Info tags (See JEITA CP-3451 Table 16. page 56).
+    private static final ExifTag[] IFD_GPS_TAGS = new ExifTag[] {
+            new ExifTag(TAG_GPS_VERSION_ID, 0, IFD_FORMAT_BYTE),
+            new ExifTag(TAG_GPS_LATITUDE_REF, 1, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_LATITUDE, 2, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_LONGITUDE_REF, 3, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_LONGITUDE, 4, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_ALTITUDE_REF, 5, IFD_FORMAT_BYTE),
+            new ExifTag(TAG_GPS_ALTITUDE, 6, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_TIMESTAMP, 7, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_SATELLITES, 8, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_STATUS, 9, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_MEASURE_MODE, 10, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_DOP, 11, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_SPEED_REF, 12, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_SPEED, 13, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_TRACK_REF, 14, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_TRACK, 15, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_IMG_DIRECTION_REF, 16, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_IMG_DIRECTION, 17, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_MAP_DATUM, 18, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_DEST_LATITUDE_REF, 19, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_DEST_LATITUDE, 20, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_DEST_LONGITUDE_REF, 21, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_DEST_LONGITUDE, 22, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_DEST_BEARING_REF, 23, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_DEST_BEARING, 24, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_DEST_DISTANCE_REF, 25, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_DEST_DISTANCE, 26, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_GPS_PROCESSING_METHOD, 27, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_GPS_AREA_INFORMATION, 28, IFD_FORMAT_UNDEFINED),
+            new ExifTag(TAG_GPS_DATESTAMP, 29, IFD_FORMAT_STRING),
+            new ExifTag(TAG_GPS_DIFFERENTIAL, 30, IFD_FORMAT_USHORT),
+    };
+    // Primary image IFD Interoperability tag (See JEITA CP-3451 Table 17. page 56).
+    private static final ExifTag[] IFD_INTEROPERABILITY_TAGS = new ExifTag[] {
+            new ExifTag(TAG_INTEROPERABILITY_INDEX, 1, IFD_FORMAT_STRING),
+    };
+    // IFD Thumbnail tags (See JEITA CP-3451 Table 18. page 57).
+    private static final ExifTag[] IFD_THUMBNAIL_TAGS = new ExifTag[] {
+            new ExifTag(TAG_THUMBNAIL_IMAGE_WIDTH, 256, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_THUMBNAIL_IMAGE_LENGTH, 257, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_BITS_PER_SAMPLE, 258, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_COMPRESSION, 259, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_PHOTOMETRIC_INTERPRETATION, 262, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_IMAGE_DESCRIPTION, 270, IFD_FORMAT_STRING),
+            new ExifTag(TAG_MAKE, 271, IFD_FORMAT_STRING),
+            new ExifTag(TAG_MODEL, 272, IFD_FORMAT_STRING),
+            new ExifTag(TAG_STRIP_OFFSETS, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_ORIENTATION, 274, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SAMPLES_PER_PIXEL, 277, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_ROWS_PER_STRIP, 278, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_STRIP_BYTE_COUNTS, 279, IFD_FORMAT_USHORT, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_X_RESOLUTION, 282, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_Y_RESOLUTION, 283, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_PLANAR_CONFIGURATION, 284, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_RESOLUTION_UNIT, 296, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_TRANSFER_FUNCTION, 301, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_SOFTWARE, 305, IFD_FORMAT_STRING),
+            new ExifTag(TAG_DATETIME, 306, IFD_FORMAT_STRING),
+            new ExifTag(TAG_ARTIST, 315, IFD_FORMAT_STRING),
+            new ExifTag(TAG_WHITE_POINT, 318, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_PRIMARY_CHROMATICITIES, 319, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT, 513, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_Y_CB_CR_COEFFICIENTS, 529, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_Y_CB_CR_SUB_SAMPLING, 530, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_Y_CB_CR_POSITIONING, 531, IFD_FORMAT_USHORT),
+            new ExifTag(TAG_REFERENCE_BLACK_WHITE, 532, IFD_FORMAT_URATIONAL),
+            new ExifTag(TAG_COPYRIGHT, 33432, IFD_FORMAT_STRING),
+            new ExifTag(TAG_EXIF_IFD_POINTER, 34665, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, IFD_FORMAT_ULONG),
+    };
+
+    // See JEITA CP-3451 Figure 5. page 9.
+    // The following values are used for indicating pointers to the other Image File Directorys.
+
+    // Indices of Exif Ifd tag groups
+    private static final int IFD_TIFF_HINT = 0;
+    private static final int IFD_EXIF_HINT = 1;
+    private static final int IFD_GPS_HINT = 2;
+    private static final int IFD_INTEROPERABILITY_HINT = 3;
+    private static final int IFD_THUMBNAIL_HINT = 4;
+    // List of Exif tag groups
+    private static final ExifTag[][] EXIF_TAGS = new ExifTag[][] {
+            IFD_TIFF_TAGS, IFD_EXIF_TAGS, IFD_GPS_TAGS, IFD_INTEROPERABILITY_TAGS,
+            IFD_THUMBNAIL_TAGS
+    };
+    // List of tags for pointing to the other image file directory offset.
+    private static final ExifTag[] IFD_POINTER_TAGS = new ExifTag[] {
+            new ExifTag(TAG_EXIF_IFD_POINTER, 34665, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_GPS_INFO_IFD_POINTER, 34853, IFD_FORMAT_ULONG),
+            new ExifTag(TAG_INTEROPERABILITY_IFD_POINTER, 40965, IFD_FORMAT_ULONG),
+    };
+    // List of indices of the indicated tag groups according to the IFD_POINTER_TAGS
+    private static final int[] IFD_POINTER_TAG_HINTS = new int[] {
+            IFD_EXIF_HINT, IFD_GPS_HINT, IFD_INTEROPERABILITY_HINT
+    };
+    // Tags for indicating the thumbnail offset and length
+    private static final ExifTag JPEG_INTERCHANGE_FORMAT_TAG =
+            new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT, 513, IFD_FORMAT_ULONG);
+    private static final ExifTag JPEG_INTERCHANGE_FORMAT_LENGTH_TAG =
+            new ExifTag(TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, 514, IFD_FORMAT_ULONG);
+
+    // Mappings from tag number to tag name and each item represents one IFD tag group.
+    private static final HashMap[] sExifTagMapsForReading = new HashMap[EXIF_TAGS.length];
+    // Mappings from tag name to tag number and each item represents one IFD tag group.
+    private static final HashMap[] sExifTagMapsForWriting = new HashMap[EXIF_TAGS.length];
+    private static final HashSet<String> sTagSetForCompatibility = new HashSet<>(Arrays.asList(
+            TAG_APERTURE, TAG_DIGITAL_ZOOM_RATIO, TAG_EXPOSURE_TIME, TAG_SUBJECT_DISTANCE,
+            TAG_GPS_TIMESTAMP));
+
+    // See JPEG File Interchange Format Version 1.02.
+    // The following values are defined for handling JPEG streams. In this implementation, we are
+    // not only getting information from EXIF but also from some JPEG special segments such as
+    // MARKER_COM for user comment and MARKER_SOFx for image width and height.
+
+    private static final Charset ASCII = Charset.forName("US-ASCII");
+    // Identifier for EXIF APP1 segment in JPEG
+    private static final byte[] IDENTIFIER_EXIF_APP1 = "Exif\0\0".getBytes(ASCII);
+    // JPEG segment markers, that each marker consumes two bytes beginning with 0xff and ending with
+    // the indicator. There is no SOF4, SOF8, SOF16 markers in JPEG and SOFx markers indicates start
+    // of frame(baseline DCT) and the image size info exists in its beginning part.
+    private static final byte MARKER = (byte) 0xff;
+    private static final byte MARKER_SOI = (byte) 0xd8;
+    private static final byte MARKER_SOF0 = (byte) 0xc0;
+    private static final byte MARKER_SOF1 = (byte) 0xc1;
+    private static final byte MARKER_SOF2 = (byte) 0xc2;
+    private static final byte MARKER_SOF3 = (byte) 0xc3;
+    private static final byte MARKER_SOF5 = (byte) 0xc5;
+    private static final byte MARKER_SOF6 = (byte) 0xc6;
+    private static final byte MARKER_SOF7 = (byte) 0xc7;
+    private static final byte MARKER_SOF9 = (byte) 0xc9;
+    private static final byte MARKER_SOF10 = (byte) 0xca;
+    private static final byte MARKER_SOF11 = (byte) 0xcb;
+    private static final byte MARKER_SOF13 = (byte) 0xcd;
+    private static final byte MARKER_SOF14 = (byte) 0xce;
+    private static final byte MARKER_SOF15 = (byte) 0xcf;
+    private static final byte MARKER_SOS = (byte) 0xda;
+    private static final byte MARKER_APP1 = (byte) 0xe1;
+    private static final byte MARKER_COM = (byte) 0xfe;
+    private static final byte MARKER_EOI = (byte) 0xd9;
+
     static {
-        System.loadLibrary("jhead_jni");
         sFormatter = new SimpleDateFormat("yyyy:MM:dd HH:mm:ss");
         sFormatter.setTimeZone(TimeZone.getTimeZone("UTC"));
+
+        // Build up the hash tables to look up Exif tags for reading Exif tags.
+        for (int hint = 0; hint < EXIF_TAGS.length; ++hint) {
+            sExifTagMapsForReading[hint] = new HashMap();
+            sExifTagMapsForWriting[hint] = new HashMap();
+            for (ExifTag tag : EXIF_TAGS[hint]) {
+                sExifTagMapsForReading[hint].put(tag.number, tag);
+                sExifTagMapsForWriting[hint].put(tag.name, tag);
+            }
+        }
     }
 
-    private String mFilename;
-    private HashMap<String, String> mAttributes;
+    private final String mFilename;
+    private final HashMap[] mAttributes = new HashMap[EXIF_TAGS.length];
+    private ByteOrder mExifByteOrder = ByteOrder.BIG_ENDIAN;
     private boolean mHasThumbnail;
+    // The following values used for indicating a thumbnail position.
+    private int mThumbnailOffset;
+    private int mThumbnailLength;
+    private byte[] mThumbnailBytes;
+    private boolean mIsSupportedFile;
 
-    // Because the underlying implementation (jhead) uses static variables,
-    // there can only be one user at a time for the native functions (and
-    // they cannot keep state in the native code across function calls). We
-    // use sLock to serialize the accesses.
-    private static final Object sLock = new Object();
+    // Pattern to check non zero timestamp
+    private static final Pattern sNonZeroTimePattern = Pattern.compile(".*[1-9].*");
+    // Pattern to check gps timestamp
+    private static final Pattern sGpsTimestampPattern =
+            Pattern.compile("^([0-9][0-9]):([0-9][0-9]):([0-9][0-9])$");
 
     /**
-     * Reads Exif tags from the specified JPEG file.
+     * Reads Exif tags from the specified image file.
      */
     public ExifInterface(String filename) throws IOException {
         if (filename == null) {
@@ -139,53 +1058,99 @@ public class ExifInterface {
         loadAttributes();
     }
 
+
+    /**
+     * Returns the EXIF attribute of the specified tag or {@code null} if there is no such tag in
+     * the image file.
+     *
+     * @param tag the name of the tag.
+     */
+    private ExifAttribute getExifAttribute(String tag) {
+        // Retrieves all tag groups. The value from primary image tag group has a higher priority
+        // than the value from the thumbnail tag group if there are more than one candidates.
+        for (int i = 0; i < EXIF_TAGS.length; ++i) {
+            Object value = mAttributes[i].get(tag);
+            if (value != null) {
+                return (ExifAttribute) value;
+            }
+        }
+        return null;
+    }
+
     /**
      * Returns the value of the specified tag or {@code null} if there
-     * is no such tag in the JPEG file.
+     * is no such tag in the image file.
      *
      * @param tag the name of the tag.
      */
     public String getAttribute(String tag) {
-        return mAttributes.get(tag);
+        ExifAttribute attribute = getExifAttribute(tag);
+        if (attribute != null) {
+            if (!sTagSetForCompatibility.contains(tag)) {
+                return attribute.getStringValue(mExifByteOrder);
+            }
+            if (tag.equals(TAG_GPS_TIMESTAMP)) {
+                // Convert the rational values to the custom formats for backwards compatibility.
+                if (attribute.format != IFD_FORMAT_URATIONAL
+                        && attribute.format != IFD_FORMAT_SRATIONAL) {
+                    return null;
+                }
+                Rational[] array = (Rational[]) attribute.getValue(mExifByteOrder);
+                if (array.length != 3) {
+                    return null;
+                }
+                return String.format("%02d:%02d:%02d",
+                        (int) ((float) array[0].numerator / array[0].denominator),
+                        (int) ((float) array[1].numerator / array[1].denominator),
+                        (int) ((float) array[2].numerator / array[2].denominator));
+            }
+            try {
+                return Double.toString(attribute.getDoubleValue(mExifByteOrder));
+            } catch (NumberFormatException e) {
+                return null;
+            }
+        }
+        return null;
     }
 
     /**
      * Returns the integer value of the specified tag. If there is no such tag
-     * in the JPEG file or the value cannot be parsed as integer, return
+     * in the image file or the value cannot be parsed as integer, return
      * <var>defaultValue</var>.
      *
      * @param tag the name of the tag.
      * @param defaultValue the value to return if the tag is not available.
      */
     public int getAttributeInt(String tag, int defaultValue) {
-        String value = mAttributes.get(tag);
-        if (value == null) return defaultValue;
+        ExifAttribute exifAttribute = getExifAttribute(tag);
+        if (exifAttribute == null) {
+            return defaultValue;
+        }
+
         try {
-            return Integer.valueOf(value);
-        } catch (NumberFormatException ex) {
+            return exifAttribute.getIntValue(mExifByteOrder);
+        } catch (NumberFormatException e) {
             return defaultValue;
         }
     }
 
     /**
-     * Returns the double value of the specified rational tag. If there is no
-     * such tag in the JPEG file or the value cannot be parsed as double, return
-     * <var>defaultValue</var>.
+     * Returns the double value of the tag that is specified as rational or contains a
+     * double-formatted value. If there is no such tag in the image file or the value cannot be
+     * parsed as double, return <var>defaultValue</var>.
      *
      * @param tag the name of the tag.
      * @param defaultValue the value to return if the tag is not available.
      */
     public double getAttributeDouble(String tag, double defaultValue) {
-        String value = mAttributes.get(tag);
-        if (value == null) return defaultValue;
+        ExifAttribute exifAttribute = getExifAttribute(tag);
+        if (exifAttribute == null) {
+            return defaultValue;
+        }
+
         try {
-            int index = value.indexOf("/");
-            if (index == -1) return defaultValue;
-            double denom = Double.parseDouble(value.substring(index + 1));
-            if (denom == 0) return defaultValue;
-            double num = Double.parseDouble(value.substring(0, index));
-            return num / denom;
-        } catch (NumberFormatException ex) {
+            return exifAttribute.getDoubleValue(mExifByteOrder);
+        } catch (NumberFormatException e) {
             return defaultValue;
         }
     }
@@ -197,116 +1162,289 @@ public class ExifInterface {
      * @param value the value of the tag.
      */
     public void setAttribute(String tag, String value) {
-        mAttributes.put(tag, value);
+        // Convert the given value to rational values for backwards compatibility.
+        if (value != null && sTagSetForCompatibility.contains(tag)) {
+            if (tag.equals(TAG_GPS_TIMESTAMP)) {
+                Matcher m = sGpsTimestampPattern.matcher(value);
+                if (!m.find()) {
+                    Log.w(TAG, "Invalid value for " + tag + " : " + value);
+                    return;
+                }
+                value = Integer.parseInt(m.group(1)) + "/1," + Integer.parseInt(m.group(2)) + "/1,"
+                        + Integer.parseInt(m.group(3)) + "/1";
+            } else {
+                try {
+                    double doubleValue = Double.parseDouble(value);
+                    value = (long) (doubleValue * 10000L) + "/10000";
+                } catch (NumberFormatException e) {
+                    Log.w(TAG, "Invalid value for " + tag + " : " + value);
+                    return;
+                }
+            }
+        }
+
+        for (int i = 0 ; i < EXIF_TAGS.length; ++i) {
+            if (i == IFD_THUMBNAIL_HINT && !mHasThumbnail) {
+                continue;
+            }
+            final Object obj = sExifTagMapsForWriting[i].get(tag);
+            if (obj != null) {
+                if (value == null) {
+                    mAttributes[i].remove(tag);
+                    continue;
+                }
+                final ExifTag exifTag = (ExifTag) obj;
+                Pair<Integer, Integer> guess = guessDataFormat(value);
+                int dataFormat;
+                if (exifTag.primaryFormat == guess.first || exifTag.primaryFormat == guess.second) {
+                    dataFormat = exifTag.primaryFormat;
+                } else if (exifTag.secondaryFormat != -1 && (exifTag.secondaryFormat == guess.first
+                        || exifTag.secondaryFormat == guess.second)) {
+                    dataFormat = exifTag.secondaryFormat;
+                } else if (exifTag.primaryFormat == IFD_FORMAT_BYTE
+                        || exifTag.primaryFormat == IFD_FORMAT_UNDEFINED
+                        || exifTag.primaryFormat == IFD_FORMAT_STRING) {
+                    dataFormat = exifTag.primaryFormat;
+                } else {
+                    Log.w(TAG, "Given tag (" + tag + ") value didn't match with one of expected "
+                            + "formats: " + IFD_FORMAT_NAMES[exifTag.primaryFormat]
+                            + (exifTag.secondaryFormat == -1 ? "" : ", "
+                            + IFD_FORMAT_NAMES[exifTag.secondaryFormat]) + " (guess: "
+                            + IFD_FORMAT_NAMES[guess.first] + (guess.second == -1 ? "" : ", "
+                            + IFD_FORMAT_NAMES[guess.second]) + ")");
+                    continue;
+                }
+                switch (dataFormat) {
+                    case IFD_FORMAT_BYTE: {
+                        mAttributes[i].put(tag, ExifAttribute.createByte(value));
+                        break;
+                    }
+                    case IFD_FORMAT_UNDEFINED:
+                    case IFD_FORMAT_STRING: {
+                        mAttributes[i].put(tag, ExifAttribute.createString(value));
+                        break;
+                    }
+                    case IFD_FORMAT_USHORT: {
+                        final String[] values = value.split(",");
+                        final int[] intArray = new int[values.length];
+                        for (int j = 0; j < values.length; ++j) {
+                            intArray[j] = Integer.parseInt(values[j]);
+                        }
+                        mAttributes[i].put(tag,
+                                ExifAttribute.createUShort(intArray, mExifByteOrder));
+                        break;
+                    }
+                    case IFD_FORMAT_SLONG: {
+                        final String[] values = value.split(",");
+                        final int[] intArray = new int[values.length];
+                        for (int j = 0; j < values.length; ++j) {
+                            intArray[j] = Integer.parseInt(values[j]);
+                        }
+                        mAttributes[i].put(tag,
+                                ExifAttribute.createSLong(intArray, mExifByteOrder));
+                        break;
+                    }
+                    case IFD_FORMAT_ULONG: {
+                        final String[] values = value.split(",");
+                        final long[] longArray = new long[values.length];
+                        for (int j = 0; j < values.length; ++j) {
+                            longArray[j] = Long.parseLong(values[j]);
+                        }
+                        mAttributes[i].put(tag,
+                                ExifAttribute.createULong(longArray, mExifByteOrder));
+                        break;
+                    }
+                    case IFD_FORMAT_URATIONAL: {
+                        final String[] values = value.split(",");
+                        final Rational[] rationalArray = new Rational[values.length];
+                        for (int j = 0; j < values.length; ++j) {
+                            final String[] numbers = values[j].split("/");
+                            rationalArray[j] = new Rational(Long.parseLong(numbers[0]),
+                                    Long.parseLong(numbers[1]));
+                        }
+                        mAttributes[i].put(tag,
+                                ExifAttribute.createURational(rationalArray, mExifByteOrder));
+                        break;
+                    }
+                    case IFD_FORMAT_SRATIONAL: {
+                        final String[] values = value.split(",");
+                        final Rational[] rationalArray = new Rational[values.length];
+                        for (int j = 0; j < values.length; ++j) {
+                            final String[] numbers = values[j].split("/");
+                            rationalArray[j] = new Rational(Long.parseLong(numbers[0]),
+                                    Long.parseLong(numbers[1]));
+                        }
+                        mAttributes[i].put(tag,
+                                ExifAttribute.createSRational(rationalArray, mExifByteOrder));
+                        break;
+                    }
+                    case IFD_FORMAT_DOUBLE: {
+                        final String[] values = value.split(",");
+                        final double[] doubleArray = new double[values.length];
+                        for (int j = 0; j < values.length; ++j) {
+                            doubleArray[j] = Double.parseDouble(values[j]);
+                        }
+                        mAttributes[i].put(tag,
+                                ExifAttribute.createDouble(doubleArray, mExifByteOrder));
+                        break;
+                    }
+                    default:
+                        Log.w(TAG, "Data format isn't one of expected formats: " + dataFormat);
+                        continue;
+                }
+            }
+        }
     }
 
     /**
-     * Initialize mAttributes with the attributes from the file mFilename.
+     * Update the values of the tags in the tag groups if any value for the tag already was stored.
      *
-     * mAttributes is a HashMap which stores the Exif attributes of the file.
-     * The key is the standard tag name and the value is the tag's value: e.g.
-     * Model -> Nikon. Numeric values are stored as strings.
+     * @param tag the name of the tag.
+     * @param value the value of the tag in a form of {@link ExifAttribute}.
+     * @return Returns {@code true} if updating is placed.
+     */
+    private boolean updateAttribute(String tag, ExifAttribute value) {
+        boolean updated = false;
+        for (int i = 0 ; i < EXIF_TAGS.length; ++i) {
+            if (mAttributes[i].containsKey(tag)) {
+                mAttributes[i].put(tag, value);
+                updated = true;
+            }
+        }
+        return updated;
+    }
+
+    /**
+     * Remove any values of the specified tag.
      *
-     * This function also initialize mHasThumbnail to indicate whether the
-     * file has a thumbnail inside.
+     * @param tag the name of the tag.
+     */
+    private void removeAttribute(String tag) {
+        for (int i = 0 ; i < EXIF_TAGS.length; ++i) {
+            mAttributes[i].remove(tag);
+        }
+    }
+
+    /**
+     * This function decides which parser to read the image data according to the given input stream
+     * type and the content of the input stream. In each case, it reads the first three bytes to
+     * determine whether the image data format is JPEG or not.
      */
     private void loadAttributes() throws IOException {
-        // format of string passed from native C code:
-        // "attrCnt attr1=valueLen value1attr2=value2Len value2..."
-        // example:
-        // "4 attrPtr ImageLength=4 1024Model=6 FooImageWidth=4 1280Make=3 FOO"
-        mAttributes = new HashMap<String, String>();
-
-        String attrStr;
-        synchronized (sLock) {
-            attrStr = getAttributesNative(mFilename);
-        }
-
-        // get count
-        int ptr = attrStr.indexOf(' ');
-        int count = Integer.parseInt(attrStr.substring(0, ptr));
-        // skip past the space between item count and the rest of the attributes
-        ++ptr;
-
-        for (int i = 0; i < count; i++) {
-            // extract the attribute name
-            int equalPos = attrStr.indexOf('=', ptr);
-            String attrName = attrStr.substring(ptr, equalPos);
-            ptr = equalPos + 1;     // skip past =
-
-            // extract the attribute value length
-            int lenPos = attrStr.indexOf(' ', ptr);
-            int attrLen = Integer.parseInt(attrStr.substring(ptr, lenPos));
-            ptr = lenPos + 1;       // skip pas the space
-
-            // extract the attribute value
-            String attrValue = attrStr.substring(ptr, ptr + attrLen);
-            ptr += attrLen;
-
-            if (attrName.equals("hasThumbnail")) {
-                mHasThumbnail = attrValue.equalsIgnoreCase("true");
-            } else {
-                mAttributes.put(attrName, attrValue);
+        // Initialize mAttributes.
+        for (int i = 0; i < EXIF_TAGS.length; ++i) {
+            mAttributes[i] = new HashMap();
+        }
+        try {
+            InputStream in = new FileInputStream(mFilename);
+            getJpegAttributes(in);
+            mIsSupportedFile = true;
+        } catch (IOException e) {
+            // Ignore exceptions in order to keep the compatibility with the old versions of
+            // ExifInterface.
+            mIsSupportedFile = false;
+            Log.w(TAG, "Invalid image.", e);
+        } finally {
+            addDefaultValuesForCompatibility();
+            if (DEBUG) {
+                printAttributes();
+            }
+        }
+    }
+
+    // Prints out attributes for debugging.
+    private void printAttributes() {
+        for (int i = 0; i < mAttributes.length; ++i) {
+            Log.d(TAG, "The size of tag group[" + i + "]: " + mAttributes[i].size());
+            for (Map.Entry entry : (Set<Map.Entry>) mAttributes[i].entrySet()) {
+                final ExifAttribute tagValue = (ExifAttribute) entry.getValue();
+                Log.d(TAG, "tagName: " + entry.getKey() + ", tagType: " + tagValue.toString()
+                        + ", tagValue: '" + tagValue.getStringValue(mExifByteOrder) + "'");
             }
         }
     }
 
     /**
-     * Save the tag data into the JPEG file. This is expensive because it involves
-     * copying all the JPG data from one file to another and deleting the old file
-     * and renaming the other. It's best to use {@link #setAttribute(String,String)}
-     * to set all attributes to write and make a single call rather than multiple
-     * calls for each attribute.
+     * Save the tag data into the original image file. This is expensive because it involves
+     * copying all the data from one file to another and deleting the old file and renaming the
+     * other. It's best to use {@link #setAttribute(String,String)} to set all attributes to write
+     * and make a single call rather than multiple calls for each attribute.
      */
     public void saveAttributes() throws IOException {
-        // format of string passed to native C code:
-        // "attrCnt attr1=valueLen value1attr2=value2Len value2..."
-        // example:
-        // "4 attrPtr ImageLength=4 1024Model=6 FooImageWidth=4 1280Make=3 FOO"
-        StringBuilder sb = new StringBuilder();
-        int size = mAttributes.size();
-        if (mAttributes.containsKey("hasThumbnail")) {
-            --size;
-        }
-        sb.append(size + " ");
-        for (Map.Entry<String, String> iter : mAttributes.entrySet()) {
-            String key = iter.getKey();
-            if (key.equals("hasThumbnail")) {
-                // this is a fake attribute not saved as an exif tag
-                continue;
-            }
-            String val = iter.getValue();
-            sb.append(key + "=");
-            sb.append(val.length() + " ");
-            sb.append(val);
+        if (!mIsSupportedFile) {
+            throw new UnsupportedOperationException(
+                    "ExifInterface only supports saving attributes on JPEG formats.");
+        }
+        // Keep the thumbnail in memory
+        mThumbnailBytes = getThumbnail();
+
+        File tempFile = null;
+        // Move the original file to temporary file.
+        tempFile = new File(mFilename + ".tmp");
+        File originalFile = new File(mFilename);
+        if (!originalFile.renameTo(tempFile)) {
+            throw new IOException("Could'nt rename to " + tempFile.getAbsolutePath());
         }
-        String s = sb.toString();
-        synchronized (sLock) {
-            saveAttributesNative(mFilename, s);
-            commitChangesNative(mFilename);
+
+        FileInputStream in = null;
+        FileOutputStream out = null;
+        try {
+            // Save the new file.
+            in = new FileInputStream(tempFile);
+            out = new FileOutputStream(mFilename);
+            saveJpegAttributes(in, out);
+        } finally {
+            IoUtils.closeQuietly(in);
+            IoUtils.closeQuietly(out);
+            tempFile.delete();
         }
+
+        // Discard the thumbnail in memory
+        mThumbnailBytes = null;
     }
 
     /**
-     * Returns true if the JPEG file has a thumbnail.
+     * Returns true if the image file has a thumbnail.
      */
     public boolean hasThumbnail() {
         return mHasThumbnail;
     }
 
     /**
-     * Returns the thumbnail inside the JPEG file, or {@code null} if there is no thumbnail.
+     * Returns the thumbnail inside the image file, or {@code null} if there is no thumbnail.
      * The returned data is in JPEG format and can be decoded using
      * {@link android.graphics.BitmapFactory#decodeByteArray(byte[],int,int)}
      */
     public byte[] getThumbnail() {
-        synchronized (sLock) {
-            return getThumbnailNative(mFilename);
+        if (!mHasThumbnail) {
+            return null;
+        }
+        if (mThumbnailBytes != null) {
+            return mThumbnailBytes;
         }
+
+        // Read the thumbnail.
+        FileInputStream in = null;
+        try {
+            in = new FileInputStream(mFilename);
+            if (in.skip(mThumbnailOffset) != mThumbnailOffset) {
+                throw new IOException("Corrupted image");
+            }
+            byte[] buffer = new byte[mThumbnailLength];
+            if (in.read(buffer) != mThumbnailLength) {
+                throw new IOException("Corrupted image");
+            }
+            return buffer;
+        } catch (IOException e) {
+            // Couldn't get a thumbnail image.
+        } finally {
+            IoUtils.closeQuietly(in);
+        }
+        return null;
     }
 
     /**
-     * Returns the offset and length of thumbnail inside the JPEG file, or
+     * Returns the offset and length of thumbnail inside the image file, or
      * {@code null} if there is no thumbnail.
      *
      * @return two-element array, the offset in the first value, and length in
@@ -314,9 +1452,15 @@ public class ExifInterface {
      * @hide
      */
     public long[] getThumbnailRange() {
-        synchronized (sLock) {
-            return getThumbnailRangeNative(mFilename);
+        if (!mHasThumbnail) {
+            return null;
         }
+
+        long[] range = new long[2];
+        range[0] = mThumbnailOffset;
+        range[1] = mThumbnailLength;
+
+        return range;
     }
 
     /**
@@ -325,10 +1469,10 @@ public class ExifInterface {
      * Exif tags are not available.
      */
     public boolean getLatLong(float output[]) {
-        String latValue = mAttributes.get(ExifInterface.TAG_GPS_LATITUDE);
-        String latRef = mAttributes.get(ExifInterface.TAG_GPS_LATITUDE_REF);
-        String lngValue = mAttributes.get(ExifInterface.TAG_GPS_LONGITUDE);
-        String lngRef = mAttributes.get(ExifInterface.TAG_GPS_LONGITUDE_REF);
+        String latValue = getAttribute(TAG_GPS_LATITUDE);
+        String latRef = getAttribute(TAG_GPS_LATITUDE_REF);
+        String lngValue = getAttribute(TAG_GPS_LONGITUDE);
+        String lngRef = getAttribute(TAG_GPS_LONGITUDE_REF);
 
         if (latValue != null && latRef != null && lngValue != null && lngRef != null) {
             try {
@@ -354,7 +1498,7 @@ public class ExifInterface {
         int ref = getAttributeInt(TAG_GPS_ALTITUDE_REF, -1);
 
         if (altitude >= 0 && ref >= 0) {
-            return (double) (altitude * ((ref == 1) ? -1 : 1));
+            return (altitude * ((ref == 1) ? -1 : 1));
         } else {
             return defaultValue;
         }
@@ -366,8 +1510,9 @@ public class ExifInterface {
      * @hide
      */
     public long getDateTime() {
-        String dateTimeString = mAttributes.get(TAG_DATETIME);
-        if (dateTimeString == null) return -1;
+        String dateTimeString = getAttribute(TAG_DATETIME);
+        if (dateTimeString == null
+                || !sNonZeroTimePattern.matcher(dateTimeString).matches()) return -1;
 
         ParsePosition pos = new ParsePosition(0);
         try {
@@ -377,7 +1522,7 @@ public class ExifInterface {
             if (datetime == null) return -1;
             long msecs = datetime.getTime();
 
-            String subSecs = mAttributes.get(TAG_SUBSECTIME);
+            String subSecs = getAttribute(TAG_SUBSEC_TIME);
             if (subSecs != null) {
                 try {
                     long sub = Long.valueOf(subSecs);
@@ -386,10 +1531,11 @@ public class ExifInterface {
                     }
                     msecs += sub;
                 } catch (NumberFormatException e) {
+                    // Ignored
                 }
             }
             return msecs;
-        } catch (IllegalArgumentException ex) {
+        } catch (IllegalArgumentException e) {
             return -1;
         }
     }
@@ -400,9 +1546,13 @@ public class ExifInterface {
      * @hide
      */
     public long getGpsDateTime() {
-        String date = mAttributes.get(TAG_GPS_DATESTAMP);
-        String time = mAttributes.get(TAG_GPS_TIMESTAMP);
-        if (date == null || time == null) return -1;
+        String date = getAttribute(TAG_GPS_DATESTAMP);
+        String time = getAttribute(TAG_GPS_TIMESTAMP);
+        if (date == null || time == null
+                || (!sNonZeroTimePattern.matcher(date).matches()
+                && !sNonZeroTimePattern.matcher(time).matches())) {
+            return -1;
+        }
 
         String dateTimeString = date + ' ' + time;
 
@@ -411,13 +1561,12 @@ public class ExifInterface {
             Date datetime = sFormatter.parse(dateTimeString, pos);
             if (datetime == null) return -1;
             return datetime.getTime();
-        } catch (IllegalArgumentException ex) {
+        } catch (IllegalArgumentException e) {
             return -1;
         }
     }
 
-    private static float convertRationalLatLonToFloat(
-            String rationalString, String ref) {
+    private static float convertRationalLatLonToFloat(String rationalString, String ref) {
         try {
             String [] parts = rationalString.split(",");
 
@@ -439,26 +1588,949 @@ public class ExifInterface {
                 return (float) -result;
             }
             return (float) result;
-        } catch (NumberFormatException e) {
-            // Some of the nubmers are not valid
-            throw new IllegalArgumentException();
-        } catch (ArrayIndexOutOfBoundsException e) {
-            // Some of the rational does not follow the correct format
+        } catch (NumberFormatException | ArrayIndexOutOfBoundsException e) {
+            // Not valid
             throw new IllegalArgumentException();
         }
     }
 
-    private native boolean appendThumbnailNative(String fileName,
-            String thumbnailFileName);
+    // Loads EXIF attributes from a JPEG input stream.
+    private void getJpegAttributes(InputStream inputStream) throws IOException {
+        // See JPEG File Interchange Format Specification page 5.
+        if (DEBUG) {
+            Log.d(TAG, "getJpegAttributes starting with: " + inputStream);
+        }
+        DataInputStream dataInputStream = new DataInputStream(inputStream);
+        byte marker;
+        int bytesRead = 0;
+        if ((marker = dataInputStream.readByte()) != MARKER) {
+            throw new IOException("Invalid marker: " + Integer.toHexString(marker & 0xff));
+        }
+        ++bytesRead;
+        if (dataInputStream.readByte() != MARKER_SOI) {
+            throw new IOException("Invalid marker: " + Integer.toHexString(marker & 0xff));
+        }
+        ++bytesRead;
+        while (true) {
+            marker = dataInputStream.readByte();
+            if (marker != MARKER) {
+                throw new IOException("Invalid marker:" + Integer.toHexString(marker & 0xff));
+            }
+            ++bytesRead;
+            marker = dataInputStream.readByte();
+            if (DEBUG) {
+                Log.d(TAG, "Found JPEG segment indicator: " + Integer.toHexString(marker & 0xff));
+            }
+            ++bytesRead;
+
+            // EOI indicates the end of an image and in case of SOS, JPEG image stream starts and
+            // the image data will terminate right after.
+            if (marker == MARKER_EOI || marker == MARKER_SOS) {
+                break;
+            }
+            int length = dataInputStream.readUnsignedShort() - 2;
+            bytesRead += 2;
+            if (DEBUG) {
+                Log.d(TAG, "JPEG segment: " + Integer.toHexString(marker & 0xff) + " (length: "
+                        + (length + 2) + ")");
+            }
+            if (length < 0) {
+                throw new IOException("Invalid length");
+            }
+            switch (marker) {
+                case MARKER_APP1: {
+                    if (DEBUG) {
+                        Log.d(TAG, "MARKER_APP1");
+                    }
+                    if (length < 6) {
+                        // Skip if it's not an EXIF APP1 segment.
+                        break;
+                    }
+                    byte[] identifier = new byte[6];
+                    if (inputStream.read(identifier) != 6) {
+                        throw new IOException("Invalid exif");
+                    }
+                    bytesRead += 6;
+                    length -= 6;
+                    if (!Arrays.equals(identifier, IDENTIFIER_EXIF_APP1)) {
+                        // Skip if it's not an EXIF APP1 segment.
+                        break;
+                    }
+                    if (length <= 0) {
+                        throw new IOException("Invalid exif");
+                    }
+                    if (DEBUG) {
+                        Log.d(TAG, "readExifSegment with a byte array (length: " + length + ")");
+                    }
+                    byte[] bytes = new byte[length];
+                    if (dataInputStream.read(bytes) != length) {
+                        throw new IOException("Invalid exif");
+                    }
+                    readExifSegment(bytes, bytesRead);
+                    bytesRead += length;
+                    length = 0;
+                    break;
+                }
+
+                case MARKER_COM: {
+                    byte[] bytes = new byte[length];
+                    if (dataInputStream.read(bytes) != length) {
+                        throw new IOException("Invalid exif");
+                    }
+                    length = 0;
+                    if (getAttribute(TAG_USER_COMMENT) == null) {
+                        mAttributes[IFD_EXIF_HINT].put(TAG_USER_COMMENT, ExifAttribute.createString(
+                                new String(bytes, ASCII)));
+                    }
+                    break;
+                }
+
+                case MARKER_SOF0:
+                case MARKER_SOF1:
+                case MARKER_SOF2:
+                case MARKER_SOF3:
+                case MARKER_SOF5:
+                case MARKER_SOF6:
+                case MARKER_SOF7:
+                case MARKER_SOF9:
+                case MARKER_SOF10:
+                case MARKER_SOF11:
+                case MARKER_SOF13:
+                case MARKER_SOF14:
+                case MARKER_SOF15: {
+                    if (dataInputStream.skipBytes(1) != 1) {
+                        throw new IOException("Invalid SOFx");
+                    }
+                    mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_LENGTH, ExifAttribute.createULong(
+                            dataInputStream.readUnsignedShort(), mExifByteOrder));
+                    mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_WIDTH, ExifAttribute.createULong(
+                            dataInputStream.readUnsignedShort(), mExifByteOrder));
+                    length -= 5;
+                    break;
+                }
+
+                default: {
+                    break;
+                }
+            }
+            if (length < 0) {
+                throw new IOException("Invalid length");
+            }
+            if (dataInputStream.skipBytes(length) != length) {
+                throw new IOException("Invalid JPEG segment");
+            }
+            bytesRead += length;
+        }
+    }
+
+    // Stores a new JPEG image with EXIF attributes into a given output stream.
+    private void saveJpegAttributes(InputStream inputStream, OutputStream outputStream)
+            throws IOException {
+        // See JPEG File Interchange Format Specification page 5.
+        if (DEBUG) {
+            Log.d(TAG, "saveJpegAttributes starting with (inputStream: " + inputStream
+                    + ", outputStream: " + outputStream + ")");
+        }
+        DataInputStream dataInputStream = new DataInputStream(inputStream);
+        ByteOrderAwarenessDataOutputStream dataOutputStream =
+                new ByteOrderAwarenessDataOutputStream(outputStream, ByteOrder.BIG_ENDIAN);
+        if (dataInputStream.readByte() != MARKER) {
+            throw new IOException("Invalid marker");
+        }
+        dataOutputStream.writeByte(MARKER);
+        if (dataInputStream.readByte() != MARKER_SOI) {
+            throw new IOException("Invalid marker");
+        }
+        dataOutputStream.writeByte(MARKER_SOI);
+
+        // Write EXIF APP1 segment
+        dataOutputStream.writeByte(MARKER);
+        dataOutputStream.writeByte(MARKER_APP1);
+        writeExifSegment(dataOutputStream, 6);
+
+        byte[] bytes = new byte[4096];
+
+        while (true) {
+            byte marker = dataInputStream.readByte();
+            if (marker != MARKER) {
+                throw new IOException("Invalid marker");
+            }
+            marker = dataInputStream.readByte();
+            switch (marker) {
+                case MARKER_APP1: {
+                    int length = dataInputStream.readUnsignedShort() - 2;
+                    if (length < 0) {
+                        throw new IOException("Invalid length");
+                    }
+                    byte[] identifier = new byte[6];
+                    if (length >= 6) {
+                        if (dataInputStream.read(identifier) != 6) {
+                            throw new IOException("Invalid exif");
+                        }
+                        if (Arrays.equals(identifier, IDENTIFIER_EXIF_APP1)) {
+                            // Skip the original EXIF APP1 segment.
+                            if (dataInputStream.skip(length - 6) != length - 6) {
+                                throw new IOException("Invalid length");
+                            }
+                            break;
+                        }
+                    }
+                    // Copy non-EXIF APP1 segment.
+                    dataOutputStream.writeByte(MARKER);
+                    dataOutputStream.writeByte(marker);
+                    dataOutputStream.writeUnsignedShort(length + 2);
+                    if (length >= 6) {
+                        length -= 6;
+                        dataOutputStream.write(identifier);
+                    }
+                    int read;
+                    while (length > 0 && (read = dataInputStream.read(
+                            bytes, 0, Math.min(length, bytes.length))) >= 0) {
+                        dataOutputStream.write(bytes, 0, read);
+                        length -= read;
+                    }
+                    break;
+                }
+                case MARKER_EOI:
+                case MARKER_SOS: {
+                    dataOutputStream.writeByte(MARKER);
+                    dataOutputStream.writeByte(marker);
+                    // Copy all the remaining data
+                    Streams.copy(dataInputStream, dataOutputStream);
+                    return;
+                }
+                default: {
+                    // Copy JPEG segment
+                    dataOutputStream.writeByte(MARKER);
+                    dataOutputStream.writeByte(marker);
+                    int length = dataInputStream.readUnsignedShort();
+                    dataOutputStream.writeUnsignedShort(length);
+                    length -= 2;
+                    if (length < 0) {
+                        throw new IOException("Invalid length");
+                    }
+                    int read;
+                    while (length > 0 && (read = dataInputStream.read(
+                            bytes, 0, Math.min(length, bytes.length))) >= 0) {
+                        dataOutputStream.write(bytes, 0, read);
+                        length -= read;
+                    }
+                    break;
+                }
+            }
+        }
+    }
+
+    // Reads the given EXIF byte area and save its tag data into attributes.
+    private void readExifSegment(byte[] exifBytes, int exifOffsetFromBeginning) throws IOException {
+        // Parse TIFF Headers. See JEITA CP-3451C Table 1. page 10.
+        ByteOrderAwarenessDataInputStream dataInputStream =
+                new ByteOrderAwarenessDataInputStream(exifBytes);
+
+        // Read byte align
+        short byteOrder = dataInputStream.readShort();
+        switch (byteOrder) {
+            case BYTE_ALIGN_II:
+                if (DEBUG) {
+                    Log.d(TAG, "readExifSegment: Byte Align II");
+                }
+                mExifByteOrder = ByteOrder.LITTLE_ENDIAN;
+                break;
+            case BYTE_ALIGN_MM:
+                if (DEBUG) {
+                    Log.d(TAG, "readExifSegment: Byte Align MM");
+                }
+                mExifByteOrder = ByteOrder.BIG_ENDIAN;
+                break;
+            default:
+                throw new IOException("Invalid byte order: " + Integer.toHexString(byteOrder));
+        }
+
+        // Set byte order.
+        dataInputStream.setByteOrder(mExifByteOrder);
+
+        int startCode = dataInputStream.readUnsignedShort();
+        if (startCode != 0x2a) {
+            throw new IOException("Invalid exif start: " + Integer.toHexString(startCode));
+        }
+
+        // Read first ifd offset
+        long firstIfdOffset = dataInputStream.readUnsignedInt();
+        if (firstIfdOffset < 8 || firstIfdOffset >= exifBytes.length) {
+            throw new IOException("Invalid first Ifd offset: " + firstIfdOffset);
+        }
+        firstIfdOffset -= 8;
+        if (firstIfdOffset > 0) {
+            if (dataInputStream.skip(firstIfdOffset) != firstIfdOffset) {
+                throw new IOException("Couldn't jump to first Ifd: " + firstIfdOffset);
+            }
+        }
+
+        // Read primary image TIFF image file directory.
+        readImageFileDirectory(dataInputStream, IFD_TIFF_HINT);
+
+        // Process thumbnail.
+        String jpegInterchangeFormatString = getAttribute(JPEG_INTERCHANGE_FORMAT_TAG.name);
+        String jpegInterchangeFormatLengthString =
+                getAttribute(JPEG_INTERCHANGE_FORMAT_LENGTH_TAG.name);
+        if (jpegInterchangeFormatString != null && jpegInterchangeFormatLengthString != null) {
+            try {
+                int jpegInterchangeFormat = Integer.parseInt(jpegInterchangeFormatString);
+                int jpegInterchangeFormatLength = Integer
+                        .parseInt(jpegInterchangeFormatLengthString);
+                // The following code limits the size of thumbnail size not to overflow EXIF data area.
+                jpegInterchangeFormatLength = Math.min(jpegInterchangeFormat
+                        + jpegInterchangeFormatLength, exifBytes.length) - jpegInterchangeFormat;
+                if (jpegInterchangeFormat > 0 && jpegInterchangeFormatLength > 0) {
+                    mHasThumbnail = true;
+                    mThumbnailOffset = exifOffsetFromBeginning + jpegInterchangeFormat;
+                    mThumbnailLength = jpegInterchangeFormatLength;
+                }
+            } catch (NumberFormatException e) {
+                // Ignored the corrupted image.
+            }
+        }
+    }
+
+    private void addDefaultValuesForCompatibility() {
+        // The value of DATETIME tag has the same value of DATETIME_ORIGINAL tag.
+        String valueOfDateTimeOriginal = getAttribute(TAG_DATETIME_ORIGINAL);
+        if (valueOfDateTimeOriginal != null) {
+            mAttributes[IFD_TIFF_HINT].put(TAG_DATETIME,
+                    ExifAttribute.createString(valueOfDateTimeOriginal));
+        }
+
+        // Add the default value.
+        if (getAttribute(TAG_IMAGE_WIDTH) == null) {
+            mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_WIDTH,
+                    ExifAttribute.createULong(0, mExifByteOrder));
+        }
+        if (getAttribute(TAG_IMAGE_LENGTH) == null) {
+            mAttributes[IFD_TIFF_HINT].put(TAG_IMAGE_LENGTH,
+                    ExifAttribute.createULong(0, mExifByteOrder));
+        }
+        if (getAttribute(TAG_ORIENTATION) == null) {
+            mAttributes[IFD_TIFF_HINT].put(TAG_ORIENTATION,
+                    ExifAttribute.createULong(0, mExifByteOrder));
+        }
+        if (getAttribute(TAG_LIGHT_SOURCE) == null) {
+            mAttributes[IFD_EXIF_HINT].put(TAG_LIGHT_SOURCE,
+                    ExifAttribute.createULong(0, mExifByteOrder));
+        }
+    }
+
+    // Reads image file directory, which is a tag group in EXIF.
+    private void readImageFileDirectory(ByteOrderAwarenessDataInputStream dataInputStream, int hint)
+            throws IOException {
+        if (dataInputStream.peek() + 2 > dataInputStream.mLength) {
+            // Return if there is no data from the offset.
+            return;
+        }
+        // See JEITA CP-3451 Figure 5. page 9.
+        short numberOfDirectoryEntry = dataInputStream.readShort();
+        if (dataInputStream.peek() + 12 * numberOfDirectoryEntry > dataInputStream.mLength) {
+            // Return if the size of entries is too big.
+            return;
+        }
+
+        if (DEBUG) {
+            Log.d(TAG, "numberOfDirectoryEntry: " + numberOfDirectoryEntry);
+        }
+
+        for (short i = 0; i < numberOfDirectoryEntry; ++i) {
+            int tagNumber = dataInputStream.readUnsignedShort();
+            int dataFormat = dataInputStream.readUnsignedShort();
+            int numberOfComponents = dataInputStream.readInt();
+            long nextEntryOffset = dataInputStream.peek() + 4;  // next four bytes is for data
+                                                                // offset or value.
+            // Look up a corresponding tag from tag number
+            final ExifTag tag = (ExifTag) sExifTagMapsForReading[hint].get(tagNumber);
+
+            if (DEBUG) {
+                Log.d(TAG, String.format("hint: %d, tagNumber: %d, tagName: %s, dataFormat: %d, " +
+                        "numberOfComponents: %d", hint, tagNumber, tag != null ? tag.name : null,
+                        dataFormat, numberOfComponents));
+            }
+
+            if (tag == null || dataFormat <= 0 ||
+                    dataFormat >= IFD_FORMAT_BYTES_PER_FORMAT.length) {
+                // Skip if the parsed tag number is not defined or invalid data format.
+                if (tag == null) {
+                    Log.w(TAG, "Skip the tag entry since tag number is not defined: " + tagNumber);
+                } else {
+                    Log.w(TAG, "Skip the tag entry since data format is invalid: " + dataFormat);
+                }
+                dataInputStream.seek(nextEntryOffset);
+                continue;
+            }
+
+            // Read a value from data field or seek to the value offset which is stored in data
+            // field if the size of the entry value is bigger than 4.
+            int byteCount = numberOfComponents * IFD_FORMAT_BYTES_PER_FORMAT[dataFormat];
+            if (byteCount > 4) {
+                long offset = dataInputStream.readUnsignedInt();
+                if (DEBUG) {
+                    Log.d(TAG, "seek to data offset: " + offset);
+                }
+                if (offset + byteCount <= dataInputStream.mLength) {
+                    dataInputStream.seek(offset);
+                } else {
+                     // Skip if invalid data offset.
+                    Log.w(TAG, "Skip the tag entry since data offset is invalid: " + offset);
+                    dataInputStream.seek(nextEntryOffset);
+                    continue;
+                }
+            }
+
+            // Recursively parse IFD when a IFD pointer tag appears.
+            int innerIfdHint = getIfdHintFromTagNumber(tagNumber);
+            if (DEBUG) {
+                Log.d(TAG, "innerIfdHint: " + innerIfdHint + " byteCount: " + byteCount);
+            }
+
+            if (innerIfdHint >= 0) {
+                long offset = -1L;
+                // Get offset from data field
+                switch (dataFormat) {
+                    case IFD_FORMAT_USHORT: {
+                        offset = dataInputStream.readUnsignedShort();
+                        break;
+                    }
+                    case IFD_FORMAT_SSHORT: {
+                        offset = dataInputStream.readShort();
+                        break;
+                    }
+                    case IFD_FORMAT_ULONG: {
+                        offset = dataInputStream.readUnsignedInt();
+                        break;
+                    }
+                    case IFD_FORMAT_SLONG: {
+                        offset = dataInputStream.readInt();
+                        break;
+                    }
+                    default: {
+                        // Nothing to do
+                        break;
+                    }
+                }
+                if (DEBUG) {
+                    Log.d(TAG, String.format("Offset: %d, tagName: %s", offset, tag.name));
+                }
+                if (offset > 0L && offset < dataInputStream.mLength) {
+                    dataInputStream.seek(offset);
+                    readImageFileDirectory(dataInputStream, innerIfdHint);
+                } else {
+                    Log.w(TAG, "Skip jump into the IFD since its offset is invalid: " + offset);
+                }
+
+                dataInputStream.seek(nextEntryOffset);
+                continue;
+            }
+
+            byte[] bytes = new byte[numberOfComponents * IFD_FORMAT_BYTES_PER_FORMAT[dataFormat]];
+            dataInputStream.readFully(bytes);
+            mAttributes[hint].put(
+                    tag.name, new ExifAttribute(dataFormat, numberOfComponents, bytes));
+            if (dataInputStream.peek() != nextEntryOffset) {
+                dataInputStream.seek(nextEntryOffset);
+            }
+        }
+
+        if (dataInputStream.peek() + 4 <= dataInputStream.mLength) {
+            long nextIfdOffset = dataInputStream.readUnsignedInt();
+            if (DEBUG) {
+                Log.d(TAG, String.format("nextIfdOffset: %d", nextIfdOffset));
+            }
+            // The next IFD offset needs to be bigger than 8
+            // since the first IFD offset is at least 8.
+            if (nextIfdOffset > 8 && nextIfdOffset < dataInputStream.mLength) {
+                dataInputStream.seek(nextIfdOffset);
+                readImageFileDirectory(dataInputStream, IFD_THUMBNAIL_HINT);
+            }
+        }
+    }
+
+    // Gets the corresponding IFD group index of the given tag number for writing Exif Tags.
+    private static int getIfdHintFromTagNumber(int tagNumber) {
+        for (int i = 0; i < IFD_POINTER_TAG_HINTS.length; ++i) {
+            if (IFD_POINTER_TAGS[i].number == tagNumber) {
+                return IFD_POINTER_TAG_HINTS[i];
+            }
+        }
+        return -1;
+    }
+
+    // Writes an Exif segment into the given output stream.
+    private int writeExifSegment(ByteOrderAwarenessDataOutputStream dataOutputStream,
+            int exifOffsetFromBeginning) throws IOException {
+        // The following variables are for calculating each IFD tag group size in bytes.
+        int[] ifdOffsets = new int[EXIF_TAGS.length];
+        int[] ifdDataSizes = new int[EXIF_TAGS.length];
+
+        // Remove IFD pointer tags (we'll re-add it later.)
+        for (ExifTag tag : IFD_POINTER_TAGS) {
+            removeAttribute(tag.name);
+        }
+        // Remove old thumbnail data
+        removeAttribute(JPEG_INTERCHANGE_FORMAT_TAG.name);
+        removeAttribute(JPEG_INTERCHANGE_FORMAT_LENGTH_TAG.name);
+
+        // Remove null value tags.
+        for (int hint = 0; hint < EXIF_TAGS.length; ++hint) {
+            for (Object obj : mAttributes[hint].entrySet().toArray()) {
+                final Map.Entry entry = (Map.Entry) obj;
+                if (entry.getValue() == null) {
+                    mAttributes[hint].remove(entry.getKey());
+                }
+            }
+        }
+
+        // Add IFD pointer tags. The next offset of primary image TIFF IFD will have thumbnail IFD
+        // offset when there is one or more tags in the thumbnail IFD.
+        if (!mAttributes[IFD_INTEROPERABILITY_HINT].isEmpty()) {
+            mAttributes[IFD_EXIF_HINT].put(IFD_POINTER_TAGS[2].name,
+                    ExifAttribute.createULong(0, mExifByteOrder));
+        }
+        if (!mAttributes[IFD_EXIF_HINT].isEmpty()) {
+            mAttributes[IFD_TIFF_HINT].put(IFD_POINTER_TAGS[0].name,
+                    ExifAttribute.createULong(0, mExifByteOrder));
+        }
+        if (!mAttributes[IFD_GPS_HINT].isEmpty()) {
+            mAttributes[IFD_TIFF_HINT].put(IFD_POINTER_TAGS[1].name,
+                    ExifAttribute.createULong(0, mExifByteOrder));
+        }
+        if (mHasThumbnail) {
+            mAttributes[IFD_TIFF_HINT].put(JPEG_INTERCHANGE_FORMAT_TAG.name,
+                    ExifAttribute.createULong(0, mExifByteOrder));
+            mAttributes[IFD_TIFF_HINT].put(JPEG_INTERCHANGE_FORMAT_LENGTH_TAG.name,
+                    ExifAttribute.createULong(mThumbnailLength, mExifByteOrder));
+        }
+
+        // Calculate IFD group data area sizes. IFD group data area is assigned to save the entry
+        // value which has a bigger size than 4 bytes.
+        for (int i = 0; i < EXIF_TAGS.length; ++i) {
+            int sum = 0;
+            for (Map.Entry entry : (Set<Map.Entry>) mAttributes[i].entrySet()) {
+                final ExifAttribute exifAttribute = (ExifAttribute) entry.getValue();
+                final int size = exifAttribute.size();
+                if (size > 4) {
+                    sum += size;
+                }
+            }
+            ifdDataSizes[i] += sum;
+        }
+
+        // Calculate IFD offsets.
+        int position = 8;
+        for (int hint = 0; hint < EXIF_TAGS.length; ++hint) {
+            if (!mAttributes[hint].isEmpty()) {
+                ifdOffsets[hint] = position;
+                position += 2 + mAttributes[hint].size() * 12 + 4 + ifdDataSizes[hint];
+            }
+        }
+        if (mHasThumbnail) {
+            int thumbnailOffset = position;
+            mAttributes[IFD_TIFF_HINT].put(JPEG_INTERCHANGE_FORMAT_TAG.name,
+                    ExifAttribute.createULong(thumbnailOffset, mExifByteOrder));
+            mThumbnailOffset = exifOffsetFromBeginning + thumbnailOffset;
+            position += mThumbnailLength;
+        }
+
+        // Calculate the total size
+        int totalSize = position + 8;  // eight bytes is for header part.
+        if (DEBUG) {
+            Log.d(TAG, "totalSize length: " + totalSize);
+            for (int i = 0; i < EXIF_TAGS.length; ++i) {
+                Log.d(TAG, String.format("index: %d, offsets: %d, tag count: %d, data sizes: %d",
+                        i, ifdOffsets[i], mAttributes[i].size(), ifdDataSizes[i]));
+            }
+        }
+
+        // Update IFD pointer tags with the calculated offsets.
+        if (!mAttributes[IFD_EXIF_HINT].isEmpty()) {
+            mAttributes[IFD_TIFF_HINT].put(IFD_POINTER_TAGS[0].name,
+                    ExifAttribute.createULong(ifdOffsets[IFD_EXIF_HINT], mExifByteOrder));
+        }
+        if (!mAttributes[IFD_GPS_HINT].isEmpty()) {
+            mAttributes[IFD_TIFF_HINT].put(IFD_POINTER_TAGS[1].name,
+                    ExifAttribute.createULong(ifdOffsets[IFD_GPS_HINT], mExifByteOrder));
+        }
+        if (!mAttributes[IFD_INTEROPERABILITY_HINT].isEmpty()) {
+            mAttributes[IFD_EXIF_HINT].put(IFD_POINTER_TAGS[2].name, ExifAttribute.createULong(
+                    ifdOffsets[IFD_INTEROPERABILITY_HINT], mExifByteOrder));
+        }
+
+        // Write TIFF Headers. See JEITA CP-3451C Table 1. page 10.
+        dataOutputStream.writeUnsignedShort(totalSize);
+        dataOutputStream.write(IDENTIFIER_EXIF_APP1);
+        dataOutputStream.writeShort(mExifByteOrder == ByteOrder.BIG_ENDIAN
+                ? BYTE_ALIGN_MM : BYTE_ALIGN_II);
+        dataOutputStream.setByteOrder(mExifByteOrder);
+        dataOutputStream.writeUnsignedShort(0x2a);
+        dataOutputStream.writeUnsignedInt(8);
+
+        // Write IFD groups. See JEITA CP-3451C Figure 7. page 12.
+        for (int hint = 0; hint < EXIF_TAGS.length; ++hint) {
+            if (!mAttributes[hint].isEmpty()) {
+                // See JEITA CP-3451C 4.6.2 IFD structure. page 13.
+                // Write entry count
+                dataOutputStream.writeUnsignedShort(mAttributes[hint].size());
+
+                // Write entry info
+                int dataOffset = ifdOffsets[hint] + 2 + mAttributes[hint].size() * 12 + 4;
+                for (Map.Entry entry : (Set<Map.Entry>) mAttributes[hint].entrySet()) {
+                    // Convert tag name to tag number.
+                    final ExifTag tag = (ExifTag) sExifTagMapsForWriting[hint].get(entry.getKey());
+                    final int tagNumber = tag.number;
+                    final ExifAttribute attribute = (ExifAttribute) entry.getValue();
+                    final int size = attribute.size();
+
+                    dataOutputStream.writeUnsignedShort(tagNumber);
+                    dataOutputStream.writeUnsignedShort(attribute.format);
+                    dataOutputStream.writeInt(attribute.numberOfComponents);
+                    if (size > 4) {
+                        dataOutputStream.writeUnsignedInt(dataOffset);
+                        dataOffset += size;
+                    } else {
+                        dataOutputStream.write(attribute.bytes);
+                        // Fill zero up to 4 bytes
+                        if (size < 4) {
+                            for (int i = size; i < 4; ++i) {
+                                dataOutputStream.writeByte(0);
+                            }
+                        }
+                    }
+                }
+
+                // Write the next offset. It writes the offset of thumbnail IFD if there is one or
+                // more tags in the thumbnail IFD when the current IFD is the primary image TIFF
+                // IFD; Otherwise 0.
+                if (hint == 0 && !mAttributes[IFD_THUMBNAIL_HINT].isEmpty()) {
+                    dataOutputStream.writeUnsignedInt(ifdOffsets[IFD_THUMBNAIL_HINT]);
+                } else {
+                    dataOutputStream.writeUnsignedInt(0);
+                }
+
+                // Write values of data field exceeding 4 bytes after the next offset.
+                for (Map.Entry entry : (Set<Map.Entry>) mAttributes[hint].entrySet()) {
+                    ExifAttribute attribute = (ExifAttribute) entry.getValue();
+
+                    if (attribute.bytes.length > 4) {
+                        dataOutputStream.write(attribute.bytes, 0, attribute.bytes.length);
+                    }
+                }
+            }
+        }
+
+        // Write thumbnail
+        if (mHasThumbnail) {
+            dataOutputStream.write(getThumbnail());
+        }
+
+        // Reset the byte order to big endian in order to write remaining parts of the JPEG file.
+        dataOutputStream.setByteOrder(ByteOrder.BIG_ENDIAN);
+
+        return totalSize;
+    }
+
+    /**
+     * Determines the data format of EXIF entry value.
+     *
+     * @param entryValue The value to be determined.
+     * @return Returns two data formats gussed as a pair in integer. If there is no two candidate
+               data formats for the given entry value, returns {@code -1} in the second of the pair.
+     */
+    private static Pair<Integer, Integer> guessDataFormat(String entryValue) {
+        // See TIFF 6.0 spec Types. page 15.
+        // Take the first component if there are more than one component.
+        if (entryValue.contains(",")) {
+            String[] entryValues = entryValue.split(",");
+            Pair<Integer, Integer> dataFormat = guessDataFormat(entryValues[0]);
+            if (dataFormat.first == IFD_FORMAT_STRING) {
+                return dataFormat;
+            }
+            for (int i = 1; i < entryValues.length; ++i) {
+                final Pair<Integer, Integer> guessDataFormat = guessDataFormat(entryValues[i]);
+                int first = -1, second = -1;
+                if (guessDataFormat.first == dataFormat.first
+                        || guessDataFormat.second == dataFormat.first) {
+                    first = dataFormat.first;
+                }
+                if (dataFormat.second != -1 && (guessDataFormat.first == dataFormat.second
+                        || guessDataFormat.second == dataFormat.second)) {
+                    second = dataFormat.second;
+                }
+                if (first == -1 && second == -1) {
+                    return new Pair<>(IFD_FORMAT_STRING, -1);
+                }
+                if (first == -1) {
+                    dataFormat = new Pair<>(second, -1);
+                    continue;
+                }
+                if (second == -1) {
+                    dataFormat = new Pair<>(first, -1);
+                    continue;
+                }
+            }
+            return dataFormat;
+        }
 
-    private native void saveAttributesNative(String fileName,
-            String compressedAttributes);
+        if (entryValue.contains("/")) {
+            String[] rationalNumber = entryValue.split("/");
+            if (rationalNumber.length == 2) {
+                try {
+                    long numerator = Long.parseLong(rationalNumber[0]);
+                    long denominator = Long.parseLong(rationalNumber[1]);
+                    if (numerator < 0L || denominator < 0L) {
+                        return new Pair<>(IFD_FORMAT_SRATIONAL, - 1);
+                    }
+                    if (numerator > Integer.MAX_VALUE || denominator > Integer.MAX_VALUE) {
+                        return new Pair<>(IFD_FORMAT_URATIONAL, -1);
+                    }
+                    return new Pair<>(IFD_FORMAT_SRATIONAL, IFD_FORMAT_URATIONAL);
+                } catch (NumberFormatException e)  {
+                    // Ignored
+                }
+            }
+            return new Pair<>(IFD_FORMAT_STRING, -1);
+        }
+        try {
+            Long longValue = Long.parseLong(entryValue);
+            if (longValue >= 0 && longValue <= 65535) {
+                return new Pair<>(IFD_FORMAT_USHORT, IFD_FORMAT_ULONG);
+            }
+            if (longValue < 0) {
+                return new Pair<>(IFD_FORMAT_SLONG, -1);
+            }
+            return new Pair<>(IFD_FORMAT_ULONG, -1);
+        } catch (NumberFormatException e) {
+            // Ignored
+        }
+        try {
+            Double.parseDouble(entryValue);
+            return new Pair<>(IFD_FORMAT_DOUBLE, -1);
+        } catch (NumberFormatException e) {
+            // Ignored
+        }
+        return new Pair<>(IFD_FORMAT_STRING, -1);
+    }
 
-    private native String getAttributesNative(String fileName);
+    // An input stream to parse EXIF data area, which can be written in either little or big endian
+    // order.
+    private static class ByteOrderAwarenessDataInputStream extends ByteArrayInputStream {
+        private static final ByteOrder LITTLE_ENDIAN = ByteOrder.LITTLE_ENDIAN;
+        private static final ByteOrder BIG_ENDIAN = ByteOrder.BIG_ENDIAN;
 
-    private native void commitChangesNative(String fileName);
+        private ByteOrder mByteOrder = ByteOrder.BIG_ENDIAN;
+        private final long mLength;
+        private long mPosition;
 
-    private native byte[] getThumbnailNative(String fileName);
+        public ByteOrderAwarenessDataInputStream(byte[] bytes) {
+            super(bytes);
+            mLength = bytes.length;
+            mPosition = 0L;
+        }
+
+        public void setByteOrder(ByteOrder byteOrder) {
+            mByteOrder = byteOrder;
+        }
+
+        public void seek(long byteCount) throws IOException {
+            mPosition = 0L;
+            reset();
+            if (skip(byteCount) != byteCount) {
+                throw new IOException("Couldn't seek up to the byteCount");
+            }
+        }
+
+        public long peek() {
+            return mPosition;
+        }
+
+        public void readFully(byte[] buffer) throws IOException {
+            mPosition += buffer.length;
+            if (mPosition > mLength) {
+                throw new EOFException();
+            }
+            if (super.read(buffer, 0, buffer.length) != buffer.length) {
+                throw new IOException("Couldn't read up to the length of buffer");
+            }
+        }
+
+        public byte readByte() throws IOException {
+            ++mPosition;
+            if (mPosition > mLength) {
+                throw new EOFException();
+            }
+            int ch = super.read();
+            if (ch < 0) {
+                throw new EOFException();
+            }
+            return (byte) ch;
+        }
+
+        public short readShort() throws IOException {
+            mPosition += 2;
+            if (mPosition > mLength) {
+                throw new EOFException();
+            }
+            int ch1 = super.read();
+            int ch2 = super.read();
+            if ((ch1 | ch2) < 0) {
+                throw new EOFException();
+            }
+            if (mByteOrder == LITTLE_ENDIAN) {
+                return (short) ((ch2 << 8) + (ch1));
+            } else if (mByteOrder == BIG_ENDIAN) {
+                return (short) ((ch1 << 8) + (ch2));
+            }
+            throw new IOException("Invalid byte order: " + mByteOrder);
+        }
+
+        public int readInt() throws IOException {
+            mPosition += 4;
+            if (mPosition > mLength) {
+                throw new EOFException();
+            }
+            int ch1 = super.read();
+            int ch2 = super.read();
+            int ch3 = super.read();
+            int ch4 = super.read();
+            if ((ch1 | ch2 | ch3 | ch4) < 0) {
+                throw new EOFException();
+            }
+            if (mByteOrder == LITTLE_ENDIAN) {
+                return ((ch4 << 24) + (ch3 << 16) + (ch2 << 8) + ch1);
+            } else if (mByteOrder == BIG_ENDIAN) {
+                return ((ch1 << 24) + (ch2 << 16) + (ch3 << 8) + ch4);
+            }
+            throw new IOException("Invalid byte order: " + mByteOrder);
+        }
+
+        @Override
+        public long skip(long byteCount) {
+            long skipped = super.skip(Math.min(byteCount, mLength - mPosition));
+            mPosition += skipped;
+            return skipped;
+        }
+
+        public int readUnsignedShort() throws IOException {
+            mPosition += 2;
+            if (mPosition > mLength) {
+                throw new EOFException();
+            }
+            int ch1 = super.read();
+            int ch2 = super.read();
+            if ((ch1 | ch2) < 0) {
+                throw new EOFException();
+            }
+            if (mByteOrder == LITTLE_ENDIAN) {
+                return ((ch2 << 8) + (ch1));
+            } else if (mByteOrder == BIG_ENDIAN) {
+                return ((ch1 << 8) + (ch2));
+            }
+            throw new IOException("Invalid byte order: " + mByteOrder);
+        }
 
-    private native long[] getThumbnailRangeNative(String fileName);
+        public long readUnsignedInt() throws IOException {
+            return readInt() & 0xffffffffL;
+        }
+
+        public long readLong() throws IOException {
+            mPosition += 8;
+            if (mPosition > mLength) {
+                throw new EOFException();
+            }
+            int ch1 = super.read();
+            int ch2 = super.read();
+            int ch3 = super.read();
+            int ch4 = super.read();
+            int ch5 = super.read();
+            int ch6 = super.read();
+            int ch7 = super.read();
+            int ch8 = super.read();
+            if ((ch1 | ch2 | ch3 | ch4 | ch5 | ch6 | ch7 | ch8) < 0) {
+                throw new EOFException();
+            }
+            if (mByteOrder == LITTLE_ENDIAN) {
+                return (((long) ch8 << 56) + ((long) ch7 << 48) + ((long) ch6 << 40)
+                        + ((long) ch5 << 32) + ((long) ch4 << 24) + ((long) ch3 << 16)
+                        + ((long) ch2 << 8) + ch1);
+            } else if (mByteOrder == BIG_ENDIAN) {
+                return (((long) ch1 << 56) + ((long) ch2 << 48) + ((long) ch3 << 40)
+                        + ((long) ch4 << 32) + ((long) ch5 << 24) + ((long) ch6 << 16)
+                        + ((long) ch7 << 8) + ch8);
+            }
+            throw new IOException("Invalid byte order: " + mByteOrder);
+        }
+
+        public float readFloat() throws IOException {
+            return Float.intBitsToFloat(readInt());
+        }
+
+        public double readDouble() throws IOException {
+            return Double.longBitsToDouble(readLong());
+        }
+    }
+
+    // An output stream to write EXIF data area, which can be written in either little or big endian
+    // order.
+    private static class ByteOrderAwarenessDataOutputStream extends FilterOutputStream {
+        private final OutputStream mOutputStream;
+        private ByteOrder mByteOrder;
+
+        public ByteOrderAwarenessDataOutputStream(OutputStream out, ByteOrder byteOrder) {
+            super(out);
+            mOutputStream = out;
+            mByteOrder = byteOrder;
+        }
+
+        public void setByteOrder(ByteOrder byteOrder) {
+            mByteOrder = byteOrder;
+        }
+
+        public void write(byte[] bytes) throws IOException {
+            mOutputStream.write(bytes);
+        }
+
+        public void write(byte[] bytes, int offset, int length) throws IOException {
+            mOutputStream.write(bytes, offset, length);
+        }
+
+        public void writeByte(int val) throws IOException {
+            mOutputStream.write(val);
+        }
+
+        public void writeShort(short val) throws IOException {
+            if (mByteOrder == ByteOrder.LITTLE_ENDIAN) {
+                mOutputStream.write((val >>> 0) & 0xFF);
+                mOutputStream.write((val >>> 8) & 0xFF);
+            } else if (mByteOrder == ByteOrder.BIG_ENDIAN) {
+                mOutputStream.write((val >>> 8) & 0xFF);
+                mOutputStream.write((val >>> 0) & 0xFF);
+            }
+        }
+
+        public void writeInt(int val) throws IOException {
+            if (mByteOrder == ByteOrder.LITTLE_ENDIAN) {
+                mOutputStream.write((val >>> 0) & 0xFF);
+                mOutputStream.write((val >>> 8) & 0xFF);
+                mOutputStream.write((val >>> 16) & 0xFF);
+                mOutputStream.write((val >>> 24) & 0xFF);
+            } else if (mByteOrder == ByteOrder.BIG_ENDIAN) {
+                mOutputStream.write((val >>> 24) & 0xFF);
+                mOutputStream.write((val >>> 16) & 0xFF);
+                mOutputStream.write((val >>> 8) & 0xFF);
+                mOutputStream.write((val >>> 0) & 0xFF);
+            }
+        }
+
+        public void writeUnsignedShort(int val) throws IOException {
+            writeShort((short) val);
+        }
+
+        public void writeUnsignedInt(long val) throws IOException {
+            writeInt((int) val);
+        }
+    }
 }
diff --git a/media/java/android/media/MediaScanner.java b/media/java/android/media/MediaScanner.java
index da1484c..9264bc0 100644
--- a/media/java/android/media/MediaScanner.java
+++ b/media/java/android/media/MediaScanner.java
@@ -48,6 +48,7 @@ import android.sax.ElementListener;
 import android.sax.RootElement;
 import android.system.ErrnoException;
 import android.system.Os;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.util.Xml;
@@ -329,23 +330,26 @@ public class MediaScanner
     // old thumbnail files
     private int mOriginalCount;
     /** Whether the scanner has set a default sound for the ringer ringtone. */
-    private boolean mDefaultRingtoneSet;
+    private boolean[] mDefaultRingtonesSet;
     /** Whether the scanner has set a default sound for the notification ringtone. */
     private boolean mDefaultNotificationSet;
     /** Whether the scanner has set a default sound for the alarm ringtone. */
     private boolean mDefaultAlarmSet;
-    /** The filename for the default sound for the ringer ringtone. */
-    private String mDefaultRingtoneFilename;
+    /** The filenames for the default sound for the ringer ringtone. */
+    private String[] mDefaultRingtoneFilenames;
     /** The filename for the default sound for the notification ringtone. */
     private String mDefaultNotificationFilename;
     /** The filename for the default sound for the alarm ringtone. */
     private String mDefaultAlarmAlertFilename;
+    /** The number of phones in the system */
+    private int mPhoneCount = -1;
     /**
      * The prefix for system properties that define the default sound for
      * ringtones. Concatenate the name of the setting from Settings
      * to get the full system property.
      */
     private static final String DEFAULT_RINGTONE_PROPERTY_PREFIX = "ro.config.";
+    private static final int DEFAULT_SIM_INDEX = 0;
 
     // set to true if file path comparisons should be case insensitive.
     // this should be set when scanning files on a case insensitive file system.
@@ -408,8 +412,21 @@ public class MediaScanner
     }
 
     private void setDefaultRingtoneFileNames() {
-        mDefaultRingtoneFilename = SystemProperties.get(DEFAULT_RINGTONE_PROPERTY_PREFIX
+        String defaultAllSimRingtone = SystemProperties.get(DEFAULT_RINGTONE_PROPERTY_PREFIX
                 + Settings.System.RINGTONE);
+
+        mPhoneCount = TelephonyManager.getDefault().getPhoneCount();
+        mDefaultRingtoneFilenames = new String[mPhoneCount];
+        mDefaultRingtonesSet = new boolean[mPhoneCount];
+
+        mDefaultRingtoneFilenames[DEFAULT_SIM_INDEX] = defaultAllSimRingtone;
+
+        for (int i = (DEFAULT_SIM_INDEX + 1); i < mPhoneCount; i++) {
+            String defaultIterSimRingtone = SystemProperties.get(DEFAULT_RINGTONE_PROPERTY_PREFIX
+                    + Settings.System.RINGTONE + "_" + (i + 1), defaultAllSimRingtone);
+            mDefaultRingtoneFilenames[i] = defaultIterSimRingtone;
+        }
+
         mDefaultNotificationFilename = SystemProperties.get(DEFAULT_RINGTONE_PROPERTY_PREFIX
                 + Settings.System.NOTIFICATION_SOUND);
         mDefaultAlarmAlertFilename = SystemProperties.get(DEFAULT_RINGTONE_PROPERTY_PREFIX
@@ -550,8 +567,9 @@ public class MediaScanner
                 if (entry.mPath != null &&
                         ((!mDefaultNotificationSet &&
                                 doesPathHaveFilename(entry.mPath, mDefaultNotificationFilename))
-                        || (!mDefaultRingtoneSet &&
-                                doesPathHaveFilename(entry.mPath, mDefaultRingtoneFilename))
+                        || (mPhoneCount > 0 && !mDefaultRingtonesSet[(mPhoneCount-1)] &&
+                                doesPathHaveFilename(entry.mPath,
+                                    mDefaultRingtoneFilenames[(mPhoneCount-1)]))
                         || (!mDefaultAlarmSet &&
                                 doesPathHaveFilename(entry.mPath, mDefaultAlarmAlertFilename)))) {
                     Log.w(TAG, "forcing rescan of " + entry.mPath +
@@ -953,10 +971,14 @@ public class MediaScanner
                         doesPathHaveFilename(entry.mPath, mDefaultNotificationFilename)) {
                     needToSetSettings = true;
                 }
-            } else if (ringtones && !mDefaultRingtoneSet) {
-                if (TextUtils.isEmpty(mDefaultRingtoneFilename) ||
-                        doesPathHaveFilename(entry.mPath, mDefaultRingtoneFilename)) {
-                    needToSetSettings = true;
+            } else if (ringtones && !ringtoneDefaultsSet()) {
+                for (int i = 0; i < mPhoneCount; i++) {
+                    // Check if ringtone matches default ringtone
+                    if (TextUtils.isEmpty(mDefaultRingtoneFilenames[i]) ||
+                            doesPathHaveFilename(entry.mPath, mDefaultRingtoneFilenames[i])) {
+                        needToSetSettings = true;
+                        break;
+                    }
                 }
             } else if (alarms && !mDefaultAlarmSet) {
                 if (TextUtils.isEmpty(mDefaultAlarmAlertFilename) ||
@@ -1025,8 +1047,27 @@ public class MediaScanner
                     setSettingIfNotSet(Settings.System.NOTIFICATION_SOUND, tableUri, rowId);
                     mDefaultNotificationSet = true;
                 } else if (ringtones) {
-                    setSettingIfNotSet(Settings.System.RINGTONE, tableUri, rowId);
-                    mDefaultRingtoneSet = true;
+                    String uri = null;
+                    for (int i = 0; i < mPhoneCount; i++) {
+                        if (mDefaultRingtonesSet[i]) {
+                            continue;
+                        }
+                        // Check if ringtone matches default ringtone
+                        if (!TextUtils.isEmpty(mDefaultRingtoneFilenames[i]) &&
+                                !doesPathHaveFilename(entry.mPath, mDefaultRingtoneFilenames[i])) {
+                            continue;
+                        }
+                        if (i == DEFAULT_SIM_INDEX) {
+                            uri = Settings.System.RINGTONE;
+                        } else {
+                            uri = Settings.System.RINGTONE + "_" + (i + 1);
+                        }
+
+                        // Set default ringtone
+                        setSettingIfNotSet(uri, tableUri, rowId);
+
+                        mDefaultRingtonesSet[i] = true;
+                    }
                 } else if (alarms) {
                     setSettingIfNotSet(Settings.System.ALARM_ALERT, tableUri, rowId);
                     mDefaultAlarmSet = true;
@@ -1036,6 +1077,15 @@ public class MediaScanner
             return result;
         }
 
+        private boolean ringtoneDefaultsSet() {
+            for (boolean defaultSet : mDefaultRingtonesSet) {
+                if (!defaultSet) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
         private boolean doesPathHaveFilename(String path, String filename) {
             int pathFilenameStart = path.lastIndexOf(File.separatorChar) + 1;
             int filenameLength = filename.length();
@@ -1118,7 +1168,10 @@ public class MediaScanner
             selectionArgs = new String[] { "" };
         }
 
-        mDefaultRingtoneSet = wasSettingAlreadySet(Settings.System.RINGTONE);
+        mDefaultRingtonesSet[0] = wasSettingAlreadySet(Settings.System.RINGTONE);
+        for (int i=1; i< mPhoneCount; i++) {
+            mDefaultRingtonesSet[i] = wasSettingAlreadySet(Settings.System.RINGTONE + "_" + i);
+        }
         mDefaultNotificationSet = wasSettingAlreadySet(Settings.System.NOTIFICATION_SOUND);
         mDefaultAlarmSet = wasSettingAlreadySet(Settings.System.ALARM_ALERT);
 
diff --git a/media/java/android/media/Ringtone.java b/media/java/android/media/Ringtone.java
index 2f96d1f..b92b5d9 100644
--- a/media/java/android/media/Ringtone.java
+++ b/media/java/android/media/Ringtone.java
@@ -222,6 +222,11 @@ public class Ringtone {
                         actualUri = RingtoneManager.getActualDefaultRingtoneUri(context,
                              RingtoneManager.getDefaultType(uri));
                     }
+                    if (actualUri == null) {
+                        title = context
+                                .getString(com.android.internal.R.string.ringtone_default);
+                        return title;
+                    }
                     String actualTitle = getTitle(
                             context, actualUri, false /*followSettingsUri*/, allowRemote);
                     title = context
diff --git a/media/java/android/media/ToneGenerator.java b/media/java/android/media/ToneGenerator.java
index 08c49e7..056244a 100644
--- a/media/java/android/media/ToneGenerator.java
+++ b/media/java/android/media/ToneGenerator.java
@@ -729,12 +729,6 @@ public class ToneGenerator
      */
     public static final int TONE_CDMA_SIGNAL_OFF = 98;
     /**
-     * SUPERVISORY_CH - 440Hz
-     *
-     * @hide #ToneGenerator(int, int)
-     */
-    public static final int TONE_SUPERVISORY_CH = 100;
-    /**
      * HOLD_RECALL - 440Hz
      *
      * @hide #ToneGenerator(int, int)
diff --git a/media/jni/Android.mk b/media/jni/Android.mk
index 79557bc..241df15 100644
--- a/media/jni/Android.mk
+++ b/media/jni/Android.mk
@@ -42,13 +42,9 @@ LOCAL_SHARED_LIBRARIES := \
     libcamera_client \
     libmtp \
     libusbhost \
-    libjhead \
     libexif \
     libstagefright_amrnb_common
 
-LOCAL_REQUIRED_MODULES := \
-    libjhead_jni
-
 LOCAL_STATIC_LIBRARIES := \
     libstagefright_amrnbenc
 
diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java
index e884aba..eac5c28 100644
--- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java
+++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/audio/MediaAudioTrackTest.java
@@ -386,6 +386,7 @@ public class MediaAudioTrackTest extends ActivityInstrumentationTestCase2<MediaF
         final int TEST_FORMAT = AudioFormat.ENCODING_PCM_16BIT;
         final int TEST_MODE = AudioTrack.MODE_STREAM;
         final int TEST_STREAM_TYPE = AudioManager.STREAM_MUSIC;
+        final int TEST_LOOP_CNT = 10;
         
         //-------- initialization --------------
         int minBuffSize = AudioTrack.getMinBufferSize(TEST_SR, TEST_CONF, TEST_FORMAT);
@@ -399,9 +400,14 @@ public class MediaAudioTrackTest extends ActivityInstrumentationTestCase2<MediaF
         track.play();
         Thread.sleep(100);
         track.stop();
-        Thread.sleep(100); // TODO: what is a sensible value?
-        int pos = track.getPlaybackHeadPosition();
-        log(TEST_NAME, "position ="+ pos);
+        int count = 0;
+        int pos;
+        do {
+            Thread.sleep(200);
+            pos = track.getPlaybackHeadPosition();
+            count++;
+        } while((pos != 0) && (count < TEST_LOOP_CNT));
+        log(TEST_NAME, "position =" + pos + ", read count ="+count);
         assertTrue(TEST_NAME, pos == 0);
         //-------- tear down      --------------
         track.release();
diff --git a/packages/BackupRestoreConfirmation/res/values-as-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-as-rIN/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml b/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
index 33757ee..1e1bddf 100644
--- a/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ast-rES/strings.xml
@@ -15,24 +15,44 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
   <string name="backup_confirm_title">Copia de seguranza completa</string>
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
   <string name="restore_confirm_title">Restauración completa</string>
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
   <string name="backup_confirm_text">Solicitóse una copia de seguranza completa de tolos datos nun ordenador coneutáu. ¿Quies permitir la copia de seguranza?\n\nNun permitas la copia de seguranza si nun ficisti tu la solicitú.</string>
+  <!-- Button to allow a requested full backup to occur -->
   <string name="allow_backup_button_label">Copia de seguranza de datos</string>
+  <!-- Button to refuse to allow the requested full backup -->
   <string name="deny_backup_button_label">Nun facer copia de seguranza</string>
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
   <string name="restore_confirm_text">Solicitóse una restauración completa de tolos datos dende un ordenador coneutáu. ¿Quies permitir la restauración?\n\nNun tienes de permitir la restauración si nun ficisti tu la solicitú. Van sustituyise los datos actuales del preséu!</string>
+  <!-- Button to allow a requested full restore to occur -->
   <string name="allow_restore_button_label">Restaurar datos</string>
+  <!-- Button to refuse to allow the requested full restore -->
   <string name="deny_restore_button_label">Nun restaurar</string>
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
   <string name="current_password_text">Introduz la contraseña actual de copia de seguranza:</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
   <string name="device_encryption_restore_text">Introduz la contraseña de cifráu del preséu.</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
   <string name="device_encryption_backup_text">Introduz la contraseña de cifráu del preséu. Esta contraseña va usase pa cifrar el ficheru de copia de seguranza.</string>
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
   <string name="backup_enc_password_text">Introduz la contraseña que quieras usar pa cifrar los datos de la copia de seguranza completa. Si dexes esti campu baleru, va usase la to contraseña de copia de seguridá actual:</string>
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
   <string name="backup_enc_password_optional">Si quies cifrar los datos de la copia de seguranza completa, introduz la contraseña a continuación:</string>
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
   <string name="backup_enc_password_required">Como\'l preséu ta cifráu, necesítase cifrar la copia de seguranza. Escribi la contraseña:</string>
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
   <string name="restore_enc_password_text">Si los datos de restauración tán cifraos, introduz la contraseña:</string>
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
   <string name="toast_backup_started">Aniciando copia de seguranza...</string>
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
   <string name="toast_backup_ended">Finó la copia de seguridá</string>
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
   <string name="toast_restore_started">Aniciando restauración...</string>
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
   <string name="toast_restore_ended">Finó la restauración</string>
+  <!-- Text of a toast telling the user that the operation has timed out -->
   <string name="toast_timeout">Tiempu d\'espera d\'operación escosáu</string>
 </resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-az-rAZ/strings.xml b/packages/BackupRestoreConfirmation/res/values-az-rAZ/strings.xml
index 1f9e6aa..3194bae 100644
--- a/packages/BackupRestoreConfirmation/res/values-az-rAZ/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-az-rAZ/strings.xml
@@ -29,6 +29,7 @@
     <string name="device_encryption_backup_text" msgid="5866590762672844664">"Lütfən, aşağıda cihaz şifrələmə parolunuzu daxil edin. Bu yedək arxivini şifrələmək üçün də istifadə olunacaq."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Tam yedək data şifrələmədən istifadə üçün şifrə daxil edin. Əgər boş buraxılsa, cari yedək şifrə istifadə olunacaq:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Bütün yedək datanı şifrələmək istəyirsinizsə, aşağıda parol daxil edin:"</string>
+    <string name="backup_enc_password_required" msgid="7889652203371654149">"Cihazınız şifrələndiyi üçün yedəyinizi şifrələmək tələb olunur. Aşağıda parolu daxil etməyiniz xahiş olunur:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Bərpa məlumatları şifrələnibsə, şifrəni aşağıda daxil edin:"</string>
     <string name="toast_backup_started" msgid="550354281452756121">"Rezerv edilir ..."</string>
     <string name="toast_backup_ended" msgid="3818080769548726424">"Yedəkləmə sona çatdı"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-be/strings.xml b/packages/BackupRestoreConfirmation/res/values-be/strings.xml
index e35876c..f3e2f14 100644
--- a/packages/BackupRestoreConfirmation/res/values-be/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-be/strings.xml
@@ -15,24 +15,44 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
   <string name="backup_confirm_title">Поўнае рэзервовае капіяванне</string>
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
   <string name="restore_confirm_title">Поўнае аднаўленне</string>
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
   <string name="backup_confirm_text">Было прапанавана поўнае рэзервовае капіяванне ўсіх дадзеных на падлучаным настольным кампутары. Дазволіць гэта?\n\nКалі вы самі не запытвалі рэзервовае капiяванне, спынiце аперацыю.</string>
+  <!-- Button to allow a requested full backup to occur -->
   <string name="allow_backup_button_label">Рэзервовае капіяванне дадзеных</string>
+  <!-- Button to refuse to allow the requested full backup -->
   <string name="deny_backup_button_label">Не ствараць рэзервовыя копіі</string>
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
   <string name="restore_confirm_text">Запытана поўнае аднаўленне ўсіх дадзеных з падлучанага настольнага кампутара. Дазволіць гэта?\n\nКалі вы самі не запытвалі аднаўленне, не дазваляйце працягваць аперацыю. Гэта прывядзе да замены якіх-небудзь дадзеных, якія зараз знаходзяцца на прыладзе!</string>
+  <!-- Button to allow a requested full restore to occur -->
   <string name="allow_restore_button_label">Аднавіць мае дадзеныя</string>
+  <!-- Button to refuse to allow the requested full restore -->
   <string name="deny_restore_button_label">Не аднаўляць</string>
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
   <string name="current_password_text">Увядзіце ваш бягучы пароль рэзервовага капіявання ніжэй:</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
   <string name="device_encryption_restore_text">Увядзіце нiжэй пароль для расшыфравання прылады.</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
   <string name="device_encryption_backup_text">Увядзіце пароль для расшыфравання прылады. Ён таксама будзе выкарыстоўвацца для расшыфравання рэзервовай копіі.</string>
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
   <string name="backup_enc_password_text">Увядзіце пароль, які выкарыстоўваецца для шыфравання ўсіх дадзеных рэзервовага капіявання. Калі гэтае поле пакінуць пустым, будзе выкарыстоўвацца бягучы пароль рэзервовага капіявання:</string>
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
   <string name="backup_enc_password_optional">Калі вы жадаеце зашыфраваць усе дадзеныя рэзервовага капіявання, увядзіце пароль ніжэй:</string>
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
   <string name="backup_enc_password_required">У сувязі з тым, што ваша прылада зашыфраваная, трэба таксама зашыфраваць і рэзервовую копію. Калі ласка, увядзіце пароль:</string>
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
   <string name="restore_enc_password_text">Калі дадзеныя для аднаўлення зашыфраваныя, увядзіце пароль ніжэй:</string>
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
   <string name="toast_backup_started">Рэзервовае капіяванне...</string>
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
   <string name="toast_backup_ended">Рэзервовае капіяванне скончылася</string>
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
   <string name="toast_restore_started">Пачынаецца аднаўленне...</string>
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
   <string name="toast_restore_ended">Аднаўленне скончылася</string>
+  <!-- Text of a toast telling the user that the operation has timed out -->
   <string name="toast_timeout">Тайм-аўт аперацыі</string>
 </resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-br-rFR/strings.xml b/packages/BackupRestoreConfirmation/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-br-rFR/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-bs-rBA/strings.xml b/packages/BackupRestoreConfirmation/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-bs-rBA/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-csb-rPL/strings.xml b/packages/BackupRestoreConfirmation/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-csb-rPL/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-cy/strings.xml b/packages/BackupRestoreConfirmation/res/values-cy/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-cy/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-en-rPT/strings.xml b/packages/BackupRestoreConfirmation/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-en-rPT/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-eo/strings.xml b/packages/BackupRestoreConfirmation/res/values-eo/strings.xml
index 64ce001..a57cb16 100644
--- a/packages/BackupRestoreConfirmation/res/values-eo/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-eo/strings.xml
@@ -15,7 +15,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
   <string name="backup_confirm_title">Kompleta savkopio</string>
-  <string name="restore_confirm_title">Kompleta restaŭro</string>
-  <string name="deny_restore_button_label">Ne restaŭri</string>
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
 </resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-es-rCO/strings.xml b/packages/BackupRestoreConfirmation/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-es-rCO/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-es-rMX/strings.xml b/packages/BackupRestoreConfirmation/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-es-rMX/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-fa/strings.xml b/packages/BackupRestoreConfirmation/res/values-fa/strings.xml
index 4c16374..d8155a6 100644
--- a/packages/BackupRestoreConfirmation/res/values-fa/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-fa/strings.xml
@@ -19,7 +19,7 @@
     <string name="backup_confirm_title" msgid="827563724209303345">"پشتیبان‌گیری کامل"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"بازیابی کامل"</string>
     <string name="backup_confirm_text" msgid="1878021282758896593">"درخواست پشتیبان گیری کامل از تمام داده‌ها به یک رایانه دسک‌تاپ متصل داده شده است. آیا می‌خواهید این عمل انجام شود؟\n\nاگر شما درخواست تهیهٔ نسخهٔ پشتیبان را نداده‌اید، اجازه‌ ادامه عملیات را ندهید."</string>
-    <string name="allow_backup_button_label" msgid="4217228747769644068">"از داده‌های من نسخهٔ پشتیبان تهیه شود"</string>
+    <string name="allow_backup_button_label" msgid="4217228747769644068">"پشتیبان‌گیری از داده‌های من"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"نسخهٔ پشتیبان تهیه نشود"</string>
     <string name="restore_confirm_text" msgid="7499866728030461776">"بازیابی کامل تمام داده‌ها از یک رایانه دسک تاپ متصل درخواست شده است. آیا می‌خواهید این اجازه را بدهید؟\n\nاگر خود شما درخواست بازیابی نداده‌اید، اجازه ادامه این عملیات را ندهید. با این کار همه داده‌هایی که اکنون روی دستگاه است جایگزین می‌شود!"</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"بازیابی داده‌های من"</string>
@@ -29,7 +29,7 @@
     <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="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>
diff --git a/packages/BackupRestoreConfirmation/res/values-frp-rIT/strings.xml b/packages/BackupRestoreConfirmation/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-frp-rIT/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-fy-rNL/strings.xml b/packages/BackupRestoreConfirmation/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-fy-rNL/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-ga-rIE/strings.xml b/packages/BackupRestoreConfirmation/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-ga-rIE/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-gd-rGB/strings.xml b/packages/BackupRestoreConfirmation/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-gd-rGB/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-hr/strings.xml b/packages/BackupRestoreConfirmation/res/values-hr/strings.xml
index 66037f3..cda36cb 100644
--- a/packages/BackupRestoreConfirmation/res/values-hr/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-hr/strings.xml
@@ -19,7 +19,7 @@
     <string name="backup_confirm_title" msgid="827563724209303345">"Puna sigurnosna kopija"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"Potpuno vraćanje"</string>
     <string name="backup_confirm_text" msgid="1878021282758896593">"Zatražena je potpuna sigurnosna kopija svih podataka na povezano stolno računalo. Želite li to dozvoliti?\n\nAko niste vi zatražili sigurnosnu kopiju, ne dozvolite nastavak te radnje."</string>
-    <string name="allow_backup_button_label" msgid="4217228747769644068">"Izradi sigurnosnu kopiju mojih podataka"</string>
+    <string name="allow_backup_button_label" msgid="4217228747769644068">"Sigurnosno kopiranje"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"Ne radi sigurnosnu kopiju"</string>
     <string name="restore_confirm_text" msgid="7499866728030461776">"Zatraženo je potpuno vraćanje svih podataka s povezanog stolnog računala. Želite li to dozvoliti?\n\nAko niste sami zatražili vraćanje, ne dozvolite nastavak radnje. To će zamijeniti sve podatke koji se trenutačno nalaze na uređaju!"</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Vrati moje podatke"</string>
@@ -28,8 +28,8 @@
     <string name="device_encryption_restore_text" msgid="1570864916855208992">"U nastavku unesite svoju zaporku za enkripciju uređaja."</string>
     <string name="device_encryption_backup_text" msgid="5866590762672844664">"U nastavku unesite svoju zaporku enkripcije za uređaj. Ona će se upotrijebiti i za enkripciju te za arhivu sigurnosnih kopija."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Unesite zaporku koju ćete upotrebljavati za kriptiranje podataka potpune sigurnosne kopije. Ako je ostavite praznom, bit će upotrijebljena vaša trenutačna zaporka za sigurnosno kopiranje:"</string>
-    <string name="backup_enc_password_optional" msgid="1350137345907579306">"Ako želite kriptirati podatke potpune sigurnosne kopije, u nastavku unesite zaporku:"</string>
-    <string name="backup_enc_password_required" msgid="7889652203371654149">"Budući da vam je uređaj kriptiran, morate kriptirati sigurnosne kopije. Unesite zaporku u nastavku:"</string>
+    <string name="backup_enc_password_optional" msgid="1350137345907579306">"Ako želite šifrirati podatke potpune sigurnosne kopije, u nastavku unesite zaporku:"</string>
+    <string name="backup_enc_password_required" msgid="7889652203371654149">"Budući da vam je uređaj kriptiran, morate šifrirati sigurnosne kopije. Unesite zaporku u nastavku:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Ako su podaci za vraćanje kriptirani, unesite zaporku u nastavku:"</string>
     <string name="toast_backup_started" msgid="550354281452756121">"Započinje stvaranje sigurnosne kopije..."</string>
     <string name="toast_backup_ended" msgid="3818080769548726424">"Sigurnosna kopija dovršena"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-it/strings.xml b/packages/BackupRestoreConfirmation/res/values-it/strings.xml
index 2325d40..b84edbc 100644
--- a/packages/BackupRestoreConfirmation/res/values-it/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-it/strings.xml
@@ -29,7 +29,7 @@
     <string name="device_encryption_backup_text" msgid="5866590762672844664">"Inserisci la tua password di crittografia dispositivo di seguito. Verrà utilizzata anche per crittografare l\'archivio di backup."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Inserisci una password da utilizzare per la crittografia dei dati di backup completi. Se non ne inserisci una, verrà utilizzata la tua password di backup corrente:"</string>
     <string name="backup_enc_password_optional" msgid="1350137345907579306">"Se desideri crittografare tutti i dati di backup, inserisci una password qui di seguito:"</string>
-    <string name="backup_enc_password_required" msgid="7889652203371654149">"Il dispositivo è crittografato, pertanto devi crittografare il backup. Inserisci una password di seguito:"</string>
+    <string name="backup_enc_password_required" msgid="7889652203371654149">"Il dispositivo è criptato, quindi devi criptare il backup. Inserisci una password di seguito:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Se i dati di ripristino sono crittografati, inserisci la password qui di seguito:"</string>
     <string name="toast_backup_started" msgid="550354281452756121">"Avvio del backup..."</string>
     <string name="toast_backup_ended" msgid="3818080769548726424">"Backup terminato"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-iw/strings.xml b/packages/BackupRestoreConfirmation/res/values-iw/strings.xml
index 8c2ffaf..4c13c73 100644
--- a/packages/BackupRestoreConfirmation/res/values-iw/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-iw/strings.xml
@@ -19,7 +19,7 @@
     <string name="backup_confirm_title" msgid="827563724209303345">"גיבוי מלא"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"שחזור מלא"</string>
     <string name="backup_confirm_text" msgid="1878021282758896593">"הוגשה בקשה לגיבוי מלא של כל הנתונים במחשב שולחני מחובר. האם אתה רוצה לאפשר פעולה זו? \n\nאם לא ביקשת את הגיבוי בעצמך, אל תאפשר לפעולה להמשיך."</string>
-    <string name="allow_backup_button_label" msgid="4217228747769644068">"גבה את הנתונים שלי"</string>
+    <string name="allow_backup_button_label" msgid="4217228747769644068">"גיבוי הנתונים שלי"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"אל תגבה"</string>
     <string name="restore_confirm_text" msgid="7499866728030461776">"הוגשה בקשה לשחזור מלא של כל הנתונים ממחשב שולחני מחובר. האם אתה רוצה לאפשר פעולה זו? \n \n אם לא ביקשת את השחזור בעצמך, אל תאפשר לפעולה להמשיך. פעולה זו תחליף את כל הנתונים שנמצאים כעת במכשיר!"</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"שחזר את הנתונים שלי"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-ku/strings.xml b/packages/BackupRestoreConfirmation/res/values-ku/strings.xml
index d5ccd4b..c6aa517 100644
--- a/packages/BackupRestoreConfirmation/res/values-ku/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ku/strings.xml
@@ -15,24 +15,44 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
   <string name="backup_confirm_title">پاراستنی گشت</string>
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
   <string name="restore_confirm_title">گه‌ڕاندنه‌وه‌ی گشت</string>
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
   <string name="backup_confirm_text">پاراستنێکی گشتیی بۆ هه‌موو ئه‌و داتایانه‌ی که‌ په‌یوه‌ست کراوه‌ به‌ کۆمپیوته‌ره‌وه‌ داواکراوه‌. ده‌ته‌وێت ئه‌مه‌ ڕووبدات؟\n\n ئه‌گه‌ر خۆت ئه‌م داواکارییه‌ت نه‌کردووه‌، مه‌هێڵه‌ ئه‌م کاره‌ ڕووبدات.</string>
+  <!-- Button to allow a requested full backup to occur -->
   <string name="allow_backup_button_label">داتاکانم بپارێزه‌</string>
+  <!-- Button to refuse to allow the requested full backup -->
   <string name="deny_backup_button_label">مه‌یپارێزه‌</string>
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
   <string name="restore_confirm_text">گه‌ڕانه‌وه‌ی ته‌واوی داتاکان بۆ په‌یوه‌ندی کردن به‌ ڕوونمای کۆمپیوته‌ره‌وه‌ داواکراوه‌ ، ئه‌ته‌وێ ئه‌مه‌ ڕووبدات؟\n\n ئه‌گه‌ر خۆت داوای ئه‌م پاراستنه‌ت نه‌کردووه‌، مه‌هێڵه‌ ئه‌م کاره‌ ڕووبدات. ئه‌گه‌رنا شوێنی هه‌موو ئه‌و داتایانه‌ ده‌گرێته‌وه‌ که‌ ئێستا له‌ ئامێره‌که‌دایه‌!</string>
+  <!-- Button to allow a requested full restore to occur -->
   <string name="allow_restore_button_label">داتاکانم بگه‌ڕێنه‌ره‌وه‌</string>
+  <!-- Button to refuse to allow the requested full restore -->
   <string name="deny_restore_button_label">مه‌یگه‌ڕێنه‌ره‌وه‌</string>
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
   <string name="current_password_text">تکایه‌ تێپه‌ڕه‌وشه‌ی پاراستن بنوسه‌ له‌ خواره‌وه‌:</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
   <string name="device_encryption_restore_text">تکایه تێپه‌ڕه‌وشه‌ی ئامێره‌ به‌ هێماکراوه‌که‌ت بنوسه‌.</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
   <string name="device_encryption_backup_text">تکایه تێپه‌ڕه‌وشه‌ی ئامێره‌ ڕه‌مزکراوه‌که‌ت له‌ خواره‌وه‌بنوسه‌. ئه‌مه‌ ده‌توانرێت بۆ ڕه‌مزکردنی ئه‌رشیفی پاراستنیش به‌کار بهێنرێت.</string>
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
   <string name="backup_enc_password_text">تکایه‌ تێپه‌ڕه‌وشه‌یه‌ک بنوسه‌ بۆ به‌کارهێنانی به‌ هێماکردنی پاراستنی ته‌واوی داتاکان. ئه‌گه‌ر ئه‌مه‌ به‌ به‌تاڵیی جێ بهێڵرێت، دوایین تێپه‌ڕه‌وشه‌ی پاراستنت به‌کارده‌هێنرێت:</string>
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
   <string name="backup_enc_password_optional">ئه‌گه‌ر ده‌ته‌وێت ته‌واوی پاراستنی داتاکان به‌ هێما بکه‌یت، تێپه‌ڕه‌وشه‌یه‌ک له‌ خواره‌وه‌ بنوسه‌:</string>
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
   <string name="backup_enc_password_required">لەوەتەی ئامێرەکەت پارێزراوە، تۆ پێویستیت بە هەڵگرتنی داتاکانتە. تکایە ژمارەی تێپەڕەوشە لێبدە:</string>
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
   <string name="restore_enc_password_text">ئه‌گه‌ر داتای گه‌ڕاندنه‌وه‌ به‌ هێما کراوه‌، تکایه‌ تێپه‌ڕه‌وشه‌که‌ له‌ خواره‌وه‌ بنوسه‌:</string>
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
   <string name="toast_backup_started">پاراستن ده‌ستپێده‌کات...</string>
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
   <string name="toast_backup_ended">پاراستن ته‌واو بوو</string>
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
   <string name="toast_restore_started">گه‌ڕاندنه‌وه‌ ده‌ستپێده‌کات...</string>
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
   <string name="toast_restore_ended">گه‌ڕاندنه‌وه‌ کۆتایی هات</string>
+  <!-- Text of a toast telling the user that the operation has timed out -->
   <string name="toast_timeout">کاتی کرداره‌که‌ ته‌واو بوو</string>
 </resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-lb/strings.xml b/packages/BackupRestoreConfirmation/res/values-lb/strings.xml
index 835788f..1b96ed8 100644
--- a/packages/BackupRestoreConfirmation/res/values-lb/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-lb/strings.xml
@@ -15,24 +15,44 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
   <string name="backup_confirm_title">Komplett Sécherung</string>
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
   <string name="restore_confirm_title">Komplett Erëmhierstellung</string>
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
   <string name="backup_confirm_text">Eng komplett Sécherung  vun allen Daten op en ugeschlossene Büroscomputer ass gefrot ginn. Wëlls du dat zouloossen\?\n\nFalls du dës Sécherung net gefrot hues, dann erlab dës Operatioun net.</string>
+  <!-- Button to allow a requested full backup to occur -->
   <string name="allow_backup_button_label">Meng Date sécheren</string>
+  <!-- Button to refuse to allow the requested full backup -->
   <string name="deny_backup_button_label">Net sécheren</string>
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
   <string name="restore_confirm_text">Eng komplett Erëmhierstellung vun allen Daten op en ugeschlosse Büroscomputer ass gefrot ginn. Wëlls du dat zouloossen\?\n\nFalls du dës Erëmhierstellung net gefrot hues, dann erlab dës Operatioun net!</string>
+  <!-- Button to allow a requested full restore to occur -->
   <string name="allow_restore_button_label">Meng Daten erëmhierstellen</string>
+  <!-- Button to refuse to allow the requested full restore -->
   <string name="deny_restore_button_label">Net erëmhierstellen</string>
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
   <string name="current_password_text">Gëff w.e.g. däin aktuellt Sécherungspasswuert an:</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
   <string name="device_encryption_restore_text">Gëff w.e.g. d\'Passwuert fir d\'Entschlësselung vun dengem Apparat an.</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
   <string name="device_encryption_backup_text">Gëff w.e.g. d\'Passwuert fir d\'Entschlësselung vun dengem Apparat an. Dat Passwuert gëtt och benotzt fir d\'Sécherungsarchiv ze verschlësselen.</string>
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
   <string name="backup_enc_password_text">Gëff w.e.g. e Passwuert a fir d\'Verschlësselung vun de gesécherten Daten. Falls et eidel ass, gëtt däin aktuellt Sécherungspasswuert benotzt:</string>
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
   <string name="backup_enc_password_optional">Falls du deng Datesécherung wëlls verschlësselen, gëff e Passwuert an:</string>
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
   <string name="backup_enc_password_required">Well däin Apparat verschlësselt ass, muss du och deng Sécherung verschlësselen. Gëff w.e.g. e Passwuert an:</string>
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
   <string name="restore_enc_password_text">Falls d\'Erëmhierstellungsdate verschlësselt sinn, gëff d\'Passwuert an:</string>
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
   <string name="toast_backup_started">Sécherung start...</string>
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
   <string name="toast_backup_ended">Sécherung ofgeschoss</string>
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
   <string name="toast_restore_started">Erëmhierstellung start...</string>
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
   <string name="toast_restore_ended">Erëmhierstellung ofgeschloss</string>
+  <!-- Text of a toast telling the user that the operation has timed out -->
   <string name="toast_timeout">D\'Operatioun huet d\'Zäit iwwerschratt</string>
 </resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-ml-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-ml-rIN/strings.xml
index b2b4bcb..5f97afa 100644
--- a/packages/BackupRestoreConfirmation/res/values-ml-rIN/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ml-rIN/strings.xml
@@ -19,7 +19,7 @@
     <string name="backup_confirm_title" msgid="827563724209303345">"പൂർണ്ണ ബാക്കപ്പ്"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"പൂർണ്ണമായി പുനഃസ്ഥാപിക്കൽ"</string>
     <string name="backup_confirm_text" msgid="1878021282758896593">"കണക്റ്റുചെയ്‌ത ഡെസ്‌ക്‌ടോപ്പ് കമ്പ്യൂട്ടറിലേക്കുള്ള എല്ലാ ഡാറ്റയുടെയും പൂർണ്ണ ബാക്കപ്പ് ആവശ്യപ്പെട്ടു. ഇത് സംഭവിക്കാൻ അനുവദിക്കണോ?\n\nനിങ്ങൾ സ്വയം ബാക്കപ്പുചെയ്യാൻ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, ഈ പ്രവർത്തനം തുടരാൻ അനുവദിക്കരുത്."</string>
-    <string name="allow_backup_button_label" msgid="4217228747769644068">"എന്റെ ഡാറ്റ ബാക്കപ്പുചെയ്യുക"</string>
+    <string name="allow_backup_button_label" msgid="4217228747769644068">"ഡാറ്റ ബാക്കപ്പുചെയ്യൂ"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"ബാക്കപ്പ് ചെയ്യരുത്"</string>
     <string name="restore_confirm_text" msgid="7499866728030461776">"കണക്റ്റുചെയ്‌ത ഡെസ്‌ക്‌ടോപ്പ് കമ്പ്യൂട്ടറിലേക്കുള്ള എല്ലാ ഡാറ്റയുടെയും പൂർണ്ണ ബാക്കപ്പ് ആവശ്യപ്പെട്ടു. ഇത് സംഭവിക്കാൻ അനുവദിക്കണോ?\n\nനിങ്ങൾ സ്വയം ബാക്കപ്പുചെയ്യാൻ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, ഈ പ്രവർത്തനം തുടരാൻ അനുവദിക്കരുത്. ഇത് ഉപകരണത്തിൽ നിലവിലുള്ള എല്ലാ ഡാറ്റയേയും മാറ്റി പകരം വയ്ക്കും!"</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"എന്റെ ഡാറ്റ പുനഃസ്ഥാപിക്കുക"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-nl/strings.xml b/packages/BackupRestoreConfirmation/res/values-nl/strings.xml
index f483b14..94d285f 100644
--- a/packages/BackupRestoreConfirmation/res/values-nl/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-nl/strings.xml
@@ -18,19 +18,19 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="backup_confirm_title" msgid="827563724209303345">"Volledige back-up"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"Volledig herstel"</string>
-    <string name="backup_confirm_text" msgid="1878021282758896593">"Er is een volledige back-up van alle gegevens naar een verbonden desktopcomputer aangevraagd. Wilt u dit toestaan?\n\nAls u de back-up zelf niet heeft aangevraagd, moet u niet toestaan dat de bewerking wordt uitgevoerd."</string>
+    <string name="backup_confirm_text" msgid="1878021282758896593">"Er is een volledige back-up van alle gegevens naar een verbonden desktopcomputer aangevraagd. Wil je dit toestaan?\n\nAls je de back-up niet zelf hebt aangevraagd, moet je niet toestaan dat de bewerking wordt uitgevoerd."</string>
     <string name="allow_backup_button_label" msgid="4217228747769644068">"Back-up maken van mijn gegevens"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"Geen back-up maken"</string>
-    <string name="restore_confirm_text" msgid="7499866728030461776">"Er is volledig herstel van alle gegevens van een verbonden desktopcomputer aangevraagd. Wilt u dit toestaan?\n\nAls u het herstel zelf niet heeft aangevraagd, moet u niet toestaan dat de bewerking wordt uitgevoerd. Bij herstel worden alle gegevens op het apparaat vervangen."</string>
+    <string name="restore_confirm_text" msgid="7499866728030461776">"Er is volledig herstel van alle gegevens van een verbonden desktopcomputer aangevraagd. Wil je dit toestaan?\n\nAls je het herstel niet zelf hebt aangevraagd, moet je niet toestaan dat de bewerking wordt uitgevoerd. Bij herstel worden alle gegevens op het apparaat vervangen."</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Mijn gegevens herstellen"</string>
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Niet herstellen"</string>
-    <string name="current_password_text" msgid="8268189555578298067">"Geef hieronder uw huidige back-upwachtwoord op:"</string>
-    <string name="device_encryption_restore_text" msgid="1570864916855208992">"Geef hieronder uw wachtwoord voor apparaatcodering op."</string>
-    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Geef hieronder uw 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 uw 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 uw apparaat is gecodeerd, moet u uw 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="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 je wil 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-oc-rFR/strings.xml b/packages/BackupRestoreConfirmation/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-oc-rFR/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-or-rIN/strings.xml b/packages/BackupRestoreConfirmation/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..803e4a8
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-or-rIN/strings.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full backup to occur -->
+  <!-- Button to refuse to allow the requested full backup -->
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
+  <!-- Button to allow a requested full restore to occur -->
+  <!-- Button to refuse to allow the requested full restore -->
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
+  <!-- Text of a toast telling the user that the operation has timed out -->
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-pt-rBR/strings.xml b/packages/BackupRestoreConfirmation/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..cbc579e
--- /dev/null
+++ b/packages/BackupRestoreConfirmation/res/values-pt-rBR/strings.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 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.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="backup_confirm_title" msgid="827563724209303345">"Backup completo"</string>
+    <string name="restore_confirm_title" msgid="5469365809567486602">"Restauração completa"</string>
+    <string name="backup_confirm_text" msgid="1878021282758896593">"Foi solicitado um backup completo de todos os dados para um computador conectado. Deseja permitir que isso aconteça?\n\nCaso você não tenha solicitado o backup, não permita que a operação prossiga."</string>
+    <string name="allow_backup_button_label" msgid="4217228747769644068">"Fazer backup de meus dados"</string>
+    <string name="deny_backup_button_label" msgid="6009119115581097708">"Não fazer backup"</string>
+    <string name="restore_confirm_text" msgid="7499866728030461776">"Foi solicitada uma restauração completa de todos os dados de um computador conectado. Deseja permitir que isso ocorra?\n\nCaso você não tenha solicitado a restauração, não permita que a operação prossiga. Isso substituirá todos os dados existentes no dispositivo!"</string>
+    <string name="allow_restore_button_label" msgid="3081286752277127827">"Restaurar meus dados"</string>
+    <string name="deny_restore_button_label" msgid="1724367334453104378">"Não restaurar"</string>
+    <string name="current_password_text" msgid="8268189555578298067">"Digite sua senha de backup atual abaixo:"</string>
+    <string name="device_encryption_restore_text" msgid="1570864916855208992">"Insira sua senha de criptografia do dispositivo abaixo."</string>
+    <string name="device_encryption_backup_text" msgid="5866590762672844664">"Insira sua senha de criptografia do dispositivo abaixo. Ela também será usada para criptografar o arquivo de backup."</string>
+    <string name="backup_enc_password_text" msgid="4981585714795233099">"Digite uma senha para usar para criptografar os dados de backup por completo. Se isso for deixado em branco, sua senha atual de backup será usada:"</string>
+    <string name="backup_enc_password_optional" msgid="1350137345907579306">"Se você deseja criptografar os dados de backup por completo, digite uma senha abaixo:"</string>
+    <string name="backup_enc_password_required" msgid="7889652203371654149">"Como seu dispositivo está criptografado, é necessário criptografar seu backup. Insira uma senha abaixo:"</string>
+    <string name="restore_enc_password_text" msgid="6140898525580710823">"Se os dados restaurados forem criptografada, digite a senha abaixo:"</string>
+    <string name="toast_backup_started" msgid="550354281452756121">"Iniciando backup..."</string>
+    <string name="toast_backup_ended" msgid="3818080769548726424">"O backup foi concluído"</string>
+    <string name="toast_restore_started" msgid="7881679218971277385">"Iniciando restauração..."</string>
+    <string name="toast_restore_ended" msgid="1764041639199696132">"A restauração foi concluída"</string>
+    <string name="toast_timeout" msgid="5276598587087626877">"A operação atingiu o tempo limite"</string>
+</resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
index 1cf438b..6a7dbbd 100644
--- a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml
@@ -18,17 +18,17 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="backup_confirm_title" msgid="827563724209303345">"Copiere de rezervă completă"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"Restabilire completă"</string>
-    <string name="backup_confirm_text" msgid="1878021282758896593">"S-a solicitat crearea unei copii de rezervă complete a tuturor datelor pe un computer desktop conectat. Doriţi să permiteţi acest lucru?\n\nDacă nu aţi solicitat dvs. copierea de rezervă, nu permiteţi ca operaţiunea să continue."</string>
+    <string name="backup_confirm_text" msgid="1878021282758896593">"S-a solicitat crearea unei copii de rezervă complete a tuturor datelor pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu aţi solicitat dvs. copierea de rezervă, nu permiteți ca operațiunea să continue."</string>
     <string name="allow_backup_button_label" msgid="4217228747769644068">"Creaţi copii de rezervă pentru datele dvs."</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"Nu creaţi copii de rezervă"</string>
-    <string name="restore_confirm_text" msgid="7499866728030461776">"S-a solicitat o restabilire completă a tuturor datelor de pe un computer desktop conectat. Doriţi să permiteţi acest lucru?\n\nDacă nu dvs. aţi solicitat această restabilire, nu permiteţi continuarea operaţiunii. Acest proces va înlocui toate datele existente în prezent pe dispozitiv!"</string>
+    <string name="restore_confirm_text" msgid="7499866728030461776">"S-a solicitat o restabilire completă a tuturor datelor de pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu dvs. aţi solicitat această restabilire, nu permiteți continuarea operațiunii. Acest proces va înlocui toate datele existente în prezent pe dispozitiv!"</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Restabiliţi datele dvs."</string>
     <string name="deny_restore_button_label" msgid="1724367334453104378">"Nu restabiliţi"</string>
     <string name="current_password_text" msgid="8268189555578298067">"Introduceţi mai jos parola actuală pentru copia de rezervă:"</string>
     <string name="device_encryption_restore_text" msgid="1570864916855208992">"Introduceţi mai jos parola pentru criptarea dispozitivului."</string>
     <string name="device_encryption_backup_text" msgid="5866590762672844664">"Introduceţi mai jos parola de criptare a dispozitivului. Aceasta va fi utilizată, de asemenea, pentru a cripta arhiva copiei de rezervă."</string>
     <string name="backup_enc_password_text" msgid="4981585714795233099">"Introduceţi o parolă pentru a o utiliza la criptarea datelor copiei de rezervă complete. Dacă acest câmp rămâne necompletat, pentru copierea de rezervă se va utiliza parola dvs. actuală."</string>
-    <string name="backup_enc_password_optional" msgid="1350137345907579306">"Dacă doriţi să criptaţi datele copiei de rezervă complete, introduceţi o parolă mai jos:"</string>
+    <string name="backup_enc_password_optional" msgid="1350137345907579306">"Dacă doriți să criptaţi datele copiei de rezervă complete, introduceţi o parolă mai jos:"</string>
     <string name="backup_enc_password_required" msgid="7889652203371654149">"Întrucât dispozitivul este criptat, trebuie să criptați backupurile. Introduceți o parolă mai jos:"</string>
     <string name="restore_enc_password_text" msgid="6140898525580710823">"Dacă datele pentru restabilire sunt criptate, introduceţi parola mai jos:"</string>
     <string name="toast_backup_started" msgid="550354281452756121">"Se începe copierea de rezervă..."</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-sk/strings.xml b/packages/BackupRestoreConfirmation/res/values-sk/strings.xml
index a231d23..804f980 100644
--- a/packages/BackupRestoreConfirmation/res/values-sk/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-sk/strings.xml
@@ -19,7 +19,7 @@
     <string name="backup_confirm_title" msgid="827563724209303345">"Úplná záloha"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"Úplné obnovenie"</string>
     <string name="backup_confirm_text" msgid="1878021282758896593">"Bola vyžiadaná úplná záloha všetkých dát do pripojeného počítača. Chcete túto akciu povoliť?\n\nAk ste zálohu nevyžiadali vy, túto operáciu nepovoľujte."</string>
-    <string name="allow_backup_button_label" msgid="4217228747769644068">"Zálohovať údaje"</string>
+    <string name="allow_backup_button_label" msgid="4217228747769644068">"Zálohovať dáta"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"Nezálohovať"</string>
     <string name="restore_confirm_text" msgid="7499866728030461776">"Z pripojeného počítača bolo vyžiadané úplné obnovenie všetkých údajov. Chcete túto akciu povoliť?\n\nAk ste toto obnovenie nevyžiadali vy, túto operáciu nepovoľujte. Táto akcia nahradí všetky údaje v zariadení."</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Obnoviť údaje"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-sv/strings.xml b/packages/BackupRestoreConfirmation/res/values-sv/strings.xml
index 3ae37cf..dee8bc2 100644
--- a/packages/BackupRestoreConfirmation/res/values-sv/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-sv/strings.xml
@@ -19,7 +19,7 @@
     <string name="backup_confirm_title" msgid="827563724209303345">"Fullständig säkerhetskopiering"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"Fullständig återställning"</string>
     <string name="backup_confirm_text" msgid="1878021282758896593">"En fullständig säkerhetskopia av alla data till en ansluten dator har begärts. Vill du tillåta detta?\n\nOm du inte själv begärde säkerhetskopian ska du inte tillåta detta."</string>
-    <string name="allow_backup_button_label" msgid="4217228747769644068">"Säkerhetskopiera mina data"</string>
+    <string name="allow_backup_button_label" msgid="4217228747769644068">"Säkerhetskopiera data"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"Säkerhetskopiera inte"</string>
     <string name="restore_confirm_text" msgid="7499866728030461776">"En fullständig återställning av alla data från en ansluten dator har begärts. Vill du tillåta detta? \n \n Om du inte själv har begärt återställningen ska du inte tillåta den. Alla data som finns på enheten kommer då att ersättas!"</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Återställ mina data"</string>
diff --git a/packages/BackupRestoreConfirmation/res/values-ug/strings.xml b/packages/BackupRestoreConfirmation/res/values-ug/strings.xml
index 86998b3..db00bcc 100644
--- a/packages/BackupRestoreConfirmation/res/values-ug/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-ug/strings.xml
@@ -15,23 +15,43 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the activity when a full backup has been requested and must be confirmed -->
   <string name="backup_confirm_title">تولۇق زاپاسلاش</string>
+  <!-- Title of the activity when a full restore has been requested and must be confirmed -->
   <string name="restore_confirm_title">تولۇق ئەسلىگە كەلتۈرۈش</string>
+  <!-- Text for message to user that a full backup has been requested, and must be confirmed. -->
   <string name="backup_confirm_text">سىستېما بارلىق سانلىق مەلۇماتلارنى باغلانغان ئۈستەلئۈستى كومپيۇتېرغا زاپاسلاشنى ئىلتىماس قىلدى. بۇ مەشغۇلاتقا يول قويامسىز؟\n\nئەگەر ئۆزىڭىز زاپاسلاشنى ئىلتىماس قىلمىسىڭىز، بۇ مەشغۇلاتقا يول قويماڭ.</string>
+  <!-- Button to allow a requested full backup to occur -->
   <string name="allow_backup_button_label">سانلىق مەلۇماتلىرىمنى زاپاسلا</string>
+  <!-- Button to refuse to allow the requested full backup -->
   <string name="deny_backup_button_label">زاپاسلىما</string>
+  <!-- Text for message to user that a full restore has been requested, and must be confirmed. -->
   <string name="restore_confirm_text">سىستېما بارلىق سانلىق مەلۇماتلارنى باغلانغان ئۈستەلئۈستى كومپيۇتېرغا ئەسلىگە كەلتۈرۈشنى ئىلتىماس قىلدى. بۇ مەشغۇلاتقا يول قويامسىز؟\n\nئەگەر ئۆزىڭىز ئەسلىگە كەلتۈرۈشنى ئىلتىماس قىلمىسىڭىز، بۇ مەشغۇلاتقا يول قويماڭ. بۇ مەشغۇلات ئۈسكۈنىدىكى ھەممە سانلىق مەلۇماتلارنى قاپلىۋېتىدۇ!</string>
+  <!-- Button to allow a requested full restore to occur -->
   <string name="allow_restore_button_label">سانلىق-مەلۇماتىمنى ئەسلىگە كەلتۈر</string>
+  <!-- Button to refuse to allow the requested full restore -->
   <string name="deny_restore_button_label">ئەسلىگە كەلتۈرمە</string>
+  <!-- Text for message to user that they must enter their predefined backup password in order to perform this operation. -->
   <string name="current_password_text">تۆۋەندە نۆۋەتتىكى زاپاسنىڭ ئىمنى كىرگۈزۈڭ:</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this restore operation. -->
   <string name="device_encryption_restore_text">تۆۋەندە ئۈسكۈنىڭىزنىڭ شىفىرلانغان ئىمنى كىرگۈزۈڭ.</string>
+  <!-- Text for message to user that they must enter their device encryption password in order to perform this backup operation. -->
   <string name="device_encryption_backup_text">تۆۋەندە ئۈسكۈنىڭىزنىڭ شىفىرلانغان ئىمنى كىرگۈزۈڭ. ئەگەر بوش قالدۇرسىڭىز سىستېما نۆۋەتتىكى زاپاسنىڭ ئىمنى ئىشلىتىدۇ.</string>
+  <!-- Text for message to user that they must enter an encryption password to use for the full backup operation. -->
   <string name="backup_enc_password_text">سانلىق مەلۇماتنى تولۇق زاپاسلاشقا ئىشلىتىدىغان ئىمنى كىرگۈزۈڭ. ئەگەر بوش قالدۇرسىڭىز سىستېما نۆۋەتتىكى زاپاسنىڭ ئىمنى ئىشلىتىدۇ.</string>
+  <!-- Text for message to user that they may optionally supply an encryption password to use for a full backup operation. -->
   <string name="backup_enc_password_optional">ئەگەر سانلىق مەلۇماتنى تولۇق زاپاسلاشنى شىفىرلىسىڭىز، تۆۋەندە ئىمنى كىرگۈزۈڭ:</string>
+  <!-- Text for message to user that they must supply an encryption password to use for a full backup operation because their phone is locked. -->
+  <!-- Text for message to user when performing a full restore operation, explaining that they must enter the password originally used to encrypt the full backup data. -->
   <string name="restore_enc_password_text">ئەگەر ئەسلىگە كەلتۈرىدىغان سانلىق مەلۇمات شىفىرلانغان بولسا تۆۋەندە ئىمنى كىرگۈزۈڭ:</string>
+  <!-- Text of a toast telling the user that a full backup operation has begun -->
   <string name="toast_backup_started">زاپاسلاش باشلاندى…</string>
+  <!-- Text of a toast telling the user that a full backup operation has ended -->
   <string name="toast_backup_ended">زاپاسلاش تامام</string>
+  <!-- Text of a toast telling the user that a full restore operation has begun -->
   <string name="toast_restore_started">ئەسلىگە كەلتۈرۈش باشلاندى…</string>
+  <!-- Text of a toast telling the user that a full restore operation has ended -->
   <string name="toast_restore_ended">ئەسلىگە كەلتۈرۈش ئاخىرلاشتى</string>
+  <!-- Text of a toast telling the user that the operation has timed out -->
   <string name="toast_timeout">مەشغۇلات ۋاقىت ھالقىدى</string>
 </resources>
diff --git a/packages/BackupRestoreConfirmation/res/values-uz-rUZ/strings.xml b/packages/BackupRestoreConfirmation/res/values-uz-rUZ/strings.xml
index 1b5741f..213b31f 100644
--- a/packages/BackupRestoreConfirmation/res/values-uz-rUZ/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-uz-rUZ/strings.xml
@@ -19,7 +19,7 @@
     <string name="backup_confirm_title" msgid="827563724209303345">"To‘liq zahira"</string>
     <string name="restore_confirm_title" msgid="5469365809567486602">"To‘liq tiklash"</string>
     <string name="backup_confirm_text" msgid="1878021282758896593">"Barcha ma’lumotlarni ulangan kompyuterga to‘liq zahiralash so‘raldi. Bunga ruxsat berasizmi?\n\nZahiralashni o‘zingiz so‘ramagan bo‘lsangiz, jarayonni davom etishiga ruxsat bermang."</string>
-    <string name="allow_backup_button_label" msgid="4217228747769644068">"Ma’lumotlarimni zahiralash"</string>
+    <string name="allow_backup_button_label" msgid="4217228747769644068">"Ma’lumotlarni zaxiralash"</string>
     <string name="deny_backup_button_label" msgid="6009119115581097708">"Zahiralamang"</string>
     <string name="restore_confirm_text" msgid="7499866728030461776">"Barcha ma’lumotlarni ulangan kompyuterdan to‘liq tiklash so‘raldi. Bunga ruxsat berasizmi?\n\nTiklashni o‘zingiz so‘ramagan bo‘lsangiz, jarayonni davom etishiga ruxsat bermang. U qurilmadagi hozirda mavjud bo‘lgan barcha ma’lumotlarni almashtirib tashlaydi!"</string>
     <string name="allow_restore_button_label" msgid="3081286752277127827">"Ma’lumotlarimni tiklash"</string>
diff --git a/packages/CaptivePortalLogin/res/values-af/strings.xml b/packages/CaptivePortalLogin/res/values-af/strings.xml
index f36746a..0c48b76 100644
--- a/packages/CaptivePortalLogin/res/values-af/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-af/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Gebruik hierdie netwerk nes dit is"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Moenie hierdie netwerk gebruik nie"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Meld by netwerk aan"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Die netwerk waarby jy probeer aansluit, het sekuriteitkwessies."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Byvoorbeeld, die aanmeldbladsy behoort dalk nie aan die organisasie wat gewys word nie."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Gaan in elk geval deur blaaier voort"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-am/strings.xml b/packages/CaptivePortalLogin/res/values-am/strings.xml
index d49e146..f126a86 100644
--- a/packages/CaptivePortalLogin/res/values-am/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-am/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"ለመቀላቀል እየሞከሩ ያሉት አውታረ መረብ የደህንነት ችግሮች አሉበት።"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ለምሳሌ፣ የመግቢያ ገጹ የሚታየው ድርጅት ላይሆን ይችላል።"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ለማንኛውም በአሳሽ በኩል ይቀጥሉ"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ar/strings.xml b/packages/CaptivePortalLogin/res/values-ar/strings.xml
index a5150fd..76ae5f1 100644
--- a/packages/CaptivePortalLogin/res/values-ar/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ar/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"الشبكة التي تحاول الانضمام إليها بها مشكلات أمنية."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"على سبيل المثال، قد لا تنتمي صفحة تسجيل الدخول إلى المنظمة المعروضة."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"المتابعة على أي حال عبر المتصفح"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ast-rES/strings.xml b/packages/CaptivePortalLogin/res/values-ast-rES/strings.xml
index 5030302..9d7deaf 100644
--- a/packages/CaptivePortalLogin/res/values-ast-rES/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ast-rES/strings.xml
@@ -4,4 +4,8 @@
   <string name="app_name">CaptivePortalLogin</string>
   <string name="action_use_network">Usar esta rede tal cual</string>
   <string name="action_do_not_use_network">Nun usar esta rede</string>
+  <string name="action_bar_label">Aniciar sesión na rede</string>
+  <string name="ssl_error_warning">La rede a la que intentes coneutate tien problemes de seguranza.</string>
+  <string name="ssl_error_example">Por exemplu, ye dable que la páxina d\'accesu nun perteneza a la organización que s\'amuesa.</string>
+  <string name="ssl_error_continue">Siguir de toes formes dende\'l restolador</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-az-rAZ/strings.xml b/packages/CaptivePortalLogin/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..f723384
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-az-rAZ/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string>
+    <string name="action_use_network" msgid="6076184727448466030">"Bu şəbəkəni olduğu kimi istifadə edin"</string>
+    <string name="action_do_not_use_network" msgid="4577366536956516683">"Bu şəbəkəni istifadə etməyin"</string>
+    <string name="action_bar_label" msgid="917235635415966620">"Şəbəkəyə daxil olun"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Qoşulmaq istədiyiniz şəbəkənin təhlükəsizlik problemləri var."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Məsələn, giriş səhifəsi göstərilən təşkilata aid olmaya bilər."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Hər bir halda brazuer ilə davam edin"</string>
+</resources>
diff --git a/packages/CaptivePortalLogin/res/values-be/strings.xml b/packages/CaptivePortalLogin/res/values-be/strings.xml
index 33dc69a..eff2d3e 100644
--- a/packages/CaptivePortalLogin/res/values-be/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-be/strings.xml
@@ -4,4 +4,5 @@
   <string name="app_name">CaptivePortalLogin</string>
   <string name="action_use_network">Выкарыстоўваць гэтую сетку</string>
   <string name="action_do_not_use_network">Не выкарыстоўваць гэтую сетку</string>
+  <string name="action_bar_label">Уваход да сеціва</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-bg/strings.xml b/packages/CaptivePortalLogin/res/values-bg/strings.xml
index 372ce76..a85191f 100644
--- a/packages/CaptivePortalLogin/res/values-bg/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-bg/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Мрежата, към която опитвате да се присъедините, има проблеми със сигурността."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Например страницата за вход може да не принадлежи на показаната организация."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Продължаване през браузър въпреки това"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml b/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml
index 9d13c2d..7e8f3b5 100644
--- a/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-bn-rBD/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"আপনি যে নেটওয়ার্কে যোগ দেওয়ার চেষ্টা করছেন তাতে নিরাপত্তার সমস্যা আছে।"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"উদাহরণস্বরূপ, লগইন পৃষ্ঠাটি প্রদর্শিত প্রতিষ্ঠানের অন্তর্গত নাও হতে পারে৷"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"যাই হোক না কেন ব্রাউজারের মাধ্যমে অবিরত রাখুন"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ca/strings.xml b/packages/CaptivePortalLogin/res/values-ca/strings.xml
index 5b35fcb..9d8f6cc 100644
--- a/packages/CaptivePortalLogin/res/values-ca/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ca/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Fes servir aquesta xarxa tal com està."</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"No facis servir aquesta xarxa."</string>
     <string name="action_bar_label" msgid="917235635415966620">"Inicia la sessió a la xarxa"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"La xarxa a què et vols connectar té problemes de seguretat."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Per exemple, la pàgina d\'inici de sessió podria no pertànyer a l\'organització que es mostra."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continua igualment mitjançant el navegador"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-cs/strings.xml b/packages/CaptivePortalLogin/res/values-cs/strings.xml
index f9309d0..aee71d9 100644
--- a/packages/CaptivePortalLogin/res/values-cs/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-cs/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Použít tuto síť tak, jak je"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Tuto síť nepoužívat"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Přihlásit se k síti"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Síť, ke které se pokoušíte připojit, má bezpečnostní problémy."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Například přihlašovací stránka nemusí patřit do zobrazované organizace."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Přesto pokračovat prostřednictvím prohlížeče"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-da/strings.xml b/packages/CaptivePortalLogin/res/values-da/strings.xml
index 0b24ea8..712d9a1 100644
--- a/packages/CaptivePortalLogin/res/values-da/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-da/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Brug dette netværk, som det er"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Brug ikke dette netværk"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Log ind på netværk"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Der er sikkerhedsproblemer på det netværk, du forsøger at logge ind på."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Det er f.eks. ikke sikkert, at loginsiden tilhører den anførte organisation."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Fortsæt alligevel via browseren"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-de/strings.xml b/packages/CaptivePortalLogin/res/values-de/strings.xml
index ac796da..fd2058d 100644
--- a/packages/CaptivePortalLogin/res/values-de/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-de/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Dieses Netzwerk im Istzustand verwenden"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Dieses Netzwerk nicht verwenden"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Im Netzwerk anmelden"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Im Netzwerk, zu dem Sie eine Verbindung herstellen möchten, liegen Sicherheitsprobleme vor."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Beispiel: Die Log-in-Seite gehört möglicherweise nicht zur angezeigten Organisation."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Trotzdem in einem Browser fortfahren"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-el/strings.xml b/packages/CaptivePortalLogin/res/values-el/strings.xml
index 2a67af5..3e8ea44 100644
--- a/packages/CaptivePortalLogin/res/values-el/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-el/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Παρουσιάζονται προβλήματα ασφάλειας στο δίκτυο στο οποίο προσπαθείτε να συνδεθείτε."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Για παράδειγμα, η σελίδα σύνδεσης ενδέχεται να μην ανήκει στον οργανισμό που εμφανίζεται."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Συνέχεια ούτως ή άλλως μέσω του προγράμματος περιήγησης"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-en-rAU/strings.xml b/packages/CaptivePortalLogin/res/values-en-rAU/strings.xml
index c1c03f8..7d599e7 100644
--- a/packages/CaptivePortalLogin/res/values-en-rAU/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-en-rAU/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Use this network as is"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Do not use this network"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Sign in to network"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"The network that you’re trying to join has security issues."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"For example, the login page might not belong to the organisation shown."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continue anyway via browser"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-en-rGB/strings.xml b/packages/CaptivePortalLogin/res/values-en-rGB/strings.xml
index c1c03f8..7d599e7 100644
--- a/packages/CaptivePortalLogin/res/values-en-rGB/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-en-rGB/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Use this network as is"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Do not use this network"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Sign in to network"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"The network that you’re trying to join has security issues."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"For example, the login page might not belong to the organisation shown."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continue anyway via browser"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-en-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-en-rIN/strings.xml
index c1c03f8..7d599e7 100644
--- a/packages/CaptivePortalLogin/res/values-en-rIN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-en-rIN/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Use this network as is"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Do not use this network"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Sign in to network"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"The network that you’re trying to join has security issues."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"For example, the login page might not belong to the organisation shown."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continue anyway via browser"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-es-rUS/strings.xml b/packages/CaptivePortalLogin/res/values-es-rUS/strings.xml
index 6c116f9..55e06ab 100644
--- a/packages/CaptivePortalLogin/res/values-es-rUS/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-es-rUS/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Usar esta red como está"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"No usar esta red"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Acceder a la red"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"La red a la que intentas conectarte tiene problemas de seguridad."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Por ejemplo, es posible que la página de acceso no pertenezca a la organización que aparece."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuar de todos modos desde el navegador"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-es/strings.xml b/packages/CaptivePortalLogin/res/values-es/strings.xml
index 63ce6e3..c7e2d0b 100644
--- a/packages/CaptivePortalLogin/res/values-es/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-es/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Utilizar esta red tal cual"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"No utilizar esta red"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Iniciar sesión en la red"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"La red a la que intentas unirte tiene problemas de seguridad."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Por ejemplo, es posible que la página de inicio de sesión no pertenezca a la organización mostrada."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuar de todos modos a través del navegador"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-et-rEE/strings.xml b/packages/CaptivePortalLogin/res/values-et-rEE/strings.xml
index 306e332..768a5ec 100644
--- a/packages/CaptivePortalLogin/res/values-et-rEE/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-et-rEE/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Kasuta seda võrku olemasoleval kujul"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ära kasuta seda võrku"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Logi võrku sisse"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Võrgul, millega üritate ühenduse luua, on turvaprobleeme."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Näiteks ei pruugi sisselogimisleht kuuluda kuvatavale organisatsioonile."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Jätka siiski brauseris"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-eu-rES/strings.xml b/packages/CaptivePortalLogin/res/values-eu-rES/strings.xml
index ed657aa..a46768f 100644
--- a/packages/CaptivePortalLogin/res/values-eu-rES/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-eu-rES/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Erabili sare hau bere horretan"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ez erabili sare hau"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Hasi saioa sarean"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Erabili nahi duzun sareak segurtasun-arazoak ditu."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Adibidez, baliteke saioa hasteko orria adierazitako erakundearena ez izatea."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Jarraitu arakatzailearen bidez, halere"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-fa/strings.xml b/packages/CaptivePortalLogin/res/values-fa/strings.xml
index b57e692..9408e9b 100644
--- a/packages/CaptivePortalLogin/res/values-fa/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-fa/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"شبکه‌ای که می‌خواهید به آن بپیوندید مشکلات امنیتی دارد."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"به عنوان مثال، صفحه ورود به سیستم ممکن است متعلق به سازمان نشان داده شده نباشد."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"در هر صورت از طریق مرورگر ادامه یابد"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-fi/strings.xml b/packages/CaptivePortalLogin/res/values-fi/strings.xml
index 1d48d60..4e6e526 100644
--- a/packages/CaptivePortalLogin/res/values-fi/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-fi/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Käytä tätä verkkoa sellaisenaan"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Älä käytä tätä verkkoa"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Kirjaudu verkkoon"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Verkossa, johon yrität muodostaa yhteyttä, on turvallisuusongelmia."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Kirjautumissivu ei välttämättä kuulu näytetylle organisaatiolle."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Jatka silti selaimen kautta."</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-fr-rCA/strings.xml b/packages/CaptivePortalLogin/res/values-fr-rCA/strings.xml
index 535a9cf..7cbfd0a 100644
--- a/packages/CaptivePortalLogin/res/values-fr-rCA/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-fr-rCA/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Utiliser ce réseau tel quel"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ne pas utiliser ce réseau"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Connectez-vous au réseau"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Le réseau que vous essayez de rejoindre présente des problèmes de sécurité."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Par exemple, la page de connexion pourrait ne pas appartenir à l\'organisation représentée."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuer quand même dans un navigateur"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-fr/strings.xml b/packages/CaptivePortalLogin/res/values-fr/strings.xml
index d323b28..d90f530 100644
--- a/packages/CaptivePortalLogin/res/values-fr/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-fr/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Utiliser ce réseau tel quel"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ne pas utiliser ce réseau"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Se connecter au réseau"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Le réseau que vous essayez de rejoindre présente des problèmes de sécurité."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Par exemple, la page de connexion peut ne pas appartenir à l\'organisation représentée."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuer quand même dans le navigateur"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-gl-rES/strings.xml b/packages/CaptivePortalLogin/res/values-gl-rES/strings.xml
index a5a603f..10f1f9d 100644
--- a/packages/CaptivePortalLogin/res/values-gl-rES/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-gl-rES/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Utilizar esta rede tal como está"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Non utilizar esta rede"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Inicia sesión na rede"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"A rede á que tentas unirte ten problemas de seguranza."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Por exemplo, é posible que a páxina de inicio de sesión non pertenza á organización que se mostra."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuar igualmente co navegador"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-gu-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-gu-rIN/strings.xml
index 1063c0c..8214865 100644
--- a/packages/CaptivePortalLogin/res/values-gu-rIN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-gu-rIN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"તમે જોડાવાનો પ્રયાસ કરી રહ્યાં છો તે નેટવર્કમાં સુરક્ષા સમસ્યાઓ છે."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ઉદાહરણ તરીકે, લોગિન પૃષ્ઠ દર્શાવેલ સંસ્થાનું હોઈ શકતું નથી."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"બ્રાઉઝર મારફતે કોઈપણ રીતે ચાલુ રાખો"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-hi/strings.xml b/packages/CaptivePortalLogin/res/values-hi/strings.xml
index 013f511..05fb4f4 100644
--- a/packages/CaptivePortalLogin/res/values-hi/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-hi/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"आप जिस नेटवर्क में शामिल होने का प्रयास कर रहे हैं उसमें सुरक्षा समस्‍याएं हैं."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"उदाहरण के लिए, हो सकता है कि लॉगिन पृष्‍ठ दिखाए गए संगठन से संबद्ध ना हो."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ब्राउज़र के द्वारा फिर जारी रखें"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-hr/strings.xml b/packages/CaptivePortalLogin/res/values-hr/strings.xml
index f2b2e75..c252b37 100644
--- a/packages/CaptivePortalLogin/res/values-hr/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-hr/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Upotrebljavaj ovu mrežu u zatečenom stanju"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ne upotrebljavaj ovu mrežu"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Prijava na mrežu"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Mreža kojoj se pokušavate pridružiti ima sigurnosne poteškoće."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Na primjer, stranica za prijavu možda ne pripada prikazanoj organizaciji."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Ipak nastavi putem preglednika"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-hu/strings.xml b/packages/CaptivePortalLogin/res/values-hu/strings.xml
index 26d3c87..1f08c52 100644
--- a/packages/CaptivePortalLogin/res/values-hu/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-hu/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Hálózat használata jelen állapotában"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ne használja ezt a hálózatot"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Bejelentkezés a hálózatba"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Biztonsági problémák vannak azzal a hálózattal, amelyhez csatlakozni szeretne."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Például lehet, hogy a bejelentkezési oldal nem a megjelenített szervezethez tartozik."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Folytatás ennek ellenére böngészőn keresztül"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-hy-rAM/strings.xml b/packages/CaptivePortalLogin/res/values-hy-rAM/strings.xml
index 570b927..cf79b8c 100644
--- a/packages/CaptivePortalLogin/res/values-hy-rAM/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-hy-rAM/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Ցանցը, որին փորձում եք միանալ, անվտանգության խնդիրներ ունի:"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Օրինակ՝ մուտքի էջը կարող է ցուցադրված կազմակերպության էջը չլինել:"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Շարունակել այնուամենայնիվ դիտարկիչի միջոցով"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-in/strings.xml b/packages/CaptivePortalLogin/res/values-in/strings.xml
index 196d327..ff957c4 100644
--- a/packages/CaptivePortalLogin/res/values-in/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-in/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Gunakan jaringan ini sebagaimana adanya"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Jangan gunakan jaringan ini"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Masuk ke jaringan"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Jaringan yang ingin Anda masuki mengalami masalah keamanan."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Misalnya, laman masuk mungkin bukan milik organisasi yang ditampilkan."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Tetap lanjutkan melalui browser"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-is-rIS/strings.xml b/packages/CaptivePortalLogin/res/values-is-rIS/strings.xml
index 27dc12b..8c886d2 100644
--- a/packages/CaptivePortalLogin/res/values-is-rIS/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-is-rIS/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Nota þetta net óbreytt"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ekki nota þetta net"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Skrá inn á net"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Öryggisvandamál eru á netinu sem þú ert að reyna að tengjast."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Til dæmis getur verið að innskráningarsíðan tilheyri ekki fyrirtækinu sem birtist."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Halda samt áfram í vafra"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-it/strings.xml b/packages/CaptivePortalLogin/res/values-it/strings.xml
index fc4fcd9..23ed415 100644
--- a/packages/CaptivePortalLogin/res/values-it/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-it/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Utilizza questa rete così com\'è"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Non utilizzare questa rete"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Accedi alla rete"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"La rete a cui stai tentando di accedere presenta problemi di sicurezza."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Ad esempio, la pagina di accesso potrebbe non appartenere all\'organizzazione indicata."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continua comunque dal browser"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-iw/strings.xml b/packages/CaptivePortalLogin/res/values-iw/strings.xml
index c88dd0d..fe7333f 100644
--- a/packages/CaptivePortalLogin/res/values-iw/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-iw/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"יש בעיות אבטחה ברשת שאליה אתה מנסה להתחבר."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"לדוגמה, ייתכן שדף ההתחברות אינו שייך לארגון המוצג."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"המשך בכל זאת באמצעות דפדפן"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ja/strings.xml b/packages/CaptivePortalLogin/res/values-ja/strings.xml
index 15bbd4c..b369b65 100644
--- a/packages/CaptivePortalLogin/res/values-ja/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ja/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"接続しようとしているネットワークにセキュリティの問題があります。"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"たとえば、ログインページが表示されている組織に属していない可能性があります。"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ブラウザから続行"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ka-rGE/strings.xml b/packages/CaptivePortalLogin/res/values-ka-rGE/strings.xml
index 5918628..2913178 100644
--- a/packages/CaptivePortalLogin/res/values-ka-rGE/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ka-rGE/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"ქსელს, რომელზედაც მიერთებას ცდილობთ, უსაფრთხოების პრობლემები აქვს."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"მაგალითად, სისტემაში შესვლის გვერდი შეიძლება არ ეკუთვნოდეს ნაჩვენებ ორგანიზაციას."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ბრაუზერში გაგრძელება"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-kk-rKZ/strings.xml b/packages/CaptivePortalLogin/res/values-kk-rKZ/strings.xml
index 5e876a4..d1fb849 100644
--- a/packages/CaptivePortalLogin/res/values-kk-rKZ/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-kk-rKZ/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Қосылайын деп жатқан желіңіз қауіпсіз болуы мүмкін."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Мысалы, кіру беті көрсетілген ұйымға тиесілі болмауы мүмкін."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Бәрібір браузер арқылы жалғастыру"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-km-rKH/strings.xml b/packages/CaptivePortalLogin/res/values-km-rKH/strings.xml
index ae32c76..32098ae 100644
--- a/packages/CaptivePortalLogin/res/values-km-rKH/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-km-rKH/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"បណ្តាញដែលអ្នកកំពុងព្យាយាមចូលមានបញ្ហាសុវត្ថិភាព។"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ឧបករណ៍៖ ទំព័រចូលនេះអាចនឹងមិនមែនជាកម្មសិទ្ធិរបស់ស្ថាប័នដែលបានបង្ហាញនេះទេ។"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"យ៉ាងណាក៏ដោយនៅតែបន្តតាមរយៈកម្មវិធីរុករក"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-kn-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-kn-rIN/strings.xml
index af7eeaf..b3f937a 100644
--- a/packages/CaptivePortalLogin/res/values-kn-rIN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-kn-rIN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"ನೀವು ಸೇರಬೇಕೆಂದಿರುವ ನೆಟ್‌ವರ್ಕ್ ಭದ್ರತೆ ಸಮಸ್ಯೆಗಳನ್ನು ಹೊಂದಿದೆ."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ಉದಾಹರಣೆಗೆ, ಲಾಗಿನ್ ಪುಟವು ತೋರಿಸಲಾಗಿರುವ ಸಂಸ್ಥೆಗೆ ಸಂಬಂಧಿಸಿರುವುದಿಲ್ಲ."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ಹೇಗಾದರೂ ಬ್ರೌಸರ್ ಮೂಲಕ ಮುಂದುವರಿಸಿ"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ko/strings.xml b/packages/CaptivePortalLogin/res/values-ko/strings.xml
index c6c5239..9756042 100644
--- a/packages/CaptivePortalLogin/res/values-ko/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ko/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"가입하려는 네트워크에 보안 문제가 있습니다."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"예를 들어 로그인 페이지가 표시된 조직에 속하지 않을 수 있습니다."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"브라우저를 통해 계속하기"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ky-rKG/strings.xml b/packages/CaptivePortalLogin/res/values-ky-rKG/strings.xml
index c77e47c..ab1c7ff 100644
--- a/packages/CaptivePortalLogin/res/values-ky-rKG/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ky-rKG/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Кошулайын деген тармагыңызда коопсуздук көйгөйлөрү бар."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Мисалы, каттоо эсебине кирүү баракчасы көрсөтүлгөн уюмга таандык эмес болушу мүмкүн."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Баары бир серепчи аркылуу улантуу"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-lo-rLA/strings.xml b/packages/CaptivePortalLogin/res/values-lo-rLA/strings.xml
index 0cd0f4e..c50aaa9 100644
--- a/packages/CaptivePortalLogin/res/values-lo-rLA/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-lo-rLA/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"ເຄືອ​ຂ່າຍ​ທີ່​ທ່ານ​ກຳ​ລັງ​ເຂົ້າ​ຮ່ວມ​ມີ​ບັນ​ຫາ​ຄວາມ​ປອດ​ໄພ."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ຕົວ​ຢ່າງ, ໜ້າ​ລົງ​ຊື່​ເຂົ້າ​ໃຊ້​ອາດ​ຈະ​ບໍ່​ເປັນ​ຂອງ​ອົງ​ການ​ທີ່​ສະ​ແດງ​ຂຶ້ນ."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ແນວ​ໃດ​ກໍ່​ສືບ​ຕໍ່​ຜ່ານບ​ຣາວ​ເຊີ"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-lt/strings.xml b/packages/CaptivePortalLogin/res/values-lt/strings.xml
index 7ed7c5f..6cdd5ba 100644
--- a/packages/CaptivePortalLogin/res/values-lt/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-lt/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Naudoti šį tinklą tokį, koks yra"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Nenaudoti šio tinklo"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Prisijungti prie tinklo"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Kilo tinklo, prie kurio bandote prisijungti, problemų."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Pavyzdžiui, prisijungimo puslapis gali nepriklausyti rodomai organizacijai."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Vis tiek tęsti naudojant naršyklę"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-lv/strings.xml b/packages/CaptivePortalLogin/res/values-lv/strings.xml
index bb8b00b..b33293f 100644
--- a/packages/CaptivePortalLogin/res/values-lv/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-lv/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Izmantot tīklu ar pašreizējiem iestatījumiem"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Neizmantot šo tīklu"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Pierakstīties tīklā"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Tīklam, kuram mēģināt pievienoties, ir drošības problēmas."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Piemēram, pieteikšanās lapa, iespējams, nepieder norādītajai organizācijai."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Tik un tā turpināt, izmantojot pārlūkprogrammu"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-mk-rMK/strings.xml b/packages/CaptivePortalLogin/res/values-mk-rMK/strings.xml
index db0dd17..63428e7 100644
--- a/packages/CaptivePortalLogin/res/values-mk-rMK/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-mk-rMK/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Мрежата на која се обидувате да се придружите има проблеми со безбедноста."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"На пример, страницата за најавување може да не припаѓа на организацијата што е прикажана."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Сепак продолжи преку прелистувач"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ml-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-ml-rIN/strings.xml
index bd1ac2d..911b99882 100644
--- a/packages/CaptivePortalLogin/res/values-ml-rIN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ml-rIN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"നിങ്ങൾ ചേരാൻ ശ്രമിക്കുന്ന നെറ്റ്‌വർക്കിൽ സുരക്ഷാ പ്രശ്‌നങ്ങളുണ്ടായിരിക്കാം."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ഉദാഹരണത്തിന്, കാണിച്ചിരിക്കുന്ന ഓർഗനൈസേഷന്റേതായിരിക്കില്ല ലോഗിൻ പേജ്."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"എന്തായാലും ബ്രൗസർ വഴി തുടരുക"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-mn-rMN/strings.xml b/packages/CaptivePortalLogin/res/values-mn-rMN/strings.xml
index ad9f68b..2489e9c 100644
--- a/packages/CaptivePortalLogin/res/values-mn-rMN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-mn-rMN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Таны нэгдэх гэж буй сүлжээ аюулгүй байдлын асуудалтай байна."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Жишээлбэл нэвтрэх хуудас нь харагдах байгууллагынх биш байж болзошгүй."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Ямартаа ч хөтчөөр үргэлжлүүлэх"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-mr-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-mr-rIN/strings.xml
index 6ed7679..9521c8d 100644
--- a/packages/CaptivePortalLogin/res/values-mr-rIN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-mr-rIN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"ज्या नेटवर्कमध्‍ये आपण सामील होण्याचा प्रयत्न करीत आहात त्यात सुरक्षितता समस्या आहेत."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"उदाहरणार्थ, लॉगिन पृष्‍ठ कदाचित दर्शविलेल्या संस्थेच्या मालकीचे नसावे."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ब्राउझरद्वारे तरीही सुरु ठेवा"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ms-rMY/strings.xml b/packages/CaptivePortalLogin/res/values-ms-rMY/strings.xml
index 91b2070..829c55a 100644
--- a/packages/CaptivePortalLogin/res/values-ms-rMY/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ms-rMY/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Gunakan rangkaian ini"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Jangan gunakan rangkaian ini"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Log masuk ke rangkaian"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Rangkaian yang anda cuba sertai mempunyai isu keselamatan."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Contohnya, halaman log masuk mungkin bukan milik organisasi yang ditunjukkan."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Teruskan juga melalui penyemak imbas"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml b/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml
index b82ced3..41d3d79 100644
--- a/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-my-rMM/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"သင်ချိတ်ဆက်ရန် ကြိုးစားနေသည့် ကွန်ရက်သည် လုံခြုံရေးပြဿနာ ရှိနေသည်။"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ဥပမာ၊ ဝင်ရောက်ရန် စာမျက်နှာသည် ပြသထားသည့် အဖွဲ့အစည်းနှင့် သက်ဆိုင်မှု မရှိနိုင်ပါ။"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ဘရောက်ဇာမှတစ်ဆင့် ရှေ့ဆက်ရန်"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-nb/strings.xml b/packages/CaptivePortalLogin/res/values-nb/strings.xml
index 9e2664f..b9d3349 100644
--- a/packages/CaptivePortalLogin/res/values-nb/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-nb/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Bruk dette nettverket som det er"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ikke bruk dette nettverket"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Logg på nettverk"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Nettverket du prøver å logge på, har sikkerhetsproblemer."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Det er for eksempel mulig at påloggingssiden kanskje ikke tilhører organisasjonen som vises."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Fortsett likevel via nettleseren"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ne-rNP/strings.xml b/packages/CaptivePortalLogin/res/values-ne-rNP/strings.xml
index ccae893..02c2cf3 100644
--- a/packages/CaptivePortalLogin/res/values-ne-rNP/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ne-rNP/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"तपाईँले सामेल हुन प्रयास गरिरहनु भएको नेटवर्कमा सुरक्षा मुद्दाहरू छन्।"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"उदाहरणका लागि, लग इन पृष्ठ देखाइएको संस्थाको नहुन सक्छ।"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"जे भए पनि ब्राउजर मार्फत जारी राख्नुहोस्"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-nl/strings.xml b/packages/CaptivePortalLogin/res/values-nl/strings.xml
index e4ecb00..af1de0a 100644
--- a/packages/CaptivePortalLogin/res/values-nl/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-nl/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Dit netwerk in de huidige staat gebruiken"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Dit netwerk niet gebruiken"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Inloggen bij netwerk"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Het netwerk waarmee u verbinding probeert te maken, heeft beveiligingsproblemen."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Zo hoort de weergegeven inlogpagina misschien niet bij de weergegeven organisatie."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Toch doorgaan via browser"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-pa-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-pa-rIN/strings.xml
index 343de14..ef64d79 100644
--- a/packages/CaptivePortalLogin/res/values-pa-rIN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-pa-rIN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"ਤੁਹਾਡੇ ਦੁਆਰਾ ਸ਼ਾਮਿਲ ਹੋਣ ਦੀ ਕੋਸ਼ਿਸ਼ ਕੀਤੇ ਜਾ ਰਹੇ ਨੈੱਟਵਰਕ ਵਿੱਚ ਸੁਰੱਖਿਆ ਸੰਬੰਧੀ ਸਮੱਸਿਆਵਾਂ ਹਨ।"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ਉਦਾਹਰਣ ਵੱਜੋਂ, ਲੌਗਇਨ ਪੰਨਾ ਦਿਖਾਈ ਗਈ ਸੰਸਥਾ ਨਾਲ ਸੰਬੰਧਿਤ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ।"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ਬ੍ਰਾਉਜ਼ਰ ਰਾਹੀਂ ਫਿਰ ਵੀ ਜਾਰੀ ਰੱਖੋ"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-pl/strings.xml b/packages/CaptivePortalLogin/res/values-pl/strings.xml
index 479301c..ee39fe5 100644
--- a/packages/CaptivePortalLogin/res/values-pl/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-pl/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Używaj tej sieci tak jak jest"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Nie używaj tej sieci"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Zaloguj się do sieci"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"W sieci, z którą próbujesz się połączyć, występują problemy z zabezpieczeniami."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Na przykład strona logowania może nie należeć do wyświetlanej organizacji."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Kontynuuj mimo to w przeglądarce"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-pt-rBR/strings.xml b/packages/CaptivePortalLogin/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e1d420f
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-pt-rBR/strings.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string>
+    <string name="action_use_network" msgid="6076184727448466030">"Usar esta rede como está"</string>
+    <string name="action_do_not_use_network" msgid="4577366536956516683">"Não usar esta rede"</string>
+    <string name="action_bar_label" msgid="917235635415966620">"Fazer login na rede"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"A rede à qual você está tentando se conectar tem problemas de segurança."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Por exemplo, a página de login pode não pertencer à organização mostrada."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuar mesmo assim pelo navegador"</string>
+</resources>
diff --git a/packages/CaptivePortalLogin/res/values-pt-rPT/strings.xml b/packages/CaptivePortalLogin/res/values-pt-rPT/strings.xml
index 241d977..54e2a8b 100644
--- a/packages/CaptivePortalLogin/res/values-pt-rPT/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-pt-rPT/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Utilizar esta rede como está"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Não utilizar esta rede"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Início de sessão na rede"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"A rede à qual está a tentar aceder tem problemas de segurança."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Por exemplo, a página de início de sessão pode não pertencer à entidade apresentada."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuar mesmo assim através do navegador"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-pt/strings.xml b/packages/CaptivePortalLogin/res/values-pt/strings.xml
index b1e6ac9..e1d420f 100644
--- a/packages/CaptivePortalLogin/res/values-pt/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-pt/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Usar esta rede como está"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Não usar esta rede"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Fazer login na rede"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"A rede à qual você está tentando se conectar tem problemas de segurança."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Por exemplo, a página de login pode não pertencer à organização mostrada."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuar mesmo assim pelo navegador"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ro/strings.xml b/packages/CaptivePortalLogin/res/values-ro/strings.xml
index 36a1516..3d69e64 100644
--- a/packages/CaptivePortalLogin/res/values-ro/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ro/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Utilizați această rețea în starea actuală"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Nu utilizați această rețea"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Conectați-vă la rețea"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Rețeaua la care încercați să vă conectați are probleme de securitate."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"De exemplu, este posibil ca pagina de conectare să nu aparțină organizației afișate."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Continuați oricum prin browser"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ru/strings.xml b/packages/CaptivePortalLogin/res/values-ru/strings.xml
index 5cb1d76..c45a8c1 100644
--- a/packages/CaptivePortalLogin/res/values-ru/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ru/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Сеть, к которой вы хотите подключиться, небезопасна."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Например, страница входа в аккаунт может быть фиктивной."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Игнорировать и открыть браузер"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-si-rLK/strings.xml b/packages/CaptivePortalLogin/res/values-si-rLK/strings.xml
index 66efc2e..61fd2b8 100644
--- a/packages/CaptivePortalLogin/res/values-si-rLK/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-si-rLK/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"ඔබ සම්බන්ධ වීමට උත්සහ කරන ජාලයේ ආරක්ෂක ගැටළු ඇත."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"උදාහරණයක් ලෙස, පුරනය වන පිටුව පෙන්වා ඇති සංවිධානයට අයිති නැති විය හැක."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"කෙසේ වුවත් බ්‍රවුසරය හරහා ඉදිරියට යන්න"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-sk/strings.xml b/packages/CaptivePortalLogin/res/values-sk/strings.xml
index 560bdc4..76af0ca 100644
--- a/packages/CaptivePortalLogin/res/values-sk/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-sk/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Použiť túto sieť tak, ako je"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Túto sieť nepoužívať"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Prihlásiť sa do siete"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Sieť, ku ktorej sa pokúšate pripojiť, má problémy so zabezpečením"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Napríklad prihlasovacia stránka nemusí patriť uvedenej organizácii."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Pokračovať pomocou prehliadača"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-sl/strings.xml b/packages/CaptivePortalLogin/res/values-sl/strings.xml
index e633970..158a4d3 100644
--- a/packages/CaptivePortalLogin/res/values-sl/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-sl/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Uporabljajte to omrežje, »kakršno je«"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ne uporabljajte tega omrežja"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Prijavite se v omrežje"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Omrežje, ki se mu poskušate pridružiti, ima varnostne težave."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Stran za prijavo na primer morda ne pripada prikazani organizaciji."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Vseeno nadaljuj v brskalniku"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-sq-rAL/strings.xml b/packages/CaptivePortalLogin/res/values-sq-rAL/strings.xml
index f6c4f15..674b809 100644
--- a/packages/CaptivePortalLogin/res/values-sq-rAL/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-sq-rAL/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Përdore këtë rrjet siç është"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Mos e përdor këtë rrjet"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Identifikohu në rrjet"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Rrjeti në të cilin po përpiqesh të bashkohesh ka probleme sigurie."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"për shembull, faqja e identifikimit mund të mos i përkasë organizatës së shfaqur."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Vazhdo gjithsesi nëpërmjet shfletuesit"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-sr/strings.xml b/packages/CaptivePortalLogin/res/values-sr/strings.xml
index 67f3b05..05c1d50 100644
--- a/packages/CaptivePortalLogin/res/values-sr/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-sr/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"Мрежа којој покушавате да се придружите има безбедносних проблема."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"На пример, страница за пријављивање можда не припада приказаној организацији."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Ипак настави преко прегледача"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-sv/strings.xml b/packages/CaptivePortalLogin/res/values-sv/strings.xml
index 1de6630..700713a 100644
--- a/packages/CaptivePortalLogin/res/values-sv/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-sv/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Använd det här nätverket som det är"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Använd inte det här nätverket"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Logga in på nätverket"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Nätverket du försöker ansluta till har säkerhetsproblem."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Det kan t.ex. hända att inloggningssidan inte tillhör den organisation som visas."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Fortsätt ändå via webbläsaren"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-sw/strings.xml b/packages/CaptivePortalLogin/res/values-sw/strings.xml
index d4d22a6..d791955 100644
--- a/packages/CaptivePortalLogin/res/values-sw/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-sw/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Tumia mtandao huu jinsi ulivyo"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Usitumie mtandao huu"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Ingia katika mtandao"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Mtandao unaojaribu kujiunga nao una matatizo ya usalama."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Kwa mfano, ukurasa wa kuingia katika akaunti unaweza usiwe unamilikiwa na shirika lililoonyeshwa."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Endelea hata hivyo kupitia kivinjari"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ta-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-ta-rIN/strings.xml
index b695c6c..038f05a 100644
--- a/packages/CaptivePortalLogin/res/values-ta-rIN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ta-rIN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"நீங்கள் சேர முயற்சிக்கும் நெட்வொர்க்கில் பாதுகாப்புச் சிக்கல்கள் உள்ளன."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"எடுத்துக்காட்டாக, உள்நுழைவுப் பக்கமானது காட்டப்படும் அமைப்பிற்குச் சொந்தமானதாக இல்லாமல் இருக்கலாம்."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"பரவாயில்லை, உலாவி வழியாகத் தொடரவும்"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-te-rIN/strings.xml b/packages/CaptivePortalLogin/res/values-te-rIN/strings.xml
index 798b16d..5d85568 100644
--- a/packages/CaptivePortalLogin/res/values-te-rIN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-te-rIN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"మీరు చేరడానికి ప్రయత్నిస్తున్న నెట్‌వర్క్ భద్రతా సమస్యలను కలిగి ఉంది."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ఉదాహరణకు, లాగిన్ పేజీ చూపిన సంస్థకు చెందినది కాకపోవచ్చు."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ఏదేమైనా బ్రౌజర్ ద్వారా కొనసాగించు"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-th/strings.xml b/packages/CaptivePortalLogin/res/values-th/strings.xml
index 1bfe45d..cc3ae87 100644
--- a/packages/CaptivePortalLogin/res/values-th/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-th/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"เครือข่ายที่คุณพยายามเข้าร่วมมีปัญหาด้านความปลอดภัย"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"ตัวอย่างเช่น หน้าเข้าสู่ระบบอาจไม่ใช่ขององค์กรที่แสดงไว้"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"ดำเนินการต่อผ่านเบราว์เซอร์"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-tl/strings.xml b/packages/CaptivePortalLogin/res/values-tl/strings.xml
index b16e2c1..bad5a1a 100644
--- a/packages/CaptivePortalLogin/res/values-tl/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-tl/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Gamitin ang network na ito nang walang pagbabago"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Huwag gamitin ang network na ito"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Mag-sign in sa network"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"May mga isyu sa seguridad ang network kung saan mo sinusubukang sumali."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Halimbawa, maaaring hindi sa organisasyong ipinapakita ang page sa pag-log in."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Magpatuloy pa rin sa pamamagitan ng browser"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-tr/strings.xml b/packages/CaptivePortalLogin/res/values-tr/strings.xml
index bd4d0ec..50ea806 100644
--- a/packages/CaptivePortalLogin/res/values-tr/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-tr/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Bu ağı olduğu gibi kullan"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Bu ağı kullanma"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Ağda oturum açın"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Katılmaya çalıştığınız ağda güvenlik sorunları var."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Örneğin, giriş sayfası, gösterilen kuruluşa ait olmayabilir."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Yine de tarayıcıyla devam et"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ug/strings.xml b/packages/CaptivePortalLogin/res/values-ug/strings.xml
new file mode 100644
index 0000000..678798d
--- /dev/null
+++ b/packages/CaptivePortalLogin/res/values-ug/strings.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="app_name">CaptivePortalLogin</string>
+  <string name="action_use_network">بۇ تورنى ئىشلىتىش ئۇسۇلى</string>
+  <string name="action_do_not_use_network">بۇ تورنى ئىشلەتمەڭ</string>
+  <string name="action_bar_label">تورغا تىزىمغا كىرىش</string>
+</resources>
diff --git a/packages/CaptivePortalLogin/res/values-uk/strings.xml b/packages/CaptivePortalLogin/res/values-uk/strings.xml
index a39607c..5ef5426 100644
--- a/packages/CaptivePortalLogin/res/values-uk/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-uk/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"У мережі, до якої ви намагаєтеся під’єднатись, є проблеми з безпекою."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Наприклад, сторінка входу може не належати вказаній організації."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Усе одно продовжити у веб-переглядачі"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-ur-rPK/strings.xml b/packages/CaptivePortalLogin/res/values-ur-rPK/strings.xml
index a5ba5cb..7da543f 100644
--- a/packages/CaptivePortalLogin/res/values-ur-rPK/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-ur-rPK/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"جس نیٹ ورک میں آپ شامل ہونے کی کوشش کر رہے ہیں اس میں سیکیورٹی کے مسائل ہیں۔"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"مثال کے طور پر ہو سکتا ہے کہ لاگ ان صفحہ دکھائی گئی تنظیم سے تعلق نہ رکھتا ہو۔"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"براؤزر کے ذریعے بہرحال جاری رکھیں"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-uz-rUZ/strings.xml b/packages/CaptivePortalLogin/res/values-uz-rUZ/strings.xml
index 11e9648..0cbef0a 100644
--- a/packages/CaptivePortalLogin/res/values-uz-rUZ/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-uz-rUZ/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Ushbu tarmoqdan o‘z holicha foydalanilsin"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ushbu tarmoqdan foydalanilmasin"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Tarmoqqa kirish"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Siz ulanmoqchi bo‘lgan tarmoqda xavfsizlik bilan bog‘liq muammolar mavjud."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Masalan, tizimga kirish sahifasi ko‘rsatilgan tashkilotga tegishli bo‘lmasligi mumkin."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"E’tiborsiz qoldirilsin va brauzer ochilsin"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-vi/strings.xml b/packages/CaptivePortalLogin/res/values-vi/strings.xml
index 1a76ceb..a667283 100644
--- a/packages/CaptivePortalLogin/res/values-vi/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-vi/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Sử dụng mạng này"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Không sử dụng mạng này"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Đăng nhập vào mạng"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Mạng mà bạn đang cố gắng tham gia có vấn đề về bảo mật."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Ví dụ, trang đăng nhập có thể không thuộc về tổ chức được hiển thị."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Vẫn tiếp tục qua trình duyệt"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-zh-rCN/strings.xml b/packages/CaptivePortalLogin/res/values-zh-rCN/strings.xml
index 4de18b7..b832f6e 100644
--- a/packages/CaptivePortalLogin/res/values-zh-rCN/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-zh-rCN/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"您尝试加入的网络存在安全问题。"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"例如，登录页面可能并不属于页面上显示的单位。"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"仍然通过浏览器继续操作"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-zh-rHK/strings.xml b/packages/CaptivePortalLogin/res/values-zh-rHK/strings.xml
index 3d68c84..1232abb 100644
--- a/packages/CaptivePortalLogin/res/values-zh-rHK/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-zh-rHK/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"您正在嘗試加入的網絡有安全性問題。"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"例如，登入頁面並不屬於所顯示的機構。"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"透過瀏覽器繼續"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-zh-rTW/strings.xml b/packages/CaptivePortalLogin/res/values-zh-rTW/strings.xml
index 95a5639..65a1d35 100644
--- a/packages/CaptivePortalLogin/res/values-zh-rTW/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-zh-rTW/strings.xml
@@ -5,4 +5,7 @@
     <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="ssl_error_warning" msgid="6653188881418638872">"您嘗試加入的網路有安全問題。"</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"例如，登入網頁中顯示的機構可能並非該網頁實際隸屬的機構。"</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"透過瀏覽器繼續"</string>
 </resources>
diff --git a/packages/CaptivePortalLogin/res/values-zu/strings.xml b/packages/CaptivePortalLogin/res/values-zu/strings.xml
index aef043c..3320fd4 100644
--- a/packages/CaptivePortalLogin/res/values-zu/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-zu/strings.xml
@@ -5,4 +5,7 @@
     <string name="action_use_network" msgid="6076184727448466030">"Sebenzisa le nethiwekhi njengoba injalo"</string>
     <string name="action_do_not_use_network" msgid="4577366536956516683">"Ungasebenzisi le nethiwekhi"</string>
     <string name="action_bar_label" msgid="917235635415966620">"Ngena ngemvume kunethiwekhi"</string>
+    <string name="ssl_error_warning" msgid="6653188881418638872">"Inethiwekhi ozama ukuyijoyina inezinkinga zokuvikela."</string>
+    <string name="ssl_error_example" msgid="647898534624078900">"Isibonelo, ikhasi lokungena ngemvume kungenzeka lingelenhlangano ebonisiwe."</string>
+    <string name="ssl_error_continue" msgid="6492718244923937110">"Qhubeka noma kunjalo ngesiphequluli"</string>
 </resources>
diff --git a/packages/DefaultContainerService/res/values-as-rIN/strings.xml b/packages/DefaultContainerService/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-as-rIN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-ast-rES/strings.xml b/packages/DefaultContainerService/res/values-ast-rES/strings.xml
index 43defac..09c546f 100644
--- a/packages/DefaultContainerService/res/values-ast-rES/strings.xml
+++ b/packages/DefaultContainerService/res/values-ast-rES/strings.xml
@@ -19,5 +19,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
   <string name="service_name">Encontu d\'accesu a paquete</string>
 </resources>
diff --git a/packages/DefaultContainerService/res/values-be/strings.xml b/packages/DefaultContainerService/res/values-be/strings.xml
index 0bc61ed..25754a1 100644
--- a/packages/DefaultContainerService/res/values-be/strings.xml
+++ b/packages/DefaultContainerService/res/values-be/strings.xml
@@ -19,5 +19,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
   <string name="service_name">Памочнік доступу да пакетаў</string>
 </resources>
diff --git a/packages/DefaultContainerService/res/values-br-rFR/strings.xml b/packages/DefaultContainerService/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-br-rFR/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-bs-rBA/strings.xml b/packages/DefaultContainerService/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-bs-rBA/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-csb-rPL/strings.xml b/packages/DefaultContainerService/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-csb-rPL/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-cy/strings.xml b/packages/DefaultContainerService/res/values-cy/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-cy/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-en-rPT/strings.xml b/packages/DefaultContainerService/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-en-rPT/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-eo/strings.xml b/packages/DefaultContainerService/res/values-eo/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-eo/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-es-rCO/strings.xml b/packages/DefaultContainerService/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-es-rCO/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-es-rMX/strings.xml b/packages/DefaultContainerService/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-es-rMX/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-frp-rIT/strings.xml b/packages/DefaultContainerService/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-frp-rIT/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-fy-rNL/strings.xml b/packages/DefaultContainerService/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-fy-rNL/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-ga-rIE/strings.xml b/packages/DefaultContainerService/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-ga-rIE/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-gd-rGB/strings.xml b/packages/DefaultContainerService/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-gd-rGB/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-ku/strings.xml b/packages/DefaultContainerService/res/values-ku/strings.xml
index c535010..d526e17 100644
--- a/packages/DefaultContainerService/res/values-ku/strings.xml
+++ b/packages/DefaultContainerService/res/values-ku/strings.xml
@@ -19,5 +19,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
   <string name="service_name">یارمه‌تیده‌ری چوونه‌ژووره‌وه‌ی پاکێجه‌کان</string>
 </resources>
diff --git a/packages/DefaultContainerService/res/values-lb/strings.xml b/packages/DefaultContainerService/res/values-lb/strings.xml
index 37df97c..d2cebb7 100644
--- a/packages/DefaultContainerService/res/values-lb/strings.xml
+++ b/packages/DefaultContainerService/res/values-lb/strings.xml
@@ -19,5 +19,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
   <string name="service_name">Zougrëffshëllef fir Päck</string>
 </resources>
diff --git a/packages/DefaultContainerService/res/values-oc-rFR/strings.xml b/packages/DefaultContainerService/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-oc-rFR/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-or-rIN/strings.xml b/packages/DefaultContainerService/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..e75a0d0
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-or-rIN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2008, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
+</resources>
diff --git a/packages/DefaultContainerService/res/values-pt-rBR/strings.xml b/packages/DefaultContainerService/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..5fbd949
--- /dev/null
+++ b/packages/DefaultContainerService/res/values-pt-rBR/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2008, 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="service_name" msgid="4841491635055379553">"Assistente de pacote"</string>
+</resources>
diff --git a/packages/DefaultContainerService/res/values-pt-rPT/strings.xml b/packages/DefaultContainerService/res/values-pt-rPT/strings.xml
index 5c03669..8ea6a3a 100644
--- a/packages/DefaultContainerService/res/values-pt-rPT/strings.xml
+++ b/packages/DefaultContainerService/res/values-pt-rPT/strings.xml
@@ -20,5 +20,5 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="service_name" msgid="4841491635055379553">"Ajuda p/ aceder pacotes"</string>
+    <string name="service_name" msgid="4841491635055379553">"Ajuda p/ aceder a pacotes"</string>
 </resources>
diff --git a/packages/DefaultContainerService/res/values-ug/strings.xml b/packages/DefaultContainerService/res/values-ug/strings.xml
index cf93ddd..f9b6bc0 100644
--- a/packages/DefaultContainerService/res/values-ug/strings.xml
+++ b/packages/DefaultContainerService/res/values-ug/strings.xml
@@ -19,5 +19,6 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- service name [CHAR LIMIT=25]  -->
   <string name="service_name">بوغچا زىيارەت ياردەمچىسى</string>
 </resources>
diff --git a/packages/DocumentsUI/res/values-af/strings.xml b/packages/DocumentsUI/res/values-af/strings.xml
index 3f7571a..0608d27 100644
--- a/packages/DocumentsUI/res/values-af/strings.xml
+++ b/packages/DocumentsUI/res/values-af/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">"Dokumente"</string>
-    <string name="title_open" msgid="4353228937663917801">"Maak oop vanaf"</string>
+    <string name="title_open" msgid="4353228937663917801">"Maak oop vanuit"</string>
     <string name="title_save" msgid="2433679664882857999">"Stoor na"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Skep vouer"</string>
     <string name="menu_grid" msgid="6878021334497835259">"Roosteraansig"</string>
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Stoor"</string>
     <string name="menu_share" msgid="3075149983979628146">"Deel"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Vee uit"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Kies \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Kies almal"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Kies alles"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopieer na …"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Wys interne berging"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Wys SD-kaart"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Versteek SD-kaart"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Wys lêergrootte"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Versteek lêergrootte"</string>
+    <string name="button_select" msgid="527196987259139214">"Kies"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopieer"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> gekies"</string>
     <string name="sort_name" msgid="9183560467917256779">"Volgens naam"</string>
     <string name="sort_date" msgid="586080032956151448">"Volgens datum gewysig"</string>
     <string name="sort_size" msgid="3350681319735474741">"Volgens grootte"</string>
diff --git a/packages/DocumentsUI/res/values-am/strings.xml b/packages/DocumentsUI/res/values-am/strings.xml
index f4da9eb..609ad0f 100644
--- a/packages/DocumentsUI/res/values-am/strings.xml
+++ b/packages/DocumentsUI/res/values-am/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"«<xliff:g id="DIRECTORY">^1</xliff:g>»ን ይምረጡ"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"ሁሉንም ምረጥ"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"ሁሉንም ምረጥ"</string>
     <string name="menu_copy" msgid="3612326052677229148">"ቅዳ ወደ…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ውስጣዊ ማከማቻ አሳይ"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ካርድ አሳይ"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ካርድ ደብቅ"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"የፋይል መጠን አሳይ"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ተመርጠዋል"</string>
     <string name="sort_name" msgid="9183560467917256779">"በስም"</string>
     <string name="sort_date" msgid="586080032956151448">"በተለወጠበት ቀን"</string>
     <string name="sort_size" msgid="3350681319735474741">"በመጠን"</string>
diff --git a/packages/DocumentsUI/res/values-ar/strings.xml b/packages/DocumentsUI/res/values-ar/strings.xml
index 987e0a1..eb2e2f2 100644
--- a/packages/DocumentsUI/res/values-ar/strings.xml
+++ b/packages/DocumentsUI/res/values-ar/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"تحديد \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"تحديد الكل"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"تحديد الكل"</string>
     <string name="menu_copy" msgid="3612326052677229148">"نسخ إلى…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"إظهار وحدة التخزين الداخلية"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"‏إظهار بطاقة SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"‏إخفاء بطاقة SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"إظهار حجم الملف"</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="mode_selected_count" msgid="459111894725594625">"تم تحديد <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"بحسب الاسم"</string>
     <string name="sort_date" msgid="586080032956151448">"بحسب تاريخ التعديل"</string>
     <string name="sort_size" msgid="3350681319735474741">"بحسب الحجم"</string>
diff --git a/packages/DocumentsUI/res/values-as-rIN/strings.xml b/packages/DocumentsUI/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-as-rIN/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-ast-rES/strings.xml b/packages/DocumentsUI/res/values-ast-rES/strings.xml
index e307428..a0ca39a 100644
--- a/packages/DocumentsUI/res/values-ast-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-ast-rES/strings.xml
@@ -15,41 +15,108 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
   <string name="app_label">Documentos</string>
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
   <string name="title_open">Abrir dende</string>
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
   <string name="title_save">Guardar en</string>
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
   <string name="menu_create_dir">Crear carpeta</string>
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
   <string name="menu_grid">Vista de cuadrícula</string>
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
   <string name="menu_list">Vista de llista</string>
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
   <string name="menu_sort">Ordenar por</string>
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
   <string name="menu_search">Guetar</string>
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
   <string name="menu_settings">Axustes</string>
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
   <string name="menu_open">Abrir</string>
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
   <string name="menu_save">Guardar</string>
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
   <string name="menu_share">Compartir</string>
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">Desaniciar</string>
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <string name="menu_select_all">Esbillalo too</string>
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <string name="menu_copy">Copiar a\u2026</string>
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="nosdcard">Amosar almac. internu</string>
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="default">Amosar tarxeta SD</string>
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_hide" product="nosdcard">Anubrir almac. internu</string>
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_hide" product="default">Anubrir tarxeta SD</string>
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_show">Amosar tamañu de ficheru</string>
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_hide">Anubrir tamañu de ficheru</string>
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <string name="button_select">Seleicionar</string>
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <string name="button_copy">Copiar</string>
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">Por nome</string>
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
   <string name="sort_date">Por data de modificación</string>
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
   <string name="sort_size">Por tamañu</string>
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_open">Amosar raíces</string>
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_close">Anubrir raíces</string>
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
   <string name="save_error">Fallu al guardar documentu</string>
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
   <string name="create_error">Fallu al crear carpeta</string>
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
   <string name="query_error">Fallu al solicitar documentos</string>
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
   <string name="root_recent">Recién</string>
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
   <string name="root_available_bytes"><xliff:g id="size" example="3GB">%1$s</xliff:g> d\'espaciu llibre</string>
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
   <string name="root_type_service">Servicios d\'almacenamientu</string>
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
   <string name="root_type_shortcut">Atayos</string>
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
   <string name="root_type_device">Preseos</string>
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
   <string name="root_type_apps">Más apps</string>
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
   <string name="empty">Ensin elementos</string>
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
   <string name="toast_no_application">Nun pue abrise\'l ficheru</string>
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
   <string name="toast_failed_delete">Nun pudieron desaniciase dalgunos documentos</string>
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
   <string name="share_via">Compartir per aciu de</string>
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <string name="copy_notification_title">Copiando ficheros</string>
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <string name="copy_remaining">queden <xliff:g id="duration" example="3 minutes">%s</xliff:g></string>
+  <!-- Toast shown when a file copy is kicked off -->
+  <plurals name="copy_begin">
+    <item quantity="one">Copiando <xliff:g id="count" example="1">%1$d</xliff:g> ficheru</item>
+    <item quantity="other">Copiando <xliff:g id="count" example="1">%1$d</xliff:g> ficheros</item>
+  </plurals>
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <string name="copy_preparing">Tresnando pa copiar\u2026</string>
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <plurals name="copy_error_notification_title">
+    <item quantity="one">Nun pudo copiase <xliff:g id="count" example="1">%1$d</xliff:g> ficheru</item>
+    <item quantity="other">Nun pudieron copiase <xliff:g id="count" example="2">%1$d</xliff:g> ficheros</item>
+  </plurals>
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <string name="notification_touch_for_details">Toca pa ver detalles</string>
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <string name="retry">Reintentar</string>
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+  <string name="copy_failure_alert_content">Nun se copiaron estos ficheros: <xliff:g id="list">%1$s</xliff:g></string>
 </resources>
diff --git a/packages/DocumentsUI/res/values-az-rAZ/strings.xml b/packages/DocumentsUI/res/values-az-rAZ/strings.xml
index 1374982..706b5b2 100644
--- a/packages/DocumentsUI/res/values-az-rAZ/strings.xml
+++ b/packages/DocumentsUI/res/values-az-rAZ/strings.xml
@@ -29,25 +29,46 @@
     <string name="menu_save" msgid="2394743337684426338">"Yadda saxlayın"</string>
     <string name="menu_share" msgid="3075149983979628146">"Paylaşın"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Sil"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> seçilmiş"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Hamısını seçin"</string>
+    <string name="menu_copy" msgid="3612326052677229148">"Buraya kopyalayın:"</string>
+    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Daxili yaddaşı göstərin"</string>
+    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD kartı göstərin"</string>
+    <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Daxili yaddaşı gizlədin"</string>
+    <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD kartı gizlədin"</string>
+    <string name="menu_file_size_show" msgid="3240323619260823076">"Fayl ölçüsünü göstərin"</string>
+    <string name="menu_file_size_hide" msgid="8881975928502581042">"Fayl ölçüsünü gizlədin"</string>
+    <string name="button_select" msgid="527196987259139214">"Seçin"</string>
+    <string name="button_copy" msgid="8706475544635021302">"Kopyala"</string>
     <string name="sort_name" msgid="9183560467917256779">"Ad üzrə"</string>
     <string name="sort_date" msgid="586080032956151448">"Tarix üzrə dəyişmiş"</string>
     <string name="sort_size" msgid="3350681319735474741">"Ölçü üzrə"</string>
     <string name="drawer_open" msgid="4545466532430226949">"Kökləri göstərin"</string>
     <string name="drawer_close" msgid="7602734368552123318">"Kökləri gizlədin"</string>
     <string name="save_error" msgid="6167009778003223664">"Sənədi yadda saxlaya bilmədi"</string>
+    <string name="create_error" msgid="3735649141335444215">"Qovluq yaradıla bilmədi"</string>
+    <string name="query_error" msgid="1222448261663503501">"Sənəd sorğusu alınmadı"</string>
     <string name="root_recent" msgid="4470053704320518133">"Son"</string>
     <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ödənişsiz"</string>
-    <!-- no translation found for root_type_service (2178854894416775409) -->
-    <skip />
+    <string name="root_type_service" msgid="2178854894416775409">"Saxlama xidmətləri"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"Qısa yollar"</string>
     <string name="root_type_device" msgid="7121342474653483538">"Cihazlar"</string>
     <string name="root_type_apps" msgid="8838065367985945189">"Daha çox tətbiq"</string>
-    <string name="pref_advanced_devices" msgid="903257239609301276">"Qabaqcıl cihazları görüntüləyin"</string>
-    <string name="pref_file_size" msgid="2826879315743961459">"Fayl ölçüsünü görüntüləyin"</string>
-    <string name="pref_device_size" msgid="3542106883278997222">"Cihaz ölçüsünü görüntüləyin"</string>
     <string name="empty" msgid="7858882803708117596">"Element yoxdur"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Faylı aça bilmir"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"Bəzi sənədləri silə bilmir"</string>
     <string name="share_via" msgid="8966594246261344259">"Bunun vasitəsilə paylaş:"</string>
+    <string name="copy_notification_title" msgid="6374299806748219777">"Fayllar kopyalanır"</string>
+    <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> qalıb"</string>
+    <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fayl kopyalanır.</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fayl kopyalanır.</item>
+    </plurals>
+    <string name="copy_preparing" msgid="3896202461003039386">"Kopyalanmaq üçün hazırlanır ..."</string>
+    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fayl kopyalanmadı</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fayl kopyalanmadı</item>
+    </plurals>
+    <string name="notification_touch_for_details" msgid="4483108577842961665">"Detallara baxmaq üçün toxunun"</string>
+    <string name="retry" msgid="7564024179122207376">"Yenidən cəhd edin"</string>
+    <string name="copy_failure_alert_content" msgid="3715575000297709082">"Bu fayllar kopyalanmadı: <xliff:g id="LIST">%1$s</xliff:g>"</string>
 </resources>
diff --git a/packages/DocumentsUI/res/values-be/strings.xml b/packages/DocumentsUI/res/values-be/strings.xml
index b7a9b9c..a8332fd 100644
--- a/packages/DocumentsUI/res/values-be/strings.xml
+++ b/packages/DocumentsUI/res/values-be/strings.xml
@@ -15,41 +15,90 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
   <string name="app_label">Дакументы</string>
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
   <string name="title_open">Адкрыць</string>
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
   <string name="title_save">Захаваць</string>
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
   <string name="menu_create_dir">Стварыць тэчку</string>
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
   <string name="menu_grid">У выглядзе сеткі</string>
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
   <string name="menu_list">У выглядзе спісу</string>
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
   <string name="menu_sort">Сартаваць паводле</string>
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
   <string name="menu_search">Пошук</string>
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
   <string name="menu_settings">Налады</string>
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
   <string name="menu_open">Адкрыць</string>
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
   <string name="menu_save">Захаваць</string>
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
   <string name="menu_share">Падзяліцца</string>
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">Выдаліць</string>
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="nosdcard">Унутраная памяць</string>
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="default">SD-картка</string>
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_hide" product="nosdcard">Схаваць унутраную памяць</string>
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_hide" product="default">Схаваць SD-картку</string>
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_show">Паказаць памеры файлаў</string>
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_hide">Схаваць памеры файлаў</string>
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">Паводле назвы</string>
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
   <string name="sort_date">Паводле даты зменаў</string>
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
   <string name="sort_size">Паводле памеру</string>
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_open">Паказаць</string>
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_close">Схаваць</string>
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
   <string name="save_error">Не атрымалася захаваць дакумент</string>
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
   <string name="create_error">Не атрымалася стварыць тэчку</string>
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
   <string name="query_error">Не атрымалася даслаць запыт</string>
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
   <string name="root_recent">Апошнія</string>
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
   <string name="root_available_bytes">Вольна <xliff:g id="size" example="3GB">%1$s</xliff:g></string>
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
   <string name="root_type_service">Анлайн-сховішча</string>
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
   <string name="root_type_shortcut">Цэтлікі</string>
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
   <string name="root_type_device">Прылады</string>
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
   <string name="root_type_apps">Іншыя праграмы</string>
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
   <string name="empty">Няма элементаў</string>
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
   <string name="toast_no_application">Немагчыма адкрыць файл</string>
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
   <string name="toast_failed_delete">Не атрымалася выдаліць некаторыя дакументы</string>
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
   <string name="share_via">Падзяліцца праз</string>
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
 </resources>
diff --git a/packages/DocumentsUI/res/values-bg/strings.xml b/packages/DocumentsUI/res/values-bg/strings.xml
index 3f9774a..8f6c022 100644
--- a/packages/DocumentsUI/res/values-bg/strings.xml
+++ b/packages/DocumentsUI/res/values-bg/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2783841764617238354">"Документи"</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="5947289605844398389">"Създаване на папка"</string>
     <string name="menu_grid" msgid="6878021334497835259">"Изглед в мрежа"</string>
     <string name="menu_list" msgid="7279285939892417279">"Списъчен изглед"</string>
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"Избиране на „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Избиране на всички"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Избиране на всичко"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Копиране във…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Вътр. хранилище: Показв."</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD карта: Показване"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD карта: Скриване"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Размер на файла: Показв."</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="mode_selected_count" msgid="459111894725594625">"Избрахте <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"По име"</string>
     <string name="sort_date" msgid="586080032956151448">"По дата на промяната"</string>
     <string name="sort_size" msgid="3350681319735474741">"По размер"</string>
@@ -48,7 +47,7 @@
     <string name="save_error" msgid="6167009778003223664">"Запазването на документа не бе успешно"</string>
     <string name="create_error" msgid="3735649141335444215">"Създаването на папката не бе успешно"</string>
     <string name="query_error" msgid="1222448261663503501">"Заявката за документи не бе успешна"</string>
-    <string name="root_recent" msgid="4470053704320518133">"Скорошно"</string>
+    <string name="root_recent" msgid="4470053704320518133">"Скорошни"</string>
     <string name="root_available_bytes" msgid="8568452858617033281">"Свободно: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="root_type_service" msgid="2178854894416775409">"Услуги за съхранение"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"Преки пътища"</string>
diff --git a/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
index 71ab447..4167194 100644
--- a/packages/DocumentsUI/res/values-bn-rBD/strings.xml
+++ b/packages/DocumentsUI/res/values-bn-rBD/strings.xml
@@ -22,15 +22,14 @@
     <string name="menu_create_dir" msgid="5947289605844398389">"ফোল্ডার তৈরি করুন"</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="6008033148948428823">"সেটিংস"</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_delete" msgid="8138799623850614177">"মুছুন"</string>
-    <string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" নির্বাচন করুন"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"সমস্ত নির্বাচন করুন"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"সবগুলি নির্বাচন করুন"</string>
     <string name="menu_copy" msgid="3612326052677229148">"এতে অনুলিপি করুন…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"অভ্যন্তরীণ সঞ্চয়স্থান দেখান"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD কার্ড দেখান"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD কার্ড লুকান"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ফাইলের আকার দেখান"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> নির্বাচন করা হয়েছে"</string>
     <string name="sort_name" msgid="9183560467917256779">"নামের দ্বারা"</string>
     <string name="sort_date" msgid="586080032956151448">"পরিবর্তনের তারিখ দ্বারা"</string>
     <string name="sort_size" msgid="3350681319735474741">"আকার অনুযায়ী"</string>
diff --git a/packages/DocumentsUI/res/values-br-rFR/strings.xml b/packages/DocumentsUI/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-br-rFR/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-bs-rBA/strings.xml b/packages/DocumentsUI/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-bs-rBA/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-ca/strings.xml b/packages/DocumentsUI/res/values-ca/strings.xml
index 59cbd04..d4dfb2d 100644
--- a/packages/DocumentsUI/res/values-ca/strings.xml
+++ b/packages/DocumentsUI/res/values-ca/strings.xml
@@ -29,17 +29,16 @@
     <string name="menu_save" msgid="2394743337684426338">"Desa"</string>
     <string name="menu_share" msgid="3075149983979628146">"Comparteix"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Suprimeix"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Selecciona \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Selecciona\'ls tots"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Selecciona-ho tot"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copia a…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostra emmagatz. intern"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostra la targeta SD"</string>
     <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Amaga emmagatz. intern"</string>
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Amaga la targeta SD"</string>
-    <string name="menu_file_size_show" msgid="3240323619260823076">"Mostra la mida de fitxer"</string>
+    <string name="menu_file_size_show" msgid="3240323619260823076">"Mostra la mida del fitxer"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Amaga la mida del fitxer"</string>
+    <string name="button_select" msgid="527196987259139214">"Selecciona"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copia"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Seleccionats: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Per nom"</string>
     <string name="sort_date" msgid="586080032956151448">"Per data de modificació"</string>
     <string name="sort_size" msgid="3350681319735474741">"Per mida"</string>
diff --git a/packages/DocumentsUI/res/values-cs/strings.xml b/packages/DocumentsUI/res/values-cs/strings.xml
index 7697a99..05da0b6 100644
--- a/packages/DocumentsUI/res/values-cs/strings.xml
+++ b/packages/DocumentsUI/res/values-cs/strings.xml
@@ -21,7 +21,7 @@
     <string name="title_save" msgid="2433679664882857999">"Uložit do"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Vytvořit složku"</string>
     <string name="menu_grid" msgid="6878021334497835259">"Mřížkové zobrazení"</string>
-    <string name="menu_list" msgid="7279285939892417279">"Seznam"</string>
+    <string name="menu_list" msgid="7279285939892417279">"Zobrazení seznamu"</string>
     <string name="menu_sort" msgid="7677740407158414452">"Řadit podle"</string>
     <string name="menu_search" msgid="3816712084502856974">"Hledat"</string>
     <string name="menu_settings" msgid="6008033148948428823">"Nastavení"</string>
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Uložit"</string>
     <string name="menu_share" msgid="3075149983979628146">"Sdílet"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Smazat"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Vyberte adresář <xliff:g id="DIRECTORY">^1</xliff:g>"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Vybrat vše"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Vybrat vše"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopírovat do…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Zobrazit inter. úložiště"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Zobrazit SD kartu"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skrýt SD kartu"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Zobrazit velikost souboru"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Skrýt velikost souboru"</string>
+    <string name="button_select" msgid="527196987259139214">"Vybrat"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopírovat"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Vybráno: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Podle názvu"</string>
     <string name="sort_date" msgid="586080032956151448">"Podle data úpravy"</string>
     <string name="sort_size" msgid="3350681319735474741">"Podle velikosti"</string>
@@ -48,7 +47,7 @@
     <string name="save_error" msgid="6167009778003223664">"Uložení dokumentu se nezdařilo"</string>
     <string name="create_error" msgid="3735649141335444215">"Složku se nepodařilo vytvořit"</string>
     <string name="query_error" msgid="1222448261663503501">"Seznam dokumentů se nepodařilo načíst"</string>
-    <string name="root_recent" msgid="4470053704320518133">"Poslední"</string>
+    <string name="root_recent" msgid="4470053704320518133">"Nedávné"</string>
     <string name="root_available_bytes" msgid="8568452858617033281">"Volné místo: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="root_type_service" msgid="2178854894416775409">"Služby úložiště"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"Klávesové zkratky"</string>
diff --git a/packages/DocumentsUI/res/values-csb-rPL/strings.xml b/packages/DocumentsUI/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-csb-rPL/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-cy/strings.xml b/packages/DocumentsUI/res/values-cy/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-cy/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-da/strings.xml b/packages/DocumentsUI/res/values-da/strings.xml
index 919d785..5e26a3d 100644
--- a/packages/DocumentsUI/res/values-da/strings.xml
+++ b/packages/DocumentsUI/res/values-da/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2783841764617238354">"Dokumenter"</string>
     <string name="title_open" msgid="4353228937663917801">"Åbn fra"</string>
-    <string name="title_save" msgid="2433679664882857999">"Gem på"</string>
+    <string name="title_save" msgid="2433679664882857999">"Gem i"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Opret mappe"</string>
     <string name="menu_grid" msgid="6878021334497835259">"Gittervisning"</string>
     <string name="menu_list" msgid="7279285939892417279">"Listevisning"</string>
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Gem"</string>
     <string name="menu_share" msgid="3075149983979628146">"Del"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Slet"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Vælg \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Vælg alle"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Markér alle"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopiér til…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Vis intern lagerplads"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Vis SD-kort"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skjul SD-kort"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Vis filstørrelse"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Skjul filstørrelse"</string>
+    <string name="button_select" msgid="527196987259139214">"Vælg"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopiér"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> er valgt"</string>
     <string name="sort_name" msgid="9183560467917256779">"Efter navn"</string>
     <string name="sort_date" msgid="586080032956151448">"Efter ændringsdato"</string>
     <string name="sort_size" msgid="3350681319735474741">"Efter størrelse"</string>
diff --git a/packages/DocumentsUI/res/values-de/strings.xml b/packages/DocumentsUI/res/values-de/strings.xml
index 2fca9a9..80d0a35 100644
--- a/packages/DocumentsUI/res/values-de/strings.xml
+++ b/packages/DocumentsUI/res/values-de/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Speichern"</string>
     <string name="menu_share" msgid="3075149983979628146">"Teilen"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Löschen"</string>
-    <string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" auswählen"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Alle auswählen"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Alle auswählen"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopieren nach..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Int. Speicher anzeigen"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD-Karte anzeigen"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD-Karte ausblenden"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Dateigröße anzeigen"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Dateigröße ausblenden"</string>
+    <string name="button_select" msgid="527196987259139214">"Auswählen"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopieren"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ausgewählt"</string>
     <string name="sort_name" msgid="9183560467917256779">"Nach Name"</string>
     <string name="sort_date" msgid="586080032956151448">"Nach Änderungsdatum"</string>
     <string name="sort_size" msgid="3350681319735474741">"Nach Größe"</string>
diff --git a/packages/DocumentsUI/res/values-el/strings.xml b/packages/DocumentsUI/res/values-el/strings.xml
index 409cca7..352c748b 100644
--- a/packages/DocumentsUI/res/values-el/strings.xml
+++ b/packages/DocumentsUI/res/values-el/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"Επιλογή \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Επιλογή όλων"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Επιλογή όλων"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Αντιγραφή σε…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Εμφ.εσωτ.χώρου αποθήκ."</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Εμφάνιση κάρτας SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Απόκρυψη κάρτας SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Εμφ. μεγέθους αρχείου"</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="mode_selected_count" msgid="459111894725594625">"Επιλέχθηκαν <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Κατά όνομα"</string>
     <string name="sort_date" msgid="586080032956151448">"Κατά ημερομηνία τροποποίησης"</string>
     <string name="sort_size" msgid="3350681319735474741">"Κατά μέγεθος"</string>
diff --git a/packages/DocumentsUI/res/values-en-rAU/strings.xml b/packages/DocumentsUI/res/values-en-rAU/strings.xml
index 7af8c4e..665f93b 100644
--- a/packages/DocumentsUI/res/values-en-rAU/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rAU/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Save"</string>
     <string name="menu_share" msgid="3075149983979628146">"Share"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Delete"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Select \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Select All"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Select all"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copy to…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Show internal storage"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Show SD card"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Hide SD card"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
+    <string name="button_select" msgid="527196987259139214">"select"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copy"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selected"</string>
     <string name="sort_name" msgid="9183560467917256779">"By name"</string>
     <string name="sort_date" msgid="586080032956151448">"By date modified"</string>
     <string name="sort_size" msgid="3350681319735474741">"By size"</string>
diff --git a/packages/DocumentsUI/res/values-en-rGB/strings.xml b/packages/DocumentsUI/res/values-en-rGB/strings.xml
index 7af8c4e..665f93b 100644
--- a/packages/DocumentsUI/res/values-en-rGB/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rGB/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Save"</string>
     <string name="menu_share" msgid="3075149983979628146">"Share"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Delete"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Select \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Select All"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Select all"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copy to…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Show internal storage"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Show SD card"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Hide SD card"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
+    <string name="button_select" msgid="527196987259139214">"select"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copy"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selected"</string>
     <string name="sort_name" msgid="9183560467917256779">"By name"</string>
     <string name="sort_date" msgid="586080032956151448">"By date modified"</string>
     <string name="sort_size" msgid="3350681319735474741">"By size"</string>
diff --git a/packages/DocumentsUI/res/values-en-rIN/strings.xml b/packages/DocumentsUI/res/values-en-rIN/strings.xml
index 7af8c4e..665f93b 100644
--- a/packages/DocumentsUI/res/values-en-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-en-rIN/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Save"</string>
     <string name="menu_share" msgid="3075149983979628146">"Share"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Delete"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Select \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Select All"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Select all"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copy to…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Show internal storage"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Show SD card"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Hide SD card"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Show file size"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Hide file size"</string>
+    <string name="button_select" msgid="527196987259139214">"select"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copy"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selected"</string>
     <string name="sort_name" msgid="9183560467917256779">"By name"</string>
     <string name="sort_date" msgid="586080032956151448">"By date modified"</string>
     <string name="sort_size" msgid="3350681319735474741">"By size"</string>
diff --git a/packages/DocumentsUI/res/values-en-rPT/strings.xml b/packages/DocumentsUI/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-en-rPT/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-eo/strings.xml b/packages/DocumentsUI/res/values-eo/strings.xml
index e1321d2..92eb20b 100644
--- a/packages/DocumentsUI/res/values-eo/strings.xml
+++ b/packages/DocumentsUI/res/values-eo/strings.xml
@@ -15,15 +15,68 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
   <string name="app_label">Dokumentoj</string>
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <string name="menu_create_dir">Krei dosierujon</string>
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
   <string name="menu_sort">Ordigi laŭ</string>
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
   <string name="menu_search">Serĉi</string>
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
   <string name="menu_settings">Agordoj</string>
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
   <string name="menu_open">Malfermi</string>
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
   <string name="menu_save">Konservi</string>
-  <string name="menu_share">Komunigi</string>
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <string name="menu_share">Konigi</string>
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">Forigi</string>
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <string name="button_select">Elekti</string>
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <string name="button_copy">Kopii</string>
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">Laŭ nomo</string>
-  <string name="root_recent">Lasttempaj</string>
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
   <string name="root_type_device">Aparatoj</string>
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <string name="share_via">Konigi per</string>
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <string name="retry">Reprovi</string>
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
 </resources>
diff --git a/packages/DocumentsUI/res/values-es-rCO/strings.xml b/packages/DocumentsUI/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-es-rCO/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-es-rMX/strings.xml b/packages/DocumentsUI/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-es-rMX/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-es-rUS/strings.xml b/packages/DocumentsUI/res/values-es-rUS/strings.xml
index 4edbeda..0140e97 100644
--- a/packages/DocumentsUI/res/values-es-rUS/strings.xml
+++ b/packages/DocumentsUI/res/values-es-rUS/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
     <string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Seleccionar \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Seleccionar todos"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Seleccionar todo"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copiar a…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar almacen. interno"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar tarjeta SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar tarjeta SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño archivos"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño archivos"</string>
+    <string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> seleccionado(s)"</string>
     <string name="sort_name" msgid="9183560467917256779">"Por nombre"</string>
     <string name="sort_date" msgid="586080032956151448">"Por fecha de modificación"</string>
     <string name="sort_size" msgid="3350681319735474741">"Por tamaño"</string>
diff --git a/packages/DocumentsUI/res/values-es/strings.xml b/packages/DocumentsUI/res/values-es/strings.xml
index ac9692c..27595ba 100644
--- a/packages/DocumentsUI/res/values-es/strings.xml
+++ b/packages/DocumentsUI/res/values-es/strings.xml
@@ -29,17 +29,16 @@
     <string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
     <string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Selecciona \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Seleccionar todo"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Seleccionar todo"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copiar en…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar almac. interno"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar tarjeta SD"</string>
     <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ocultar almac. interno"</string>
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar tarjeta SD"</string>
-    <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño archivo"</string>
-    <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño archivo"</string>
+    <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño del archivo"</string>
+    <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño del archivo"</string>
+    <string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Seleccionado: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Por nombre"</string>
     <string name="sort_date" msgid="586080032956151448">"Por fecha de modificación"</string>
     <string name="sort_size" msgid="3350681319735474741">"Por tamaño"</string>
@@ -54,7 +53,7 @@
     <string name="root_type_shortcut" msgid="3318760609471618093">"Accesos directos"</string>
     <string name="root_type_device" msgid="7121342474653483538">"Dispositivos"</string>
     <string name="root_type_apps" msgid="8838065367985945189">"Más aplicaciones"</string>
-    <string name="empty" msgid="7858882803708117596">"Sin elementos"</string>
+    <string name="empty" msgid="7858882803708117596">"No hay elementos"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Error al abrir el archivo"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"No es posible eliminar algunos documentos"</string>
     <string name="share_via" msgid="8966594246261344259">"Compartir a través de"</string>
diff --git a/packages/DocumentsUI/res/values-et-rEE/strings.xml b/packages/DocumentsUI/res/values-et-rEE/strings.xml
index 8f02871..425926b 100644
--- a/packages/DocumentsUI/res/values-et-rEE/strings.xml
+++ b/packages/DocumentsUI/res/values-et-rEE/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Salvesta"</string>
     <string name="menu_share" msgid="3075149983979628146">"Jaga"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Kustuta"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Kataloogi „<xliff:g id="DIRECTORY">^1</xliff:g>” valimine"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Vali kõik"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Vali kõik"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopeeri asukohta ..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Kuva sis. salvestusruum"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Kuva SD-kaart"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Peida SD-kaart"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Kuva faili suurus"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Peida faili suurus"</string>
+    <string name="button_select" msgid="527196987259139214">"Vali"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopeeri"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> on valitud"</string>
     <string name="sort_name" msgid="9183560467917256779">"Nime järgi"</string>
     <string name="sort_date" msgid="586080032956151448">"Muutmiskuupäeva järgi"</string>
     <string name="sort_size" msgid="3350681319735474741">"Suuruse järgi"</string>
diff --git a/packages/DocumentsUI/res/values-eu-rES/strings.xml b/packages/DocumentsUI/res/values-eu-rES/strings.xml
index 3ddc0d1..98d0d25 100644
--- a/packages/DocumentsUI/res/values-eu-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-eu-rES/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Gorde"</string>
     <string name="menu_share" msgid="3075149983979628146">"Partekatu"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Ezabatu"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Hautatu \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Hautatu guztiak"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Hautatu guztiak"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopiatu hemen…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Erakutsi barneko memoria"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Erakutsi SD txartela"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ezkutatu SD txartela"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Erakutsi fitxategi-tamaina"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ezkutatu fitxategi-tamaina"</string>
+    <string name="button_select" msgid="527196987259139214">"Hautatu"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopiatu"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> hautatuta"</string>
     <string name="sort_name" msgid="9183560467917256779">"Izenaren arabera"</string>
     <string name="sort_date" msgid="586080032956151448">"Aldatze-dataren arabera"</string>
     <string name="sort_size" msgid="3350681319735474741">"Tamainaren arabera"</string>
diff --git a/packages/DocumentsUI/res/values-fa/strings.xml b/packages/DocumentsUI/res/values-fa/strings.xml
index 5101e16..ac3ccab 100644
--- a/packages/DocumentsUI/res/values-fa/strings.xml
+++ b/packages/DocumentsUI/res/values-fa/strings.xml
@@ -21,16 +21,15 @@
     <string name="title_save" msgid="2433679664882857999">"ذخیره در"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"ایجاد پوشه"</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_list" msgid="7279285939892417279">"نمای فهرستی"</string>
+    <string name="menu_sort" msgid="7677740407158414452">"مرتب‌سازی براساس"</string>
     <string name="menu_search" msgid="3816712084502856974">"جستجو"</string>
     <string name="menu_settings" msgid="6008033148948428823">"تنظیمات"</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_delete" msgid="8138799623850614177">"حذف"</string>
-    <string name="menu_select" msgid="8711270657353563424">"انتخاب «<xliff:g id="DIRECTORY">^1</xliff:g>»"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"انتخاب همه"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"انتخاب همه"</string>
     <string name="menu_copy" msgid="3612326052677229148">"کپی در..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"نمایش فضای ذخیره‌سازی داخلی"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"‏نمایش کارت SD"</string>
@@ -38,11 +37,11 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"‏پنهان کردن کارت SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"نمایش اندازه فایل"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> انتخاب شد"</string>
-    <string name="sort_name" msgid="9183560467917256779">"بر اساس نام"</string>
-    <string name="sort_date" msgid="586080032956151448">"بر اساس تاریخ اصلاح"</string>
-    <string name="sort_size" msgid="3350681319735474741">"بر اساس اندازه"</string>
+    <string name="sort_name" msgid="9183560467917256779">"براساس نام"</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>
     <string name="save_error" msgid="6167009778003223664">"ذخیره سند انجام نشد"</string>
diff --git a/packages/DocumentsUI/res/values-fi/strings.xml b/packages/DocumentsUI/res/values-fi/strings.xml
index a9fe251..ca28e95 100644
--- a/packages/DocumentsUI/res/values-fi/strings.xml
+++ b/packages/DocumentsUI/res/values-fi/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Tallenna"</string>
     <string name="menu_share" msgid="3075149983979628146">"Jaa"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Poista"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Valitse <xliff:g id="DIRECTORY">^1</xliff:g>"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Valitse kaikki"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Valitse kaikki"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopioi kohteeseen…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Näytä sis. tallennustila"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Näytä SD-kortti"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Piilota SD-kortti"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Näytä tiedostokoko"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Piilota tiedostokoko"</string>
+    <string name="button_select" msgid="527196987259139214">"Valitse"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopioi"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> valittua"</string>
     <string name="sort_name" msgid="9183560467917256779">"Nimen mukaan"</string>
     <string name="sort_date" msgid="586080032956151448">"Muokkauspäivän mukaan"</string>
     <string name="sort_size" msgid="3350681319735474741">"Koon mukaan"</string>
diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
index b0c96e8..03f09ff 100644
--- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml
+++ b/packages/DocumentsUI/res/values-fr-rCA/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2783841764617238354">"Documents"</string>
-    <string name="title_open" msgid="4353228937663917801">"Ouvert à partir de"</string>
+    <string name="title_open" msgid="4353228937663917801">"Ouvrir à partir de"</string>
     <string name="title_save" msgid="2433679664882857999">"Enregistrer dans"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Créer un dossier"</string>
     <string name="menu_grid" msgid="6878021334497835259">"Grille"</string>
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Enregistrer"</string>
     <string name="menu_share" msgid="3075149983979628146">"Partager"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Supprimer"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Sélectionner « <xliff:g id="DIRECTORY">^1</xliff:g> »"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Tout sélectionner"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Tout sélectionner"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copier vers..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Aff. mém. stock. interne"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Afficher la carte SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Masquer la carte SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Afficher taille fichier"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Masquer taille fichier"</string>
+    <string name="button_select" msgid="527196987259139214">"Sélectionner"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copier"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> sélectionné(s)"</string>
     <string name="sort_name" msgid="9183560467917256779">"Par nom"</string>
     <string name="sort_date" msgid="586080032956151448">"Par date de modification"</string>
     <string name="sort_size" msgid="3350681319735474741">"Par taille"</string>
diff --git a/packages/DocumentsUI/res/values-fr/strings.xml b/packages/DocumentsUI/res/values-fr/strings.xml
index 57fe11a..f2fa732 100644
--- a/packages/DocumentsUI/res/values-fr/strings.xml
+++ b/packages/DocumentsUI/res/values-fr/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Enregistrer"</string>
     <string name="menu_share" msgid="3075149983979628146">"Partager"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Supprimer"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Sélectionner \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Tout sélectionner"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Tout sélectionner"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copier vers…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Aff. mém. stock. interne"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Afficher la carte SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Masquer la carte SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Afficher taille fichier"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Masquer taille fichier"</string>
+    <string name="button_select" msgid="527196987259139214">"Sélectionner"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copier"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> élément(s) sélectionné(s)"</string>
     <string name="sort_name" msgid="9183560467917256779">"Par nom"</string>
     <string name="sort_date" msgid="586080032956151448">"Par date de modification"</string>
     <string name="sort_size" msgid="3350681319735474741">"Par taille"</string>
diff --git a/packages/DocumentsUI/res/values-frp-rIT/strings.xml b/packages/DocumentsUI/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-frp-rIT/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-fy-rNL/strings.xml b/packages/DocumentsUI/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-fy-rNL/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-ga-rIE/strings.xml b/packages/DocumentsUI/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-ga-rIE/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-gd-rGB/strings.xml b/packages/DocumentsUI/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-gd-rGB/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-gl-rES/strings.xml b/packages/DocumentsUI/res/values-gl-rES/strings.xml
index 3b7cccf..322d431 100644
--- a/packages/DocumentsUI/res/values-gl-rES/strings.xml
+++ b/packages/DocumentsUI/res/values-gl-rES/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Gardar"</string>
     <string name="menu_share" msgid="3075149983979628146">"Compartir"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Selecciona \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Seleccionar todos"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Seleccionar todo"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copiar en…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar almacen. interno"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar tarxeta SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar tarxeta SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tamaño ficheiro"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tamaño ficheiro"</string>
+    <string name="button_select" msgid="527196987259139214">"Seleccionar"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> seleccionados"</string>
     <string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
     <string name="sort_date" msgid="586080032956151448">"Por data de modificación"</string>
     <string name="sort_size" msgid="3350681319735474741">"Por tamaño"</string>
diff --git a/packages/DocumentsUI/res/values-gu-rIN/strings.xml b/packages/DocumentsUI/res/values-gu-rIN/strings.xml
index cac6021..0281ba9 100644
--- a/packages/DocumentsUI/res/values-gu-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-gu-rIN/strings.xml
@@ -29,21 +29,20 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" પસંદ કરો"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"બધા પસંદ કરો"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"બધા પસંદ કરો"</string>
     <string name="menu_copy" msgid="3612326052677229148">"આના પર કૉપિ કરો…"</string>
-    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"આંતરિક સ્ટોરેજ દર્શાવો"</string>
-    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD કાર્ડ દર્શાવો"</string>
+    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"આંતરિક સ્ટોરેજ બતાવો"</string>
+    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD કાર્ડ બતાવો"</string>
     <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"આંતરિક સંગ્રહ છુપાવો"</string>
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD કાર્ડ છુપાવો"</string>
-    <string name="menu_file_size_show" msgid="3240323619260823076">"ફાઇલ કદ દર્શાવો"</string>
+    <string name="menu_file_size_show" msgid="3240323619260823076">"ફાઇલ કદ બતાવો"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> પસંદ કર્યા"</string>
     <string name="sort_name" msgid="9183560467917256779">"નામ દ્વારા"</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_open" msgid="4545466532430226949">"રૂટ્સ બતાવો"</string>
     <string name="drawer_close" msgid="7602734368552123318">"રૂટ્સ છુપાવો"</string>
     <string name="save_error" msgid="6167009778003223664">"દસ્તાવેજ સાચવવામાં નિષ્ફળ થયાં."</string>
     <string name="create_error" msgid="3735649141335444215">"ફોલ્ડર બનાવવામાં નિષ્ફળ થયા"</string>
@@ -53,7 +52,7 @@
     <string name="root_type_service" msgid="2178854894416775409">"સંગ્રહ સેવાઓ"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"શોર્ટકટ્સ"</string>
     <string name="root_type_device" msgid="7121342474653483538">"ઉપકરણો"</string>
-    <string name="root_type_apps" msgid="8838065367985945189">"વધુ એપ્લિકેશન્સ"</string>
+    <string name="root_type_apps" msgid="8838065367985945189">"વધુ એપ્લિકેશનો"</string>
     <string name="empty" msgid="7858882803708117596">"કોઈ આઇટમ્સ નથી"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"ફાઇલ ખોલી શકાતી નથી"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"કેટલાક દસ્તાવેજો કાઢી નાખવામાં અસમર્થ"</string>
diff --git a/packages/DocumentsUI/res/values-hi/strings.xml b/packages/DocumentsUI/res/values-hi/strings.xml
index 19269b0..5a42c7c 100644
--- a/packages/DocumentsUI/res/values-hi/strings.xml
+++ b/packages/DocumentsUI/res/values-hi/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2783841764617238354">"दस्तावेज़"</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="5947289605844398389">"फ़ोल्डर बनाएं"</string>
     <string name="menu_grid" msgid="6878021334497835259">"ग्रिड दृश्य"</string>
     <string name="menu_list" msgid="7279285939892417279">"सूची दृश्य"</string>
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" चुनें"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"सभी चुनें"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"सभी चुनें"</string>
     <string name="menu_copy" msgid="3612326052677229148">"इनकी कॉपी बनाएं..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"आंतरिक मेमोरी दिखाएं"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD कार्ड दिखाएं"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD कार्ड छिपाएं"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"फ़ाइल आकार दिखाएं"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> चयनित"</string>
     <string name="sort_name" msgid="9183560467917256779">"नाम के अनुसार"</string>
     <string name="sort_date" msgid="586080032956151448">"बदलाव के दिनांक के अनुसार"</string>
     <string name="sort_size" msgid="3350681319735474741">"आकार के अनुसार"</string>
diff --git a/packages/DocumentsUI/res/values-hr/strings.xml b/packages/DocumentsUI/res/values-hr/strings.xml
index 1357fc0..60e8bf3 100644
--- a/packages/DocumentsUI/res/values-hr/strings.xml
+++ b/packages/DocumentsUI/res/values-hr/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Spremi"</string>
     <string name="menu_share" msgid="3075149983979628146">"Dijeli"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Odaberi \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Odaberi sve"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Odaberi sve"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopiraj u…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Pokaži internu pohranu"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Pokaži SD karticu"</string>
@@ -38,9 +37,9 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Sakrij SD karticu"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži veličinu datoteke"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Sakrij veličinu datoteke"</string>
+    <string name="button_select" msgid="527196987259139214">"Odaberi"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopiraj"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Odabrano: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
-    <string name="sort_name" msgid="9183560467917256779">"Po korisniku"</string>
+    <string name="sort_name" msgid="9183560467917256779">"Po nazivu"</string>
     <string name="sort_date" msgid="586080032956151448">"Po datumu izmjene"</string>
     <string name="sort_size" msgid="3350681319735474741">"Po veličini"</string>
     <string name="drawer_open" msgid="4545466532430226949">"Prikaži korijene"</string>
diff --git a/packages/DocumentsUI/res/values-hu/strings.xml b/packages/DocumentsUI/res/values-hu/strings.xml
index 07c8ff1..db5c710 100644
--- a/packages/DocumentsUI/res/values-hu/strings.xml
+++ b/packages/DocumentsUI/res/values-hu/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Mentés"</string>
     <string name="menu_share" msgid="3075149983979628146">"Megosztás"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Törlés"</string>
-    <string name="menu_select" msgid="8711270657353563424">"A(z) „<xliff:g id="DIRECTORY">^1</xliff:g>” mappa kiválasztása"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Az összes kijelölése"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Összes kijelölése"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Másolás ide…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Belső tárhely"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD-kártya megjelenítése"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD-kártya elrejtése"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Fájlméret megjelenítése"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Fájlméret elrejtése"</string>
+    <string name="button_select" msgid="527196987259139214">"Kiválasztás"</string>
     <string name="button_copy" msgid="8706475544635021302">"Másolás"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> kiválasztva"</string>
     <string name="sort_name" msgid="9183560467917256779">"Név szerint"</string>
     <string name="sort_date" msgid="586080032956151448">"Módosítás dátuma szerint"</string>
     <string name="sort_size" msgid="3350681319735474741">"Méret szerint"</string>
diff --git a/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
index 3a214a6..4e6a096 100644
--- a/packages/DocumentsUI/res/values-hy-rAM/strings.xml
+++ b/packages/DocumentsUI/res/values-hy-rAM/strings.xml
@@ -20,7 +20,7 @@
     <string name="title_open" msgid="4353228937663917801">"Բացել այստեղից"</string>
     <string name="title_save" msgid="2433679664882857999">"Պահել այստեղ"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Ստեղծել պանակ"</string>
-    <string name="menu_grid" msgid="6878021334497835259">"Ցանցի տեսք"</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_search" msgid="3816712084502856974">"Որոնել"</string>
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"Ընտրել «<xliff:g id="DIRECTORY">^1</xliff:g>»"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Ընտրել բոլորը"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Ընտրել բոլորը"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Պատճենել…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ցույց տալ ներքին պահոցը"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Ցույց տալ SD քարտը"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Թաքցնել SD քարտը"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Ցույց տալ ֆայլի չափը"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ընտրված"</string>
     <string name="sort_name" msgid="9183560467917256779">"Ըստ անվան"</string>
     <string name="sort_date" msgid="586080032956151448">"Ըստ փոփոխման ամսաթվի"</string>
     <string name="sort_size" msgid="3350681319735474741">"Ըստ չափի"</string>
diff --git a/packages/DocumentsUI/res/values-in/strings.xml b/packages/DocumentsUI/res/values-in/strings.xml
index 690596f..d4fdd11 100644
--- a/packages/DocumentsUI/res/values-in/strings.xml
+++ b/packages/DocumentsUI/res/values-in/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Simpan"</string>
     <string name="menu_share" msgid="3075149983979628146">"Bagikan"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Hapus"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Pilih \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Pilih Semua"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Pilih semua"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Salin ke…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Tampilkan simpanan internal"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Tampilkan kartu SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Sembunyikan kartu SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Tampilkan ukuran file"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Sembunyikan ukuran file"</string>
+    <string name="button_select" msgid="527196987259139214">"Pilih"</string>
     <string name="button_copy" msgid="8706475544635021302">"Salin"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> dipilih"</string>
     <string name="sort_name" msgid="9183560467917256779">"Menurut nama"</string>
     <string name="sort_date" msgid="586080032956151448">"Menurut tanggal diubah"</string>
     <string name="sort_size" msgid="3350681319735474741">"Menurut ukuran"</string>
@@ -49,7 +48,7 @@
     <string name="create_error" msgid="3735649141335444215">"Gagal membuat folder"</string>
     <string name="query_error" msgid="1222448261663503501">"Gagal mengirim kueri untuk dokumen"</string>
     <string name="root_recent" msgid="4470053704320518133">"Terkini"</string>
-    <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> bebas"</string>
+    <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> kosong"</string>
     <string name="root_type_service" msgid="2178854894416775409">"Layanan penyimpanan"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"Pintasan"</string>
     <string name="root_type_device" msgid="7121342474653483538">"Perangkat"</string>
diff --git a/packages/DocumentsUI/res/values-is-rIS/strings.xml b/packages/DocumentsUI/res/values-is-rIS/strings.xml
index 00818aa..e82eb38 100644
--- a/packages/DocumentsUI/res/values-is-rIS/strings.xml
+++ b/packages/DocumentsUI/res/values-is-rIS/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Vista"</string>
     <string name="menu_share" msgid="3075149983979628146">"Deila"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Eyða"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Velja „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Velja allt"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Velja allt"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Afrita í ..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Sýna innbyggða geymslu"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Sýna SD-kort"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Fela SD-kort"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Sýna skráarstærð"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Fela skráarstærð"</string>
+    <string name="button_select" msgid="527196987259139214">"Velja"</string>
     <string name="button_copy" msgid="8706475544635021302">"Afrita"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> valin"</string>
     <string name="sort_name" msgid="9183560467917256779">"Eftir heiti"</string>
     <string name="sort_date" msgid="586080032956151448">"Eftir breytingadags."</string>
     <string name="sort_size" msgid="3350681319735474741">"Eftir stærð"</string>
diff --git a/packages/DocumentsUI/res/values-it/strings.xml b/packages/DocumentsUI/res/values-it/strings.xml
index 35afe54..10082bf 100644
--- a/packages/DocumentsUI/res/values-it/strings.xml
+++ b/packages/DocumentsUI/res/values-it/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Salva"</string>
     <string name="menu_share" msgid="3075149983979628146">"Condividi"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Elimina"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Seleziona \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Seleziona tutti"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Seleziona tutto"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copia in…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostra memoria interna"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostra scheda SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Nascondi scheda SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Mostra dimensioni file"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Nascondi dimensioni file"</string>
+    <string name="button_select" msgid="527196987259139214">"Seleziona"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copia"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selezionati"</string>
     <string name="sort_name" msgid="9183560467917256779">"Per nome"</string>
     <string name="sort_date" msgid="586080032956151448">"Per data di modifica"</string>
     <string name="sort_size" msgid="3350681319735474741">"Per dimensioni"</string>
@@ -54,7 +53,7 @@
     <string name="root_type_shortcut" msgid="3318760609471618093">"Scorciatoie"</string>
     <string name="root_type_device" msgid="7121342474653483538">"Dispositivi"</string>
     <string name="root_type_apps" msgid="8838065367985945189">"Altre app"</string>
-    <string name="empty" msgid="7858882803708117596">"Nessun articolo"</string>
+    <string name="empty" msgid="7858882803708117596">"Nessun elemento"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Impossibile aprire il file"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"Impossibile eliminare alcuni documenti"</string>
     <string name="share_via" msgid="8966594246261344259">"Condividi via"</string>
diff --git a/packages/DocumentsUI/res/values-iw/strings.xml b/packages/DocumentsUI/res/values-iw/strings.xml
index 4fe0822..b9a2808 100644
--- a/packages/DocumentsUI/res/values-iw/strings.xml
+++ b/packages/DocumentsUI/res/values-iw/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"בחר ב-\"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"בחר הכל"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"בחר הכל"</string>
     <string name="menu_copy" msgid="3612326052677229148">"העתק אל…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"הצג אחסון פנימי"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"‏הצג כרטיס SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"‏הסתר כרטיס SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"הצג גודל קובץ"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> נבחרו"</string>
     <string name="sort_name" msgid="9183560467917256779">"לפי שם"</string>
     <string name="sort_date" msgid="586080032956151448">"לפי תאריך שינוי"</string>
     <string name="sort_size" msgid="3350681319735474741">"לפי גודל"</string>
diff --git a/packages/DocumentsUI/res/values-ja/strings.xml b/packages/DocumentsUI/res/values-ja/strings.xml
index dbf386b..8c118a1 100644
--- a/packages/DocumentsUI/res/values-ja/strings.xml
+++ b/packages/DocumentsUI/res/values-ja/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"「<xliff:g id="DIRECTORY">^1</xliff:g>」を選択"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"すべて選択"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"すべて選択"</string>
     <string name="menu_copy" msgid="3612326052677229148">"コピー…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"内部ストレージを表示"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SDカードを表示"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SDカードを非表示"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ファイルサイズを表示"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g>件選択済み"</string>
     <string name="sort_name" msgid="9183560467917256779">"名前順"</string>
     <string name="sort_date" msgid="586080032956151448">"更新日順"</string>
     <string name="sort_size" msgid="3350681319735474741">"サイズ順"</string>
diff --git a/packages/DocumentsUI/res/values-ka-rGE/strings.xml b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
index 85e9b4e..59e8589 100644
--- a/packages/DocumentsUI/res/values-ka-rGE/strings.xml
+++ b/packages/DocumentsUI/res/values-ka-rGE/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"„<xliff:g id="DIRECTORY">^1</xliff:g>“-ის არჩევა"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"ყველას არჩევა"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"ყველას არჩევა"</string>
     <string name="menu_copy" msgid="3612326052677229148">"კოპირება…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"შიდა საცავის ჩვენება"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ბარათის ჩვენება"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ბარათის დამალვა"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ფაილის ზომის ჩვენება"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> მონიშნული"</string>
     <string name="sort_name" msgid="9183560467917256779">"სახელით"</string>
     <string name="sort_date" msgid="586080032956151448">"ცვლილების თარიღით"</string>
     <string name="sort_size" msgid="3350681319735474741">"ზომით"</string>
diff --git a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
index d2a6424..d30df0c 100644
--- a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
+++ b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml
@@ -17,8 +17,8 @@
 <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="title_open" msgid="4353228937663917801">"Келесі тармақ арқылы ашу:"</string>
-    <string name="title_save" msgid="2433679664882857999">"Келесі файлға сақтау:"</string>
+    <string name="title_open" msgid="4353228937663917801">"Мынадан ашу:"</string>
+    <string name="title_save" msgid="2433679664882857999">"Сақталатын орны"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Қалта жасақтау"</string>
     <string name="menu_grid" msgid="6878021334497835259">"Торлы көрініс"</string>
     <string name="menu_list" msgid="7279285939892417279">"Тізім көрінісі"</string>
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"«<xliff:g id="DIRECTORY">^1</xliff:g>» таңдау"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Барлығын таңдау"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Барлығын таңдау"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Көшіру орны…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ішкі жадты көрсету"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD картасын көрсету"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD картасын жасыру"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Файл өлшемін көрсету"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> таңдалды"</string>
     <string name="sort_name" msgid="9183560467917256779">"Атауы бойынша"</string>
     <string name="sort_date" msgid="586080032956151448">"Өзгертілген мерзімі бойынша"</string>
     <string name="sort_size" msgid="3350681319735474741">"Өлшемі бойынша"</string>
@@ -57,7 +56,7 @@
     <string name="empty" msgid="7858882803708117596">"Бос"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Файлды аша алмады"</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="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> қалды"</string>
     <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
diff --git a/packages/DocumentsUI/res/values-km-rKH/strings.xml b/packages/DocumentsUI/res/values-km-rKH/strings.xml
index a8cd4fe..8ac4a5f 100644
--- a/packages/DocumentsUI/res/values-km-rKH/strings.xml
+++ b/packages/DocumentsUI/res/values-km-rKH/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"ជ្រើស \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"ជ្រើសរើសទាំងអស់"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"ជ្រើសរើសទាំងអស់"</string>
     <string name="menu_copy" msgid="3612326052677229148">"ថតចម្លងទៅ…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"បង្ហាញឧបករណ៍ផ្ទុកខាងក្នុង"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"បង្ហាញកាតអេសឌី"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"លាក់​កាត​អេសឌី"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"បង្ហាញទំហំឯកសារ"</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="mode_selected_count" msgid="459111894725594625">"បាន​ជ្រើស <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"តាម​ឈ្មោះ"</string>
     <string name="sort_date" msgid="586080032956151448">"តាម​កាលបរិច្ឆេទ​បាន​កែប្រែ"</string>
     <string name="sort_size" msgid="3350681319735474741">"តាម​​ទំហំ"</string>
diff --git a/packages/DocumentsUI/res/values-kn-rIN/strings.xml b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
index 2cb4d8e..e93876d 100644
--- a/packages/DocumentsUI/res/values-kn-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-kn-rIN/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2783841764617238354">"ಡಾಕ್ಯುಮೆಂಟ್‌ಗಳು"</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="5947289605844398389">"ಫೋಲ್ಡರ್ ರಚಿಸು"</string>
     <string name="menu_grid" msgid="6878021334497835259">"ಗ್ರಿಡ್ ವೀಕ್ಷಣೆ"</string>
     <string name="menu_list" msgid="7279285939892417279">"ಪಟ್ಟಿ ವೀಕ್ಷಣೆ"</string>
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"ಎಲ್ಲವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="menu_copy" msgid="3612326052677229148">"ಇದಕ್ಕೆ ನಕಲಿಸಿ…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆಯನ್ನು ತೋರಿಸು"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ಕಾಡ್‌ ಅನ್ನು ತೋರಿಸು"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ಕಾರ್ಡ್‌ ಅನ್ನು ಮರೆಮಾಡಿ"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ಫೈಲ್‌ ಗಾತ್ರವನ್ನು ತೋರಿಸು"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="sort_name" msgid="9183560467917256779">"ಹೆಸರಿನ ಪ್ರಕಾರ"</string>
     <string name="sort_date" msgid="586080032956151448">"ಮಾರ್ಪಡಿಸಿರುವ ದಿನಾಂಕದ ಪ್ರಕಾರ"</string>
     <string name="sort_size" msgid="3350681319735474741">"ಗಾತ್ರದ ಪ್ರಕಾರ"</string>
diff --git a/packages/DocumentsUI/res/values-ko/strings.xml b/packages/DocumentsUI/res/values-ko/strings.xml
index 3e6facf..f4eca51 100644
--- a/packages/DocumentsUI/res/values-ko/strings.xml
+++ b/packages/DocumentsUI/res/values-ko/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\'<xliff:g id="DIRECTORY">^1</xliff:g>\' 선택"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"모두 선택"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"모두 선택"</string>
     <string name="menu_copy" msgid="3612326052677229148">"복사…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"내부 저장소 표시"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD 카드 표시"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD 카드 숨기기"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"파일 크기 표시"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g>개 선택됨"</string>
     <string name="sort_name" msgid="9183560467917256779">"이름순"</string>
     <string name="sort_date" msgid="586080032956151448">"수정된 날짜순"</string>
     <string name="sort_size" msgid="3350681319735474741">"크기순"</string>
diff --git a/packages/DocumentsUI/res/values-ku/strings.xml b/packages/DocumentsUI/res/values-ku/strings.xml
index 1677291..638550c 100644
--- a/packages/DocumentsUI/res/values-ku/strings.xml
+++ b/packages/DocumentsUI/res/values-ku/strings.xml
@@ -15,35 +15,84 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
   <string name="app_label">به‌ڵگه‌نامه‌کان</string>
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
   <string name="title_open">بیکه‌ره‌وه‌ له‌</string>
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
   <string name="title_save">پاشه‌که‌وتی بکه‌ له‌</string>
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
   <string name="menu_create_dir">بوخچه‌ دروست بکه‌</string>
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
   <string name="menu_grid">بینینی خانه‌یی</string>
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
   <string name="menu_list">بینینی لیسته‌یی</string>
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
   <string name="menu_sort">ڕیزکردن به‌پێی</string>
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
   <string name="menu_search">گه‌ڕان</string>
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
   <string name="menu_settings">ڕێکخستنه‌کان</string>
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
   <string name="menu_open">کردنه‌وه‌</string>
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
   <string name="menu_save">پاشەکەوت</string>
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
   <string name="menu_share">په‌رش</string>
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">سڕینه‌وه‌</string>
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">به‌پێی ناو</string>
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
   <string name="sort_date">به‌پێی به‌رواری ده‌ستکاریی</string>
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
   <string name="sort_size">به‌پێی قه‌باره‌</string>
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_open">ڕه‌گه‌کان پیشان بده‌</string>
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_close">ڕه‌گه‌کان بشاره‌وه‌</string>
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
   <string name="save_error">پاشه‌که‌وتی به‌ڵگه‌نامه‌ شکستی هێنا</string>
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
   <string name="create_error">دروستکردنی بوخچه‌ شکستی هێنا</string>
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
   <string name="query_error">پرسی به‌ڵگه‌نامه‌کان شکستی هێنا</string>
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
   <string name="root_recent">تازه‌</string>
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
   <string name="root_available_bytes"><xliff:g id="size" example="3GB">%1$s</xliff:g> به‌تاڵه‌</string>
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
   <string name="root_type_service">ڕاژه‌کانی بیرگە</string>
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
   <string name="root_type_shortcut">کورتبڕییه‌کان</string>
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
   <string name="root_type_device">ئامێره‌کان</string>
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
   <string name="root_type_apps">به‌رنامه‌ی زیاتر</string>
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
   <string name="empty">هیچ بڕگه‌یه‌ک نییه‌</string>
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
   <string name="toast_no_application">نه‌توانرا په‌ڕگه‌ بکرێته‌وه‌</string>
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
   <string name="toast_failed_delete">نه‌توانرا هه‌ندێ به‌ڵگه‌نامه‌ بسڕێنه‌وه‌</string>
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
   <string name="share_via">په‌رشیکه‌ له‌ڕێی</string>
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
 </resources>
diff --git a/packages/DocumentsUI/res/values-ky-rKG/strings.xml b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
index 8f5bb25..71a1fd2 100644
--- a/packages/DocumentsUI/res/values-ky-rKG/strings.xml
+++ b/packages/DocumentsUI/res/values-ky-rKG/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" тандоо"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Бардыгын тандоо"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Бардыгын тандоо"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Төмөнкүгө көчүрүү…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ички сактагычты көрсөтүү"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD картаны көрсөтүү"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD картаны жашыруу"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Файл өлчөмүн көрсөтүү"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> тандалды"</string>
     <string name="sort_name" msgid="9183560467917256779">"Аты боюнча"</string>
     <string name="sort_date" msgid="586080032956151448">"Өзгөртүлгөн күнү боюнча"</string>
     <string name="sort_size" msgid="3350681319735474741">"Өлчөмү боюнча"</string>
diff --git a/packages/DocumentsUI/res/values-lb/strings.xml b/packages/DocumentsUI/res/values-lb/strings.xml
index c610d82..5bcd64f 100644
--- a/packages/DocumentsUI/res/values-lb/strings.xml
+++ b/packages/DocumentsUI/res/values-lb/strings.xml
@@ -15,41 +15,90 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
   <string name="app_label">Dokumenter</string>
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
   <string name="title_open">Opmaache vun</string>
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
   <string name="title_save">Späicheren ënner</string>
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
   <string name="menu_create_dir">Dossier uleeën</string>
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
   <string name="menu_grid">Gitterusiicht</string>
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
   <string name="menu_list">Lëschtenusiicht</string>
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
   <string name="menu_sort">Zortéieren no</string>
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
   <string name="menu_search">Sichen</string>
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
   <string name="menu_settings">Astellungen</string>
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
   <string name="menu_open">Opmaachen</string>
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
   <string name="menu_save">Späicheren</string>
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
   <string name="menu_share">Deelen</string>
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">Läschen</string>
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="nosdcard">Interne Späicher uweisen</string>
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_show" product="default">SD-Kaart uweisen</string>
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_hide" product="nosdcard">Interne Späicher verstoppen</string>
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
   <string name="menu_advanced_hide" product="default">SD-Kaart verstoppen</string>
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_show">Fichiersgréisst uweisen</string>
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
   <string name="menu_file_size_hide">Fichiersgréisst verstoppen</string>
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">No Numm</string>
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
   <string name="sort_date">No Ännerungsdatum</string>
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
   <string name="sort_size">No Gréisst</string>
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_open">Wuerzelen uweisen</string>
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_close">Wuerzele verstoppen</string>
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
   <string name="save_error">D\'Dokument konnt net gespäichert ginn</string>
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
   <string name="create_error">Den Dossier konnt net erstallt ginn</string>
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
   <string name="query_error">D\'Dokumenter konnten net ofgeruff ginn</string>
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
   <string name="root_recent">Rezent</string>
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
   <string name="root_available_bytes"><xliff:g id="size" example="3GB">%1$s</xliff:g> fräi</string>
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
   <string name="root_type_service">Späicherservicer</string>
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
   <string name="root_type_shortcut">Ofkierzungen</string>
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
   <string name="root_type_device">Apparater</string>
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
   <string name="root_type_apps">Méi Appen</string>
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
   <string name="empty">Keng Elementer</string>
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
   <string name="toast_no_application">Fichier kann net opgemaach ginn</string>
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
   <string name="toast_failed_delete">Verschidden Dokumenter konnten net geläscht ginn</string>
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
   <string name="share_via">Deelen iwwer</string>
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
 </resources>
diff --git a/packages/DocumentsUI/res/values-lo-rLA/strings.xml b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
index f57071b..7fde417 100644
--- a/packages/DocumentsUI/res/values-lo-rLA/strings.xml
+++ b/packages/DocumentsUI/res/values-lo-rLA/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"ເລືອກ​ \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"ເລືອກທັງຫມົດ"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"ເລືອກທັງຫມົດ"</string>
     <string name="menu_copy" msgid="3612326052677229148">"ອັດ​ສຳ​ເນົາ​ໃສ່…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ສະແດງ​ໂຕເກັບ​ຂໍ້ມູນພາຍໃນ"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"ສະແດງ SD Card"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"ເຊື່ອງ SD Card"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ສະແດງ​ຂະໜາດ​ໄຟລ໌"</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="mode_selected_count" msgid="459111894725594625">"ເລືອກແລ້ວ <xliff:g id="COUNT">%1$d</xliff:g> ລາຍການ"</string>
     <string name="sort_name" msgid="9183560467917256779">"ຕາມຊື່"</string>
     <string name="sort_date" msgid="586080032956151448">"ຕາມວັນທີທີ່ແກ້ໄຂ"</string>
     <string name="sort_size" msgid="3350681319735474741">"ຕາມຂະໜາດ"</string>
diff --git a/packages/DocumentsUI/res/values-lt/strings.xml b/packages/DocumentsUI/res/values-lt/strings.xml
index 66f5387..aa129c1 100644
--- a/packages/DocumentsUI/res/values-lt/strings.xml
+++ b/packages/DocumentsUI/res/values-lt/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Išsaugoti"</string>
     <string name="menu_share" msgid="3075149983979628146">"Bendrinti"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Ištrinti"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Pasirinkti katalogą „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Pasirinkti viską"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Pasirinkti viską"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopijuoti į..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Rodyti vidinę atmintį"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Rodyti SD kortelę"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Slėpti SD kortelę"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Rodyti failo dydį"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Slėpti failo dydį"</string>
+    <string name="button_select" msgid="527196987259139214">"Pasirinkti"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopijuoti"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Pasirinkta: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Pagal pavadinimą"</string>
     <string name="sort_date" msgid="586080032956151448">"Pagal keitimo datą"</string>
     <string name="sort_size" msgid="3350681319735474741">"Pagal dydį"</string>
diff --git a/packages/DocumentsUI/res/values-lv/strings.xml b/packages/DocumentsUI/res/values-lv/strings.xml
index 4e254a1..7476960 100644
--- a/packages/DocumentsUI/res/values-lv/strings.xml
+++ b/packages/DocumentsUI/res/values-lv/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Saglabāt"</string>
     <string name="menu_share" msgid="3075149983979628146">"Kopīgot"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Dzēst"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Atlasīt “<xliff:g id="DIRECTORY">^1</xliff:g>”"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Atlasīt visus"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Atlasīt visus"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopēt…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Rādīt iekšējo atmiņu"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Rādīt SD karti"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Paslēpt SD karti"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Rādīt failu lielumu"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Paslēpt failu lielumu"</string>
+    <string name="button_select" msgid="527196987259139214">"Atlasīt"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopēt"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Atlasīts: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Pēc nosaukuma"</string>
     <string name="sort_date" msgid="586080032956151448">"Pēc pārveidošanas datuma"</string>
     <string name="sort_size" msgid="3350681319735474741">"Pēc lieluma"</string>
diff --git a/packages/DocumentsUI/res/values-mk-rMK/strings.xml b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
index cfe7947..8479839 100644
--- a/packages/DocumentsUI/res/values-mk-rMK/strings.xml
+++ b/packages/DocumentsUI/res/values-mk-rMK/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"Одберете „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Избери ги сите"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Избери ги сите"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Копирај во…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Прикажи внатрешна мемор."</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Прикажи СД-картичка"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Сoкриј СД-картичка"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Прикажи целосна големина"</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="mode_selected_count" msgid="459111894725594625">"Избрани се <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"По име"</string>
     <string name="sort_date" msgid="586080032956151448">"Изменети по датум"</string>
     <string name="sort_size" msgid="3350681319735474741">"По големина"</string>
diff --git a/packages/DocumentsUI/res/values-ml-rIN/strings.xml b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
index a5b5bbd..4c4b481 100644
--- a/packages/DocumentsUI/res/values-ml-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-ml-rIN/strings.xml
@@ -29,17 +29,16 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" തിരഞ്ഞെടുക്കുക"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"എല്ലാം തിരഞ്ഞെടുക്കുക"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"എല്ലാം തിരഞ്ഞെടുക്കുക"</string>
     <string name="menu_copy" msgid="3612326052677229148">"ഇതിൽ പകർത്തുക…"</string>
-    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ആന്തരിക സംഭരണം കാണിക്കുക"</string>
+    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ആന്തരിക സ്റ്റോറേജ്  കാണിക്കുക"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD കാർഡ് കാണിക്കുക"</string>
-    <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"ആന്തരിക സംഭരണം മറയ്‌ക്കുക"</string>
+    <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"ആന്തരിക സ്റ്റോറേജ്  മറയ്‌ക്കുക"</string>
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD കാർഡ് മറയ്‌ക്കുക"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ഫയൽ വലുപ്പം കാണിക്കുക"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> തിരഞ്ഞെടുത്തു"</string>
     <string name="sort_name" msgid="9183560467917256779">"പേര് പ്രകാരം"</string>
     <string name="sort_date" msgid="586080032956151448">"പരിഷ്‌ക്കരിച്ച തീയതി പ്രകാരം"</string>
     <string name="sort_size" msgid="3350681319735474741">"വലുപ്പം പ്രകാരം"</string>
diff --git a/packages/DocumentsUI/res/values-mn-rMN/strings.xml b/packages/DocumentsUI/res/values-mn-rMN/strings.xml
index 1f1218f..5ce4046 100644
--- a/packages/DocumentsUI/res/values-mn-rMN/strings.xml
+++ b/packages/DocumentsUI/res/values-mn-rMN/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\"-г сонгох"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Бүгдийг сонгох"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Бүгдийг сонгох"</string>
     <string name="menu_copy" msgid="3612326052677229148">"...руу хуулах"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Дотоод санг харуулах"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD картыг харуулах"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD картыг нуух"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Файлын хэмжээг харуулах"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> сонгогдсон"</string>
     <string name="sort_name" msgid="9183560467917256779">"Нэрээр"</string>
     <string name="sort_date" msgid="586080032956151448">"Өөрчлөгдсөн огноогоор"</string>
     <string name="sort_size" msgid="3350681319735474741">"Хэмжээгээр"</string>
diff --git a/packages/DocumentsUI/res/values-mr-rIN/strings.xml b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
index b7b1f23..ca414e8 100644
--- a/packages/DocumentsUI/res/values-mr-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-mr-rIN/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" निवडा"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"सर्व निवडा"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"सर्व निवडा"</string>
     <string name="menu_copy" msgid="3612326052677229148">"यावर कॉपी करा…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"अंतर्गत संचयन दर्शवा"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD कार्ड दर्शवा"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD कार्ड लपवा"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"फाईल आकार दर्शवा"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> निवडले"</string>
     <string name="sort_name" msgid="9183560467917256779">"नावानुसार"</string>
     <string name="sort_date" msgid="586080032956151448">"सुधारित केलेल्‍या तारखेनुसार"</string>
     <string name="sort_size" msgid="3350681319735474741">"आकारानुसार"</string>
diff --git a/packages/DocumentsUI/res/values-ms-rMY/strings.xml b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
index 9762c00..7b08e91 100644
--- a/packages/DocumentsUI/res/values-ms-rMY/strings.xml
+++ b/packages/DocumentsUI/res/values-ms-rMY/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Simpan"</string>
     <string name="menu_share" msgid="3075149983979628146">"Kongsi"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Padam"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Pilih \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Pilih Semua"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Pilih semua"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Salin ke..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Papar storan dalaman"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Papar kad SD"</string>
@@ -38,10 +37,10 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Sembunyikan kad SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Papar saiz fail"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Sembunyikan saiz fail"</string>
+    <string name="button_select" msgid="527196987259139214">"Pilih"</string>
     <string name="button_copy" msgid="8706475544635021302">"Salin"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> dipilih"</string>
     <string name="sort_name" msgid="9183560467917256779">"Mengikut nama"</string>
-    <string name="sort_date" msgid="586080032956151448">"Diubah suai mengikut tarikh"</string>
+    <string name="sort_date" msgid="586080032956151448">"Mengikut tarikh diubah"</string>
     <string name="sort_size" msgid="3350681319735474741">"Mengikut saiz"</string>
     <string name="drawer_open" msgid="4545466532430226949">"Tunjukkan akar"</string>
     <string name="drawer_close" msgid="7602734368552123318">"Sembunyikan akar"</string>
diff --git a/packages/DocumentsUI/res/values-my-rMM/strings.xml b/packages/DocumentsUI/res/values-my-rMM/strings.xml
index ac4a8ec..f8d0fd4 100644
--- a/packages/DocumentsUI/res/values-my-rMM/strings.xml
+++ b/packages/DocumentsUI/res/values-my-rMM/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"ရွေးရန်\"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"အားလုံးရွေးရန်"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"အားလုံးကို ရွေးရန်"</string>
     <string name="menu_copy" msgid="3612326052677229148">"သို့ကူးယူရန်…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"စက်ရှိစတိုရုံ ပြပါ"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ကဒ် ပြပါ"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ကဒ် ဖျောက်ပါ"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ဖိုင်အရွယ်အစား ပြပါ"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ခရွေးချယ်ပြီး"</string>
     <string name="sort_name" msgid="9183560467917256779">"အမည်ဖြင့်"</string>
     <string name="sort_date" msgid="586080032956151448">"ပြင်ဆင်မှု ရက်စွဲဖြင့်"</string>
     <string name="sort_size" msgid="3350681319735474741">"အရွယ်အစားဖြင့်"</string>
diff --git a/packages/DocumentsUI/res/values-nb/strings.xml b/packages/DocumentsUI/res/values-nb/strings.xml
index 8f70690..e361b8a 100644
--- a/packages/DocumentsUI/res/values-nb/strings.xml
+++ b/packages/DocumentsUI/res/values-nb/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Lagre"</string>
     <string name="menu_share" msgid="3075149983979628146">"Del"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Slett"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Velg «<xliff:g id="DIRECTORY">^1</xliff:g>»"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Velg alle"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Markér alt"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopiér til …"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Vis den interne lagringen"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Vis SD-kortet"</string>
@@ -38,10 +37,10 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skjul SD-kortet"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Vis filstørrelsen"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Skjul filstørrelsen"</string>
+    <string name="button_select" msgid="527196987259139214">"Velg"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopiér"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> valgt"</string>
     <string name="sort_name" msgid="9183560467917256779">"Etter navn"</string>
-    <string name="sort_date" msgid="586080032956151448">"«Etter dato» endret"</string>
+    <string name="sort_date" msgid="586080032956151448">"Etter endringsdato"</string>
     <string name="sort_size" msgid="3350681319735474741">"Etter størrelse"</string>
     <string name="drawer_open" msgid="4545466532430226949">"Vis røtter"</string>
     <string name="drawer_close" msgid="7602734368552123318">"Skjul røtter"</string>
@@ -49,7 +48,7 @@
     <string name="create_error" msgid="3735649141335444215">"Kunne ikke opprette mappen"</string>
     <string name="query_error" msgid="1222448261663503501">"Kunne ikke undersøke dokumenter"</string>
     <string name="root_recent" msgid="4470053704320518133">"Siste"</string>
-    <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> gratis"</string>
+    <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ledig"</string>
     <string name="root_type_service" msgid="2178854894416775409">"Lagringstjenester"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"Snarveier"</string>
     <string name="root_type_device" msgid="7121342474653483538">"Enheter"</string>
diff --git a/packages/DocumentsUI/res/values-ne-rNP/strings.xml b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
index 283e6f2..fa8c287 100644
--- a/packages/DocumentsUI/res/values-ne-rNP/strings.xml
+++ b/packages/DocumentsUI/res/values-ne-rNP/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"चयनगर्नुहोस् \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"सबै चयन गर्नुहोस्"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"सबै चयन गर्नुहोस्"</string>
     <string name="menu_copy" msgid="3612326052677229148">"यसमा प्रतिलिपि गर्नुहोस् ..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"आन्तरिक भण्डारण देखाउनुहोस्"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD कार्ड देखाउनुहोस्"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD कार्ड लुकाउनुहोस्"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"फाइल आकार देखाउनुहोस्"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> चयन गरियो"</string>
     <string name="sort_name" msgid="9183560467917256779">"नाम अनुसार"</string>
     <string name="sort_date" msgid="586080032956151448">"परिमार्जित मिति अनुसार"</string>
     <string name="sort_size" msgid="3350681319735474741">"आकार अनुसार"</string>
diff --git a/packages/DocumentsUI/res/values-nl/strings.xml b/packages/DocumentsUI/res/values-nl/strings.xml
index ba37d81..1d6b6a8 100644
--- a/packages/DocumentsUI/res/values-nl/strings.xml
+++ b/packages/DocumentsUI/res/values-nl/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Opslaan"</string>
     <string name="menu_share" msgid="3075149983979628146">"Delen"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Verwijderen"</string>
-    <string name="menu_select" msgid="8711270657353563424">"<xliff:g id="DIRECTORY">^1</xliff:g> selecteren"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Alles selecteren"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Alles selecteren"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopiëren naar…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Interne opslag weergeven"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD-kaart weergeven"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD-kaart verbergen"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Bestandsgrootte weergeven"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Bestandsgrootte verbergen"</string>
+    <string name="button_select" msgid="527196987259139214">"Selecteren"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopiëren"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> geselecteerd"</string>
     <string name="sort_name" msgid="9183560467917256779">"Op naam"</string>
     <string name="sort_date" msgid="586080032956151448">"Op aanpassingsdatum"</string>
     <string name="sort_size" msgid="3350681319735474741">"Op grootte"</string>
diff --git a/packages/DocumentsUI/res/values-oc-rFR/strings.xml b/packages/DocumentsUI/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-oc-rFR/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-or-rIN/strings.xml b/packages/DocumentsUI/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..1d6f5fa
--- /dev/null
+++ b/packages/DocumentsUI/res/values-or-rIN/strings.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
+</resources>
diff --git a/packages/DocumentsUI/res/values-pa-rIN/strings.xml b/packages/DocumentsUI/res/values-pa-rIN/strings.xml
index 56e4aa8..a8b3866 100644
--- a/packages/DocumentsUI/res/values-pa-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-pa-rIN/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" ਨੂੰ ਚੁਣੋ"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"ਸਾਰਿਆਂ ਨੂੰ ਚੁਣੋ"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"ਸਾਰੇ ਚੁਣੋ"</string>
     <string name="menu_copy" msgid="3612326052677229148">"ਇਸ ਵਿੱਚ ਕਾਪੀ ਕਰੋ…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ ਦਿਖਾਓ"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD ਕਾਰਡ ਦਿਖਾਓ"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD ਕਾਰਡ ਲੁਕਾਓ"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ਫਾਈਲ ਆਕਾਰ ਦਿਖਾਓ"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ਚੁਣਿਆ"</string>
     <string name="sort_name" msgid="9183560467917256779">"ਨਾਮ ਮੁਤਾਬਕ"</string>
     <string name="sort_date" msgid="586080032956151448">"ਤਾਰੀਖ ਮੁਤਾਬਕ ਸੰਸ਼ੋਧਿਤ"</string>
     <string name="sort_size" msgid="3350681319735474741">"ਆਕਾਰ ਮੁਤਾਬਕ"</string>
diff --git a/packages/DocumentsUI/res/values-pl/strings.xml b/packages/DocumentsUI/res/values-pl/strings.xml
index 79485ef..84e5495 100644
--- a/packages/DocumentsUI/res/values-pl/strings.xml
+++ b/packages/DocumentsUI/res/values-pl/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Zapisz"</string>
     <string name="menu_share" msgid="3075149983979628146">"Udostępnij"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Usuń"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Zaznacz „<xliff:g id="DIRECTORY">^1</xliff:g>”"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Wybierz wszystko"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Zaznacz wszystko"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopiuj do…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Pokaż pamięć wewnętrzną"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Pokaż kartę SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ukryj kartę SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaż rozmiar pliku"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ukryj rozmiar pliku"</string>
+    <string name="button_select" msgid="527196987259139214">"Wybierz"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopiuj"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Wybrano: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Według nazwy"</string>
     <string name="sort_date" msgid="586080032956151448">"Według daty edycji"</string>
     <string name="sort_size" msgid="3350681319735474741">"Według rozmiaru"</string>
@@ -57,7 +56,7 @@
     <string name="empty" msgid="7858882803708117596">"Brak elementów"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Nie można otworzyć pliku"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"Nie można usunąć niektórych dokumentów"</string>
-    <string name="share_via" msgid="8966594246261344259">"Udostępnij przez"</string>
+    <string name="share_via" msgid="8966594246261344259">"Udostępnij przez:"</string>
     <string name="copy_notification_title" msgid="6374299806748219777">"Kopiowanie plików"</string>
     <string name="copy_remaining" msgid="6283790937387975095">"Pozostało: <xliff:g id="DURATION">%s</xliff:g>"</string>
     <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
diff --git a/packages/DocumentsUI/res/values-pt-rBR/strings.xml b/packages/DocumentsUI/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..5e96100
--- /dev/null
+++ b/packages/DocumentsUI/res/values-pt-rBR/strings.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<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">"Documentos"</string>
+    <string name="title_open" msgid="4353228937663917801">"Abrir de"</string>
+    <string name="title_save" msgid="2433679664882857999">"Salvar em"</string>
+    <string name="menu_create_dir" msgid="5947289605844398389">"Criar pasta"</string>
+    <string name="menu_grid" msgid="6878021334497835259">"Visualização em grade"</string>
+    <string name="menu_list" msgid="7279285939892417279">"Visualização em lista"</string>
+    <string name="menu_sort" msgid="7677740407158414452">"Classificar por"</string>
+    <string name="menu_search" msgid="3816712084502856974">"Pesquisar"</string>
+    <string name="menu_settings" msgid="6008033148948428823">"Configurações"</string>
+    <string name="menu_open" msgid="432922957274920903">"Abrir"</string>
+    <string name="menu_save" msgid="2394743337684426338">"Salvar"</string>
+    <string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string>
+    <string name="menu_delete" msgid="8138799623850614177">"Excluir"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Selecionar tudo"</string>
+    <string name="menu_copy" msgid="3612326052677229148">"Copiar para..."</string>
+    <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar armaz. interno"</string>
+    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar cartão SD"</string>
+    <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ocultar armaz. interno"</string>
+    <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar cartão SD"</string>
+    <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. do arquivo"</string>
+    <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. do arquivo"</string>
+    <string name="button_select" msgid="527196987259139214">"Selecionar"</string>
+    <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
+    <string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
+    <string name="sort_date" msgid="586080032956151448">"Por data de modificação"</string>
+    <string name="sort_size" msgid="3350681319735474741">"Por tamanho"</string>
+    <string name="drawer_open" msgid="4545466532430226949">"Mostrar raízes"</string>
+    <string name="drawer_close" msgid="7602734368552123318">"Ocultar raízes"</string>
+    <string name="save_error" msgid="6167009778003223664">"Falha ao salvar o documento"</string>
+    <string name="create_error" msgid="3735649141335444215">"Falha ao criar a pasta"</string>
+    <string name="query_error" msgid="1222448261663503501">"Falha ao consultar documentos"</string>
+    <string name="root_recent" msgid="4470053704320518133">"Recentes"</string>
+    <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> livres"</string>
+    <string name="root_type_service" msgid="2178854894416775409">"Serviços de armazenamento"</string>
+    <string name="root_type_shortcut" msgid="3318760609471618093">"Atalhos"</string>
+    <string name="root_type_device" msgid="7121342474653483538">"Dispositivos"</string>
+    <string name="root_type_apps" msgid="8838065367985945189">"Mais apps"</string>
+    <string name="empty" msgid="7858882803708117596">"Nenhum item"</string>
+    <string name="toast_no_application" msgid="1339885974067891667">"Não é possível abrir o arquivo"</string>
+    <string name="toast_failed_delete" msgid="2180678019407244069">"Não foi possível excluir alguns documentos"</string>
+    <string name="share_via" msgid="8966594246261344259">"Compartilhar via"</string>
+    <string name="copy_notification_title" msgid="6374299806748219777">"Copiando arquivos"</string>
+    <string name="copy_remaining" msgid="6283790937387975095">"<xliff:g id="DURATION">%s</xliff:g> restantes"</string>
+    <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
+      <item quantity="one">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
+      <item quantity="other">Copiando <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos.</item>
+    </plurals>
+    <string name="copy_preparing" msgid="3896202461003039386">"Preparando para copiar..."</string>
+    <plurals name="copy_error_notification_title" formatted="false" msgid="5267616889076217261">
+      <item quantity="one">Não foi possível copiar <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
+      <item quantity="other">Não foi possível copiar <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos</item>
+    </plurals>
+    <string name="notification_touch_for_details" msgid="4483108577842961665">"Toque para ver detalhes"</string>
+    <string name="retry" msgid="7564024179122207376">"Repetir"</string>
+    <string name="copy_failure_alert_content" msgid="3715575000297709082">"Estes arquivos não foram copiados: <xliff:g id="LIST">%1$s</xliff:g>"</string>
+</resources>
diff --git a/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
index 931b85c..ac0367d 100644
--- a/packages/DocumentsUI/res/values-pt-rPT/strings.xml
+++ b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Guardar"</string>
     <string name="menu_share" msgid="3075149983979628146">"Partilhar"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Eliminar"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Selecionar \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Selecionar tudo"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Selecionar tudo"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copiar para…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar mem. armaz. int."</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar cartão SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar cartão SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. de fich."</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. de fich."</string>
+    <string name="button_select" msgid="527196987259139214">"Selecionar"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selecionado(s)"</string>
     <string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
     <string name="sort_date" msgid="586080032956151448">"Por data de modificação"</string>
     <string name="sort_size" msgid="3350681319735474741">"Por tamanho"</string>
diff --git a/packages/DocumentsUI/res/values-pt/strings.xml b/packages/DocumentsUI/res/values-pt/strings.xml
index 534caf0..5e96100 100644
--- a/packages/DocumentsUI/res/values-pt/strings.xml
+++ b/packages/DocumentsUI/res/values-pt/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Salvar"</string>
     <string name="menu_share" msgid="3075149983979628146">"Compartilhar"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Excluir"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Selecionar \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Selecionar tudo"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Selecionar tudo"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copiar para..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Mostrar armaz. interno"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Mostrar cartão SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ocultar cartão SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Mostrar tam. do arquivo"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ocultar tam. do arquivo"</string>
+    <string name="button_select" msgid="527196987259139214">"Selecionar"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copiar"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selecionados"</string>
     <string name="sort_name" msgid="9183560467917256779">"Por nome"</string>
     <string name="sort_date" msgid="586080032956151448">"Por data de modificação"</string>
     <string name="sort_size" msgid="3350681319735474741">"Por tamanho"</string>
diff --git a/packages/DocumentsUI/res/values-ro/strings.xml b/packages/DocumentsUI/res/values-ro/strings.xml
index 7ffe10d..b3fead3 100644
--- a/packages/DocumentsUI/res/values-ro/strings.xml
+++ b/packages/DocumentsUI/res/values-ro/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Salvați"</string>
     <string name="menu_share" msgid="3075149983979628146">"Distribuiți"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Ștergeți"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Selectați „<xliff:g id="DIRECTORY">^1</xliff:g>”"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Selectați-le pe toate"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Selectați tot"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Copiați în…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Afișați stocarea internă"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Afișați cardul SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ascundeți cardul SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Afișați mărime fișiere"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ascundeți mărime fișiere"</string>
+    <string name="button_select" msgid="527196987259139214">"Selectați"</string>
     <string name="button_copy" msgid="8706475544635021302">"Copiați"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> selectate"</string>
     <string name="sort_name" msgid="9183560467917256779">"După nume"</string>
     <string name="sort_date" msgid="586080032956151448">"După data modificării"</string>
     <string name="sort_size" msgid="3350681319735474741">"După dimensiune"</string>
@@ -57,7 +56,7 @@
     <string name="empty" msgid="7858882803708117596">"Nu există elemente"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Fișierul nu poate fi deschis"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"Unele documente nu au putut fi șterse"</string>
-    <string name="share_via" msgid="8966594246261344259">"Distribuiți prin"</string>
+    <string name="share_via" msgid="8966594246261344259">"Trimiteți prin"</string>
     <string name="copy_notification_title" msgid="6374299806748219777">"Se copiază fișierele"</string>
     <string name="copy_remaining" msgid="6283790937387975095">"Timp rămas: <xliff:g id="DURATION">%s</xliff:g>"</string>
     <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
diff --git a/packages/DocumentsUI/res/values-ru/strings.xml b/packages/DocumentsUI/res/values-ru/strings.xml
index 5c2e530..8626176 100644
--- a/packages/DocumentsUI/res/values-ru/strings.xml
+++ b/packages/DocumentsUI/res/values-ru/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"Выбрать папку \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Выбрать все"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Выбрать все"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Копировать в…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Внутренняя память"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD-карта"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Скрыть SD-карту"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Показать размер файлов"</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="mode_selected_count" msgid="459111894725594625">"Выбрано: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"По названию"</string>
     <string name="sort_date" msgid="586080032956151448">"По дате изменения"</string>
     <string name="sort_size" msgid="3350681319735474741">"По размеру"</string>
diff --git a/packages/DocumentsUI/res/values-si-rLK/strings.xml b/packages/DocumentsUI/res/values-si-rLK/strings.xml
index bb025b8..a118b34 100644
--- a/packages/DocumentsUI/res/values-si-rLK/strings.xml
+++ b/packages/DocumentsUI/res/values-si-rLK/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" තෝරන්න"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"සියල්ල තෝරන්න"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"සියල්ල තෝරන්න"</string>
     <string name="menu_copy" msgid="3612326052677229148">"වෙත පිටපත් කරන්න..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"අභ්‍යන්තර ආචයනය පෙන්වන්න"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD කාඩ් පත පෙන්වන්න"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD කාඩ් පත සඟවන්න"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ගොනු ප්‍රමණය පෙන්වන්න"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ක් තෝරාගන්නා ලදි"</string>
     <string name="sort_name" msgid="9183560467917256779">"නමින්"</string>
     <string name="sort_date" msgid="586080032956151448">"වෙනස් කරන ලද දිනයෙන්"</string>
     <string name="sort_size" msgid="3350681319735474741">"ප්‍රමාණය මගින්"</string>
diff --git a/packages/DocumentsUI/res/values-sk/strings.xml b/packages/DocumentsUI/res/values-sk/strings.xml
index 8692913..f2733fb 100644
--- a/packages/DocumentsUI/res/values-sk/strings.xml
+++ b/packages/DocumentsUI/res/values-sk/strings.xml
@@ -29,17 +29,16 @@
     <string name="menu_save" msgid="2394743337684426338">"Uložiť"</string>
     <string name="menu_share" msgid="3075149983979628146">"Zdieľať"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Odstrániť"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Vyberte adresár <xliff:g id="DIRECTORY">^1</xliff:g>"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Vybrať všetko"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Vybrať všetko"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopírovať do…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Zobraziť interné úložisko"</string>
-    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Zobraziť kartu SD"</string>
+    <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Zobraziť SD kartu"</string>
     <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Skryť interné úložisko"</string>
-    <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skryť kartu SD"</string>
+    <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skryť SD kartu"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Zobraziť veľkosť súboru"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Skryť veľkosť súboru"</string>
+    <string name="button_select" msgid="527196987259139214">"Vybrať"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopírovať"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Vybraté: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Podľa názvu"</string>
     <string name="sort_date" msgid="586080032956151448">"Podľa dátumu zmeny"</string>
     <string name="sort_size" msgid="3350681319735474741">"Podľa veľkosti"</string>
@@ -49,7 +48,7 @@
     <string name="create_error" msgid="3735649141335444215">"Priečinok sa nepodarilo vytvoriť"</string>
     <string name="query_error" msgid="1222448261663503501">"Zoznam dokumentov sa nepodarilo načítať"</string>
     <string name="root_recent" msgid="4470053704320518133">"Nedávne"</string>
-    <string name="root_available_bytes" msgid="8568452858617033281">"Voľné: <xliff:g id="SIZE">%1$s</xliff:g>"</string>
+    <string name="root_available_bytes" msgid="8568452858617033281">"Voľné <xliff:g id="SIZE">%1$s</xliff:g>"</string>
     <string name="root_type_service" msgid="2178854894416775409">"Služby úložiska"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"Skratky"</string>
     <string name="root_type_device" msgid="7121342474653483538">"Zariadenia"</string>
@@ -57,7 +56,7 @@
     <string name="empty" msgid="7858882803708117596">"Žiadne položky"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Súbor sa nepodarilo otvoriť"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"Niektoré dokumenty sa nepodarilo odstrániť"</string>
-    <string name="share_via" msgid="8966594246261344259">"Zdieľať pomocou"</string>
+    <string name="share_via" msgid="8966594246261344259">"Zdieľať"</string>
     <string name="copy_notification_title" msgid="6374299806748219777">"Kopírovanie súborov"</string>
     <string name="copy_remaining" msgid="6283790937387975095">"Zostáva: <xliff:g id="DURATION">%s</xliff:g>"</string>
     <plurals name="copy_begin" formatted="false" msgid="9071199452634086365">
diff --git a/packages/DocumentsUI/res/values-sl/strings.xml b/packages/DocumentsUI/res/values-sl/strings.xml
index 2c1171e..c753c57 100644
--- a/packages/DocumentsUI/res/values-sl/strings.xml
+++ b/packages/DocumentsUI/res/values-sl/strings.xml
@@ -17,8 +17,8 @@
 <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">"Dokumenti"</string>
-    <string name="title_open" msgid="4353228937663917801">"Odpiranje iz"</string>
-    <string name="title_save" msgid="2433679664882857999">"Shranjevanje v"</string>
+    <string name="title_open" msgid="4353228937663917801">"Odpri iz mape"</string>
+    <string name="title_save" msgid="2433679664882857999">"Shrani v"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Ustvarjanje mape"</string>
     <string name="menu_grid" msgid="6878021334497835259">"Mrežni pogled"</string>
     <string name="menu_list" msgid="7279285939892417279">"Pogled seznama"</string>
@@ -29,17 +29,16 @@
     <string name="menu_save" msgid="2394743337684426338">"Shrani"</string>
     <string name="menu_share" msgid="3075149983979628146">"Skupna raba"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Izbriši"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Izbira mape »<xliff:g id="DIRECTORY">^1</xliff:g>«"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Izberi vse"</string>
-    <string name="menu_copy" msgid="3612326052677229148">"Kopiranje v …"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Izberi vse"</string>
+    <string name="menu_copy" msgid="3612326052677229148">"Kopiraj v …"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Pokaži notranjo shrambo"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Pokaži kartico SD"</string>
     <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Skrij notranjo shrambo"</string>
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Skrij kartico SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Pokaži velikost datoteke"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Skrij velikost datoteke"</string>
+    <string name="button_select" msgid="527196987259139214">"Izberi"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopiraj"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Št. izbranih: <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Po imenu"</string>
     <string name="sort_date" msgid="586080032956151448">"Po datumu spremembe"</string>
     <string name="sort_size" msgid="3350681319735474741">"Po velikosti"</string>
diff --git a/packages/DocumentsUI/res/values-sq-rAL/strings.xml b/packages/DocumentsUI/res/values-sq-rAL/strings.xml
index 37c063f..6c04aaf 100644
--- a/packages/DocumentsUI/res/values-sq-rAL/strings.xml
+++ b/packages/DocumentsUI/res/values-sq-rAL/strings.xml
@@ -18,9 +18,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="2783841764617238354">"Dokumente"</string>
     <string name="title_open" msgid="4353228937663917801">"Hap nga"</string>
-    <string name="title_save" msgid="2433679664882857999">"Ruaje në"</string>
+    <string name="title_save" msgid="2433679664882857999">"Ruaje te"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Krijo dosje"</string>
-    <string name="menu_grid" msgid="6878021334497835259">"Pamje \"sitë\""</string>
+    <string name="menu_grid" msgid="6878021334497835259">"Pamje rrjete"</string>
     <string name="menu_list" msgid="7279285939892417279">"Pamje liste"</string>
     <string name="menu_sort" msgid="7677740407158414452">"Rendit sipas"</string>
     <string name="menu_search" msgid="3816712084502856974">"Kërko"</string>
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Ruaj"</string>
     <string name="menu_share" msgid="3075149983979628146">"Shpërnda"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Fshi"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Përzgjidh \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Zgjidhi të gjitha"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Zgjidhi të gjitha"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopjo te..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Trego hapësirën e brendshme ruajtëse"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Shfaq kartën SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Fshih kartën SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Shfaq madhësinë e skedarit"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Fshih madhësinë e skedarit"</string>
+    <string name="button_select" msgid="527196987259139214">"Zgjidh"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopjo"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> dokumente u përzgjodhën"</string>
     <string name="sort_name" msgid="9183560467917256779">"Sipas emrit"</string>
     <string name="sort_date" msgid="586080032956151448">"Sipas datës së modifikimit"</string>
     <string name="sort_size" msgid="3350681319735474741">"Sipas madhësisë"</string>
diff --git a/packages/DocumentsUI/res/values-sr/strings.xml b/packages/DocumentsUI/res/values-sr/strings.xml
index 9db6e13..dbb4b88 100644
--- a/packages/DocumentsUI/res/values-sr/strings.xml
+++ b/packages/DocumentsUI/res/values-sr/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"Изабери „<xliff:g id="DIRECTORY">^1</xliff:g>“"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Изабери све"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Изабери све"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Копирај на..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Прикажи интерну меморију"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Прикажи SD картицу"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Сакриј SD картицу"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Прикажи величину датотеке"</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="mode_selected_count" msgid="459111894725594625">"Изабрано је <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Према имену"</string>
     <string name="sort_date" msgid="586080032956151448">"Према датуму измене"</string>
     <string name="sort_size" msgid="3350681319735474741">"Према величини"</string>
diff --git a/packages/DocumentsUI/res/values-sv/strings.xml b/packages/DocumentsUI/res/values-sv/strings.xml
index 6e2eddf..2bb6653 100644
--- a/packages/DocumentsUI/res/values-sv/strings.xml
+++ b/packages/DocumentsUI/res/values-sv/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Spara"</string>
     <string name="menu_share" msgid="3075149983979628146">"Dela"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Ta bort"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Välj <xliff:g id="DIRECTORY">^1</xliff:g>"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Markera alla"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Markera allt"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopiera till …"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Visa internminne"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Visa SD-kort"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Dölj SD-kort"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Visa filstorlek"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Dölj filstorlek"</string>
+    <string name="button_select" msgid="527196987259139214">"Välj"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopiera"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Har valt <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Efter namn"</string>
     <string name="sort_date" msgid="586080032956151448">"Efter ändringsdatum"</string>
     <string name="sort_size" msgid="3350681319735474741">"Efter storlek"</string>
diff --git a/packages/DocumentsUI/res/values-sw/strings.xml b/packages/DocumentsUI/res/values-sw/strings.xml
index 5a3dd37..5151a94 100644
--- a/packages/DocumentsUI/res/values-sw/strings.xml
+++ b/packages/DocumentsUI/res/values-sw/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Hifadhi"</string>
     <string name="menu_share" msgid="3075149983979628146">"Shiriki"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Futa"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Chagua \" <xliff:g id="DIRECTORY">^1</xliff:g> \""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Chagua Zote"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Chagua zote"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Nakili kwenda..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Onyesha hifadhi ya ndani"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Onyesha kadi ya SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ficha kadi ya SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Onyesha ukubwa wa faili"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ficha ukubwa wa faili"</string>
+    <string name="button_select" msgid="527196987259139214">"Teua"</string>
     <string name="button_copy" msgid="8706475544635021302">"Nakili"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> zimechaguliwa"</string>
     <string name="sort_name" msgid="9183560467917256779">"Kwa jina"</string>
     <string name="sort_date" msgid="586080032956151448">"Kwa tarehe viliporekebishwa"</string>
     <string name="sort_size" msgid="3350681319735474741">"Kwa ukubwa"</string>
diff --git a/packages/DocumentsUI/res/values-ta-rIN/strings.xml b/packages/DocumentsUI/res/values-ta-rIN/strings.xml
index cc6b1df..e67df98 100644
--- a/packages/DocumentsUI/res/values-ta-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-ta-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="app_label" msgid="2783841764617238354">"ஆவணங்கள்"</string>
-    <string name="title_open" msgid="4353228937663917801">"இதிலிருந்து திற"</string>
+    <string name="title_open" msgid="4353228937663917801">"இதில் திற"</string>
     <string name="title_save" msgid="2433679664882857999">"இதில் சேமி"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"கோப்புறையை உருவாக்கு"</string>
     <string name="menu_grid" msgid="6878021334497835259">"கட்டக் காட்சி"</string>
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" ஐத் தேர்ந்தெடு"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"எல்லாவற்றையும் தேர்ந்தெடு"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"எல்லாவற்றையும் தேர்ந்தெடு"</string>
     <string name="menu_copy" msgid="3612326052677229148">"இங்கு நகலெடு…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"அகச் சேமிப்பகத்தைக் காட்டு"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD கார்டைக் காட்டு"</string>
@@ -38,10 +37,10 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD கார்டை மறை"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"கோப்பு அளவைக் காட்டு"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டன"</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>
@@ -54,7 +53,7 @@
     <string name="root_type_shortcut" msgid="3318760609471618093">"குறுக்குவழிகள்"</string>
     <string name="root_type_device" msgid="7121342474653483538">"சாதனங்கள்"</string>
     <string name="root_type_apps" msgid="8838065367985945189">"மேலும் பயன்பாடுகள்"</string>
-    <string name="empty" msgid="7858882803708117596">"உருப்படிகள் இல்லை"</string>
+    <string name="empty" msgid="7858882803708117596">"எதுவும் இல்லை"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"கோப்பைத் திறக்க முடியவில்லை"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"சில ஆவணங்களை நீக்க முடியவில்லை"</string>
     <string name="share_via" msgid="8966594246261344259">"இதன் வழியாகப் பகிர்"</string>
diff --git a/packages/DocumentsUI/res/values-te-rIN/strings.xml b/packages/DocumentsUI/res/values-te-rIN/strings.xml
index cf13ec5..a8f587a 100644
--- a/packages/DocumentsUI/res/values-te-rIN/strings.xml
+++ b/packages/DocumentsUI/res/values-te-rIN/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\"ని ఎంచుకోండి"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"అన్నీ ఎంచుకోండి"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"అన్నీ ఎంచుకోండి"</string>
     <string name="menu_copy" msgid="3612326052677229148">"ఇక్కడికి కాపీ చేయి…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"అంతర్గత నిల్వను చూపు"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD కార్డ్‌ను చూపు"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD కార్డ్‌ను దాచు"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"ఫైల్ పరిమాణాన్ని చూపు"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ఎంచుకోబడ్డాయి"</string>
     <string name="sort_name" msgid="9183560467917256779">"పేరు ద్వారా"</string>
     <string name="sort_date" msgid="586080032956151448">"సవరించిన తేదీ ద్వారా"</string>
     <string name="sort_size" msgid="3350681319735474741">"పరిమాణం ద్వారా"</string>
@@ -49,7 +48,7 @@
     <string name="create_error" msgid="3735649141335444215">"ఫోల్డర్‌ను సృష్టించడంలో విఫలమైంది"</string>
     <string name="query_error" msgid="1222448261663503501">"పత్రాల కోసం ప్రశ్నించడంలో విఫలమైంది"</string>
     <string name="root_recent" msgid="4470053704320518133">"ఇటీవల"</string>
-    <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ఉచితం"</string>
+    <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> ఖాళీ"</string>
     <string name="root_type_service" msgid="2178854894416775409">"నిల్వ పరికరాలు"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"సత్వరమార్గాలు"</string>
     <string name="root_type_device" msgid="7121342474653483538">"పరికరాలు"</string>
diff --git a/packages/DocumentsUI/res/values-th/strings.xml b/packages/DocumentsUI/res/values-th/strings.xml
index ac7bd5d..101dfbb 100644
--- a/packages/DocumentsUI/res/values-th/strings.xml
+++ b/packages/DocumentsUI/res/values-th/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"เลือก \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"เลือกทั้งหมด"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"เลือกทั้งหมด"</string>
     <string name="menu_copy" msgid="3612326052677229148">"คัดลอกไปยัง…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"แสดงที่จัดเก็บภายใน"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"แสดงการ์ด SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"ซ่อนการ์ด SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"แสดงขนาดไฟล์"</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="mode_selected_count" msgid="459111894725594625">"เลือกไว้ <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"ตามชื่อ"</string>
     <string name="sort_date" msgid="586080032956151448">"ตามวันที่ที่ปรับเปลี่ยน"</string>
     <string name="sort_size" msgid="3350681319735474741">"ตามขนาด"</string>
diff --git a/packages/DocumentsUI/res/values-tl/strings.xml b/packages/DocumentsUI/res/values-tl/strings.xml
index 2d64ca9..1a06cd4 100644
--- a/packages/DocumentsUI/res/values-tl/strings.xml
+++ b/packages/DocumentsUI/res/values-tl/strings.xml
@@ -20,17 +20,16 @@
     <string name="title_open" msgid="4353228937663917801">"Buksan mula sa"</string>
     <string name="title_save" msgid="2433679664882857999">"I-save sa"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Gumawa ng folder"</string>
-    <string name="menu_grid" msgid="6878021334497835259">"View ng grid"</string>
-    <string name="menu_list" msgid="7279285939892417279">"View ng listahan"</string>
-    <string name="menu_sort" msgid="7677740407158414452">"Pag-uri-uriin ayon sa"</string>
+    <string name="menu_grid" msgid="6878021334497835259">"View na grid"</string>
+    <string name="menu_list" msgid="7279285939892417279">"View na listahan"</string>
+    <string name="menu_sort" msgid="7677740407158414452">"Uriin ayon sa"</string>
     <string name="menu_search" msgid="3816712084502856974">"Maghanap"</string>
     <string name="menu_settings" msgid="6008033148948428823">"Mga Setting"</string>
     <string name="menu_open" msgid="432922957274920903">"Buksan"</string>
     <string name="menu_save" msgid="2394743337684426338">"I-save"</string>
     <string name="menu_share" msgid="3075149983979628146">"Ibahagi"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Tanggalin"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Piliin ang \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Piliin Lahat"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Piliin lahat"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopyahin sa..."</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ipakita internal storage"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Ipakita ang SD card"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Itago ang SD card"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Ipakita ang laki ng file"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Itago ang laki ng file"</string>
+    <string name="button_select" msgid="527196987259139214">"Pumili"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopyahin"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> ang pinili"</string>
     <string name="sort_name" msgid="9183560467917256779">"Ayon sa pangalan"</string>
     <string name="sort_date" msgid="586080032956151448">"Ayon sa petsa ng pagbago"</string>
     <string name="sort_size" msgid="3350681319735474741">"Ayon sa laki"</string>
diff --git a/packages/DocumentsUI/res/values-tr/strings.xml b/packages/DocumentsUI/res/values-tr/strings.xml
index bda4543..9258065 100644
--- a/packages/DocumentsUI/res/values-tr/strings.xml
+++ b/packages/DocumentsUI/res/values-tr/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Kaydet"</string>
     <string name="menu_share" msgid="3075149983979628146">"Paylaş"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Sil"</string>
-    <string name="menu_select" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" dizinini seç"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Tümünü Seç"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Tümünü seç"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopyala…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Dahili depolamayı göster"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD kartı göster"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD kartı gizle"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Dosya boyutunu göster"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Dosya boyutunu gizle"</string>
+    <string name="button_select" msgid="527196987259139214">"Seç"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopyala"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> tane seçildi"</string>
     <string name="sort_name" msgid="9183560467917256779">"Ada göre"</string>
     <string name="sort_date" msgid="586080032956151448">"Değişiklik tarihine göre"</string>
     <string name="sort_size" msgid="3350681319735474741">"Boyuta göre"</string>
diff --git a/packages/DocumentsUI/res/values-ug/strings.xml b/packages/DocumentsUI/res/values-ug/strings.xml
index 66f0536..a74da1f 100644
--- a/packages/DocumentsUI/res/values-ug/strings.xml
+++ b/packages/DocumentsUI/res/values-ug/strings.xml
@@ -15,35 +15,84 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the documents application [CHAR LIMIT=32] -->
   <string name="app_label">پۈتۈكلەر</string>
+  <!-- Action bar title prompting user to choose a location to open a document from [CHAR LIMIT=32] -->
   <string name="title_open">ئېچىش ئورنى</string>
+  <!-- Action bar title prompting user to choose a location to save a document to [CHAR LIMIT=32] -->
   <string name="title_save">ساقلاش ئورنى</string>
+  <!-- Menu item that creates a new directory/folder at the current location [CHAR LIMIT=24] -->
   <string name="menu_create_dir">قىسقۇچ قۇر</string>
+  <!-- Menu item that switches view to show documents as a large-format grid of thumbnails [CHAR LIMIT=24] -->
   <string name="menu_grid">سېتكا كۆرۈنۈش</string>
+  <!-- Menu item that switches view to show documents as a list [CHAR LIMIT=24] -->
   <string name="menu_list">تىزىم كۆرۈنۈشى</string>
+  <!-- Menu item that switches the criteria with which documents are sorted [CHAR LIMIT=24] -->
   <string name="menu_sort">تەرتىپلەش ئۇسۇلى</string>
+  <!-- Menu item that enters a mode to search for documents [CHAR LIMIT=24] -->
   <string name="menu_search">ئىزدە</string>
+  <!-- Menu item that enters activity to change settings [CHAR LIMIT=24] -->
   <string name="menu_settings">تەڭشەكلەر</string>
+  <!-- Menu item title that opens the selected documents [CHAR LIMIT=24] -->
   <string name="menu_open">ئاچ</string>
+  <!-- Menu item title that saves the current document [CHAR LIMIT=24] -->
   <string name="menu_save">ساقلا</string>
+  <!-- Menu item title that shares the selected documents [CHAR LIMIT=24] -->
   <string name="menu_share">ھەمبەھىر</string>
+  <!-- Menu item title that deletes the selected documents [CHAR LIMIT=24] -->
   <string name="menu_delete">ئۆچۈر</string>
+  <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+  <!-- Menu item title that copies the selected documents [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides internal storage built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that hides SD cards built into the device [CHAR LIMIT=24] -->
+  <!-- Menu item that reveals the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Menu item that hides the sizes of displayed files [CHAR LIMIT=24] -->
+  <!-- Button label that select the current directory [CHAR LIMIT=24] -->
+  <!-- Button label that copies files to the current directory [CHAR LIMIT=24] -->
+  <!-- Mode that sorts documents by their display name alphabetically [CHAR LIMIT=24] -->
   <string name="sort_name">ئاتى بويىچە</string>
+  <!-- Mode that sorts documents by their last modified time in descending order; most recent first [CHAR LIMIT=24] -->
   <string name="sort_date">ئۆزگەرتكەن چېسلا بويىچە</string>
+  <!-- Mode that sorts documents by their file size in descending order; largest first [CHAR LIMIT=24] -->
   <string name="sort_size">چوڭلۇقى بويىچە</string>
+  <!-- Accessibility title to open the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_open">غول مۇندەرىجە كۆرسەت</string>
+  <!-- Accessibility title to close the drawer showing all roots where documents can be stored [CHAR LIMIT=32] -->
   <string name="drawer_close">غول مۇندەرىجە يوشۇر</string>
+  <!-- Toast shown when saving a document failed with an error [CHAR LIMIT=48] -->
   <string name="save_error">پۈتۈكنى ساقلىيالمىدى</string>
+  <!-- Toast shown when creating a folder failed with an error [CHAR LIMIT=48] -->
   <string name="create_error">قىسقۇچ قۇرالمىدى</string>
+  <!-- Error message shown when querying for a list of documents failed [CHAR LIMIT=48] -->
   <string name="query_error">پۈتۈكنى سۈرۈشتۈرەلمىدى</string>
+  <!-- Title of storage root location that contains recently modified or used documents [CHAR LIMIT=24] -->
   <string name="root_recent">يېقىنقى</string>
+  <!-- Subtitle of storage root indicating the total free space available, in bytes [CHAR LIMIT=24] -->
   <string name="root_available_bytes"><xliff:g id="SIZE">%1$s</xliff:g> بوش</string>
+  <!-- Header title for list of storage roots that contains cloud services [CHAR LIMIT=24] -->
   <string name="root_type_service">ساقلاش مۇلازىمەتلىرى</string>
+  <!-- Header title for list of storage roots that contains shortcuts to documents that may be available elsewhere [CHAR LIMIT=24] -->
   <string name="root_type_shortcut">قىسقا يول</string>
+  <!-- Header title for list of storage roots that contains physical devices [CHAR LIMIT=24] -->
   <string name="root_type_device">ئۈسكۈنەلەر</string>
+  <!-- Header title for list of additional apps that can provide documents [CHAR LIMIT=24] -->
   <string name="root_type_apps">تېخىمۇ كۆپ ئەپلەر</string>
+  <!-- Text shown when a directory of documents is empty [CHAR LIMIT=24] -->
   <string name="empty">تۈرلەر يوق</string>
+  <!-- Toast shown when no app can be found to open the selected document [CHAR LIMIT=48] -->
   <string name="toast_no_application">ھۆججەت ئاچالمىدى</string>
+  <!-- Toast shown when some of the selected documents failed to be deleted [CHAR LIMIT=48] -->
   <string name="toast_failed_delete">بەزى پۈتۈكلەرنى ئۆچۈرەلمەيدۇ</string>
+  <!-- Title of dialog when prompting user to select an app to share documents with [CHAR LIMIT=32] -->
   <string name="share_via">ھەمبەھىر ئۇسۇلى</string>
+  <!-- Title of the copy notification [CHAR LIMIT=24] -->
+  <!-- Text shown on the copy notification to indicate remaining time, in minutes [CHAR LIMIT=24] -->
+  <!-- Toast shown when a file copy is kicked off -->
+  <!-- Text shown on the copy notification while DocumentsUI performs setup in preparation for copying files [CHAR LIMIT=32] -->
+  <!-- Title of the copy error notification [CHAR LIMIT=48] -->
+  <!-- Second line for notifications saying that more information will be shown after touching [CHAR LIMIT=48] -->
+  <!-- Label of a dialog button for retrying a failed operation [CHAR LIMIT=24] -->
+  <!-- Contents of the copying failure alert dialog. [CHAR LIMIT=48] -->
 </resources>
diff --git a/packages/DocumentsUI/res/values-uk/strings.xml b/packages/DocumentsUI/res/values-uk/strings.xml
index 999dc70..c4c92de 100644
--- a/packages/DocumentsUI/res/values-uk/strings.xml
+++ b/packages/DocumentsUI/res/values-uk/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"Вибрати каталог \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Вибрати все"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Вибрати все"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Копіювати в…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Показати внутр. пам’ять"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Показати карту SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Сховати карту SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Показати розмір файлу"</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="mode_selected_count" msgid="459111894725594625">"Вибрано <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"За назвою"</string>
     <string name="sort_date" msgid="586080032956151448">"За датою змінення"</string>
     <string name="sort_size" msgid="3350681319735474741">"За розміром"</string>
@@ -54,7 +53,7 @@
     <string name="root_type_shortcut" msgid="3318760609471618093">"Ярлики"</string>
     <string name="root_type_device" msgid="7121342474653483538">"Пристрої"</string>
     <string name="root_type_apps" msgid="8838065367985945189">"Інші програми"</string>
-    <string name="empty" msgid="7858882803708117596">"Немає елементів"</string>
+    <string name="empty" msgid="7858882803708117596">"Нічого немає"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Не вдалося відкрити файл"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"Не вдалося видалити деякі документи"</string>
     <string name="share_via" msgid="8966594246261344259">"Надіслати через"</string>
diff --git a/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
index 31c1909..e350c32 100644
--- a/packages/DocumentsUI/res/values-ur-rPK/strings.xml
+++ b/packages/DocumentsUI/res/values-ur-rPK/strings.xml
@@ -29,17 +29,16 @@
     <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" msgid="8711270657353563424">"\"<xliff:g id="DIRECTORY">^1</xliff:g>\" منتخب کریں"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"سبھی منتخب کریں"</string>
-    <string name="menu_copy" msgid="3612326052677229148">"اس پر کاپی ہو رہی ہے…"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"سبھی کو منتخب کریں"</string>
+    <string name="menu_copy" msgid="3612326052677229148">"اس میں کاپی کریں…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"داخلی اسٹوریج دکھائیں"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"‏SD کارڈ دکھائیں"</string>
     <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"داخلی اسٹوریج چھپائیں"</string>
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"‏SD کارڈ چھپائیں"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"فائل سائز دکھائیں"</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="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> کو منتخب کیا گیا"</string>
     <string name="sort_name" msgid="9183560467917256779">"نام کے لحاظ سے"</string>
     <string name="sort_date" msgid="586080032956151448">"ترمیم کی تاریخ کے لحاظ سے"</string>
     <string name="sort_size" msgid="3350681319735474741">"سائز کے لحاظ سے"</string>
diff --git a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
index 1b15b9f..2450645 100644
--- a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
+++ b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml
@@ -20,26 +20,25 @@
     <string name="title_open" msgid="4353228937663917801">"Ochish"</string>
     <string name="title_save" msgid="2433679664882857999">"Saqlash"</string>
     <string name="menu_create_dir" msgid="5947289605844398389">"Jild yaratish"</string>
-    <string name="menu_grid" msgid="6878021334497835259">"Katakchalar ko‘rinishida"</string>
+    <string name="menu_grid" msgid="6878021334497835259">"Katak ko‘rinishida"</string>
     <string name="menu_list" msgid="7279285939892417279">"Ro‘yxat ko‘rinishida"</string>
-    <string name="menu_sort" msgid="7677740407158414452">"Saralash:"</string>
-    <string name="menu_search" msgid="3816712084502856974">"Izlash"</string>
+    <string name="menu_sort" msgid="7677740407158414452">"Saralash"</string>
+    <string name="menu_search" msgid="3816712084502856974">"Qidirish"</string>
     <string name="menu_settings" msgid="6008033148948428823">"Sozlamalar"</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_delete" msgid="8138799623850614177">"O‘chirish"</string>
-    <string name="menu_select" msgid="8711270657353563424">"“<xliff:g id="DIRECTORY">^1</xliff:g>” jildini tanlash"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Barchasini tanlash"</string>
-    <string name="menu_copy" msgid="3612326052677229148">"...ga nusxalash"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Barchasini belgilash"</string>
+    <string name="menu_copy" msgid="3612326052677229148">"Nusxalash…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Ichki xotirani ko‘rsatish"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"SD kartani ko‘rsatish"</string>
     <string name="menu_advanced_hide" product="nosdcard" msgid="4218809952721972589">"Ichki xotirani berkitish"</string>
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"SD kartani berkitish"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Fayl hajmini ko‘rsatish"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Fayl hajmini berkitish"</string>
+    <string name="button_select" msgid="527196987259139214">"Tanlash"</string>
     <string name="button_copy" msgid="8706475544635021302">"Nusxalash"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> belgilandi"</string>
     <string name="sort_name" msgid="9183560467917256779">"Nomi bo‘yicha"</string>
     <string name="sort_date" msgid="586080032956151448">"Tahrir sanasi bo‘yicha"</string>
     <string name="sort_size" msgid="3350681319735474741">"Hajmi bo‘yicha"</string>
@@ -48,13 +47,13 @@
     <string name="save_error" msgid="6167009778003223664">"Hujjat saqlanmadi"</string>
     <string name="create_error" msgid="3735649141335444215">"Jild yaratilmadi"</string>
     <string name="query_error" msgid="1222448261663503501">"Hujjatlar so‘rovi jo‘natilmadi"</string>
-    <string name="root_recent" msgid="4470053704320518133">"So‘nggi"</string>
+    <string name="root_recent" msgid="4470053704320518133">"Yaqinda"</string>
     <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> bo‘sh"</string>
     <string name="root_type_service" msgid="2178854894416775409">"Xotira xizmatlari"</string>
     <string name="root_type_shortcut" msgid="3318760609471618093">"Yorliqlar"</string>
     <string name="root_type_device" msgid="7121342474653483538">"Qurilmalar"</string>
     <string name="root_type_apps" msgid="8838065367985945189">"Ko‘proq dasturlar"</string>
-    <string name="empty" msgid="7858882803708117596">"Hech nima yo‘q"</string>
+    <string name="empty" msgid="7858882803708117596">"Hech narsa yo‘q"</string>
     <string name="toast_no_application" msgid="1339885974067891667">"Fayl ochilmadi"</string>
     <string name="toast_failed_delete" msgid="2180678019407244069">"Ba’zi hujjatlar o‘chirilmadi"</string>
     <string name="share_via" msgid="8966594246261344259">"Quyidagi orqali ulashish"</string>
diff --git a/packages/DocumentsUI/res/values-vi/strings.xml b/packages/DocumentsUI/res/values-vi/strings.xml
index 3bd7d78..9d1dfa8 100644
--- a/packages/DocumentsUI/res/values-vi/strings.xml
+++ b/packages/DocumentsUI/res/values-vi/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Lưu"</string>
     <string name="menu_share" msgid="3075149983979628146">"Chia sẻ"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Xóa"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Chọn \"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Chọn tất cả"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Chọn tất cả"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Sao chép vào…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Hiển thị bộ nhớ trong"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Hiển thị thẻ SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Ẩn thẻ SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Hiển thị kích thước tệp"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Ẩn kích thước tệp"</string>
+    <string name="button_select" msgid="527196987259139214">"Chọn"</string>
     <string name="button_copy" msgid="8706475544635021302">"Sao chép"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"Đã chọn <xliff:g id="COUNT">%1$d</xliff:g>"</string>
     <string name="sort_name" msgid="9183560467917256779">"Theo tên"</string>
     <string name="sort_date" msgid="586080032956151448">"Theo ngày sửa đổi"</string>
     <string name="sort_size" msgid="3350681319735474741">"Theo kích thước"</string>
diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
index 96e3e3d..1d005b0 100644
--- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rCN/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"选择“<xliff:g id="DIRECTORY">^1</xliff:g>”"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"全选"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"全选"</string>
     <string name="menu_copy" msgid="3612326052677229148">"复制到…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"显示内部存储设备"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"显示SD卡"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"隐藏SD卡"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"显示文件大小"</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="mode_selected_count" msgid="459111894725594625">"已选择<xliff:g id="COUNT">%1$d</xliff:g>项"</string>
     <string name="sort_name" msgid="9183560467917256779">"按名称"</string>
     <string name="sort_date" msgid="586080032956151448">"按修改日期"</string>
     <string name="sort_size" msgid="3350681319735474741">"按大小"</string>
diff --git a/packages/DocumentsUI/res/values-zh-rHK/strings.xml b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
index 1fa402e..a4ff79f 100644
--- a/packages/DocumentsUI/res/values-zh-rHK/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rHK/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"選取「<xliff:g id="DIRECTORY">^1</xliff:g>」"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"全部選取"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"全部選取"</string>
     <string name="menu_copy" msgid="3612326052677229148">"複製到…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"顯示內部儲存空間"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"顯示 SD 卡"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"隱藏 SD 卡"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"顯示檔案大小"</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="mode_selected_count" msgid="459111894725594625">"已選取 <xliff:g id="COUNT">%1$d</xliff:g> 個"</string>
     <string name="sort_name" msgid="9183560467917256779">"按名稱"</string>
     <string name="sort_date" msgid="586080032956151448">"按修改日期"</string>
     <string name="sort_size" msgid="3350681319735474741">"按大小"</string>
diff --git a/packages/DocumentsUI/res/values-zh-rTW/strings.xml b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
index 8de8402..f42dd96 100644
--- a/packages/DocumentsUI/res/values-zh-rTW/strings.xml
+++ b/packages/DocumentsUI/res/values-zh-rTW/strings.xml
@@ -29,8 +29,7 @@
     <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" msgid="8711270657353563424">"選取「<xliff:g id="DIRECTORY">^1</xliff:g>」"</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"全選"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"全選"</string>
     <string name="menu_copy" msgid="3612326052677229148">"複製到…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"顯示內部儲存空間"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"顯示 SD 卡"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"隱藏 SD 卡"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"顯示檔案大小"</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="mode_selected_count" msgid="459111894725594625">"已選取 <xliff:g id="COUNT">%1$d</xliff:g> 個項目"</string>
     <string name="sort_name" msgid="9183560467917256779">"依名稱"</string>
     <string name="sort_date" msgid="586080032956151448">"依修改日期"</string>
     <string name="sort_size" msgid="3350681319735474741">"依大小"</string>
diff --git a/packages/DocumentsUI/res/values-zu/strings.xml b/packages/DocumentsUI/res/values-zu/strings.xml
index 78dd0a6..2f2acb4 100644
--- a/packages/DocumentsUI/res/values-zu/strings.xml
+++ b/packages/DocumentsUI/res/values-zu/strings.xml
@@ -29,8 +29,7 @@
     <string name="menu_save" msgid="2394743337684426338">"Londoloza"</string>
     <string name="menu_share" msgid="3075149983979628146">"Yabelana"</string>
     <string name="menu_delete" msgid="8138799623850614177">"Susa"</string>
-    <string name="menu_select" msgid="8711270657353563424">"Khetha i-\"<xliff:g id="DIRECTORY">^1</xliff:g>\""</string>
-    <string name="menu_select_all" msgid="4320518282375109902">"Khetha konke"</string>
+    <string name="menu_select_all" msgid="8323579667348729928">"Khetha konke"</string>
     <string name="menu_copy" msgid="3612326052677229148">"Kopishela ku…"</string>
     <string name="menu_advanced_show" product="nosdcard" msgid="4693652895715631401">"Bonisa isitoreji sangaphakathi"</string>
     <string name="menu_advanced_show" product="default" msgid="5792182900084144261">"Bonisa ikhadi le-SD"</string>
@@ -38,8 +37,8 @@
     <string name="menu_advanced_hide" product="default" msgid="4845869969015718848">"Fihla ikhadi le-SD"</string>
     <string name="menu_file_size_show" msgid="3240323619260823076">"Bonisa usayizi wefayela"</string>
     <string name="menu_file_size_hide" msgid="8881975928502581042">"Fihla usayizi wefayela"</string>
+    <string name="button_select" msgid="527196987259139214">"Khetha"</string>
     <string name="button_copy" msgid="8706475544635021302">"Kopisha"</string>
-    <string name="mode_selected_count" msgid="459111894725594625">"<xliff:g id="COUNT">%1$d</xliff:g> okukhethiwe"</string>
     <string name="sort_name" msgid="9183560467917256779">"Ngegama"</string>
     <string name="sort_date" msgid="586080032956151448">"Ngedethi yokuguqula"</string>
     <string name="sort_size" msgid="3350681319735474741">"Ngosayizi"</string>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index fc46716..a08f375 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -755,7 +755,7 @@ abstract class BaseActivity extends Activity {
          *     search currently.
          */
         boolean cancelSearch() {
-            if (mActionBar.hasExpandedActionView()) {
+            if (mActionBar != null && mActionBar.hasExpandedActionView()) {
                 mActionBar.collapseActionView();
                 return true;
             }
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
index a57bcc6..7d6ee2f 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java
@@ -495,7 +495,8 @@ public class DocumentsActivity extends BaseActivity {
             createDir.setVisible(false);
         }
 
-        advanced.setVisible(!(mState.action == ACTION_MANAGE || mState.action == ACTION_BROWSE));
+        advanced.setVisible(!(mState.action == ACTION_MANAGE || mState.action == ACTION_BROWSE)
+                && !mState.forceAdvanced);
         fileSize.setVisible(fileSizeVisible);
 
         settings.setVisible((mState.action == ACTION_MANAGE || mState.action == ACTION_BROWSE)
diff --git a/packages/PrintSpooler/res/values-zh-rCN/arrays.xml b/packages/ExternalStorageProvider/res/values-as-rIN/strings.xml
index 4fc75db..62b79f8 100644
--- a/packages/PrintSpooler/res/values-zh-rCN/arrays.xml
+++ b/packages/ExternalStorageProvider/res/values-as-rIN/strings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
 <!-- Copyright (C) 2013 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,24 +15,7 @@
      limitations under the License.
 -->
 <resources>
-
-    <string-array name="pdf_printer_media_sizes" translatable="false">
-        <item>ROC_8K</item>
-        <item>ROC_16K</item>
-        <item>PRC_1</item>
-        <item>PRC_2</item>
-        <item>PRC_3</item>
-        <item>PRC_4</item>
-        <item>PRC_5</item>
-        <item>PRC_6</item>
-        <item>PRC_7</item>
-        <item>PRC_8</item>
-        <item>PRC_9</item>
-        <item>PRC_10</item>
-        <item>PRC_16K</item>
-        <item>OM_PA_KAI</item>
-        <item>OM_DAI_PA_KAI</item>
-        <item>OM_JUURO_KU_KAI</item>
-    </string-array>
-
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-ast-rES/strings.xml b/packages/ExternalStorageProvider/res/values-ast-rES/strings.xml
index f51601a..b5c2707 100644
--- a/packages/ExternalStorageProvider/res/values-ast-rES/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ast-rES/strings.xml
@@ -15,7 +15,10 @@
      limitations under the License.
 -->
 <resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
   <string name="app_label">Almacenamientu esternu</string>
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
   <string name="root_internal_storage">Almacenamientu internu</string>
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
   <string name="root_documents">Documentos</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml b/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml
index a6a79ca8..cd5ba2f 100644
--- a/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-az-rAZ/strings.xml
@@ -18,4 +18,5 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="7123375275748530234">"Xarici Yaddaş"</string>
     <string name="root_internal_storage" msgid="827844243068584127">"Daxili yaddaş"</string>
+    <string name="root_documents" msgid="4051252304075469250">"Sənədlər"</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-be/strings.xml b/packages/ExternalStorageProvider/res/values-be/strings.xml
index 8882e66..313324a 100644
--- a/packages/ExternalStorageProvider/res/values-be/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-be/strings.xml
@@ -15,7 +15,10 @@
      limitations under the License.
 -->
 <resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
   <string name="app_label">Знешняе сховішча</string>
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
   <string name="root_internal_storage">Унутраная памяць</string>
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
   <string name="root_documents">Дакументы</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-br-rFR/strings.xml b/packages/ExternalStorageProvider/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-br-rFR/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-bs-rBA/strings.xml b/packages/ExternalStorageProvider/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-bs-rBA/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-csb-rPL/strings.xml b/packages/ExternalStorageProvider/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-csb-rPL/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-cy/strings.xml b/packages/ExternalStorageProvider/res/values-cy/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-cy/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-da/strings.xml b/packages/ExternalStorageProvider/res/values-da/strings.xml
index a9ecb69..dc565ae 100644
--- a/packages/ExternalStorageProvider/res/values-da/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-da/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="7123375275748530234">"Ekstern lagring"</string>
-    <string name="root_internal_storage" msgid="827844243068584127">"Intern lagring"</string>
+    <string name="app_label" msgid="7123375275748530234">"Ekstern lagerplads"</string>
+    <string name="root_internal_storage" msgid="827844243068584127">"Intern lagerplads"</string>
     <string name="root_documents" msgid="4051252304075469250">"Dokumenter"</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-en-rPT/strings.xml b/packages/ExternalStorageProvider/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-en-rPT/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-eo/strings.xml b/packages/ExternalStorageProvider/res/values-eo/strings.xml
index f766f11..c1681ed 100644
--- a/packages/ExternalStorageProvider/res/values-eo/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-eo/strings.xml
@@ -15,5 +15,8 @@
      limitations under the License.
 -->
 <resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
   <string name="root_documents">Dokumentoj</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-es-rCO/strings.xml b/packages/ExternalStorageProvider/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-es-rCO/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-es-rMX/strings.xml b/packages/ExternalStorageProvider/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-es-rMX/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-fa/strings.xml b/packages/ExternalStorageProvider/res/values-fa/strings.xml
index 8471fc7..9ae8a47 100644
--- a/packages/ExternalStorageProvider/res/values-fa/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-fa/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="7123375275748530234">"فضای ذخیره خارجی"</string>
+    <string name="app_label" msgid="7123375275748530234">"حافظه خارجی"</string>
     <string name="root_internal_storage" msgid="827844243068584127">"حافظهٔ داخلی"</string>
     <string name="root_documents" msgid="4051252304075469250">"اسناد"</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-frp-rIT/strings.xml b/packages/ExternalStorageProvider/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-frp-rIT/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-fy-rNL/strings.xml b/packages/ExternalStorageProvider/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-fy-rNL/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ga-rIE/strings.xml b/packages/ExternalStorageProvider/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-ga-rIE/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-gd-rGB/strings.xml b/packages/ExternalStorageProvider/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-gd-rGB/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ku/strings.xml b/packages/ExternalStorageProvider/res/values-ku/strings.xml
index 65570a3..7fef302 100644
--- a/packages/ExternalStorageProvider/res/values-ku/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ku/strings.xml
@@ -15,7 +15,10 @@
      limitations under the License.
 -->
 <resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
   <string name="app_label">بیرگەی ده‌ره‌کی</string>
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
   <string name="root_internal_storage">بیرگەی ناوه‌کی</string>
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
   <string name="root_documents">به‌ڵگه‌نامه‌کان</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-lb/strings.xml b/packages/ExternalStorageProvider/res/values-lb/strings.xml
index ff8bb8d..a5b0527 100644
--- a/packages/ExternalStorageProvider/res/values-lb/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-lb/strings.xml
@@ -15,7 +15,10 @@
      limitations under the License.
 -->
 <resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
   <string name="app_label">Externe Späicher</string>
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
   <string name="root_internal_storage">Interne Späicher</string>
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
   <string name="root_documents">Dokumenter</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml
index 204b336..08e6dae 100644
--- a/packages/ExternalStorageProvider/res/values-ml-rIN/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ml-rIN/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="7123375275748530234">"ബാഹ്യ സംഭരണം"</string>
-    <string name="root_internal_storage" msgid="827844243068584127">"ആന്തരിക സംഭരണം"</string>
+    <string name="app_label" msgid="7123375275748530234">"ബാഹ്യ സ്റ്റോറേജ്"</string>
+    <string name="root_internal_storage" msgid="827844243068584127">"ആന്തരിക സ്റ്റോറേജ്"</string>
     <string name="root_documents" msgid="4051252304075469250">"പ്രമാണങ്ങൾ"</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-oc-rFR/strings.xml b/packages/ExternalStorageProvider/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-oc-rFR/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-or-rIN/strings.xml b/packages/ExternalStorageProvider/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..62b79f8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-or-rIN/strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml b/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..77c89b8
--- /dev/null
+++ b/packages/ExternalStorageProvider/res/values-pt-rBR/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<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="7123375275748530234">"Armazenamento externo"</string>
+    <string name="root_internal_storage" msgid="827844243068584127">"Armazenamento interno"</string>
+    <string name="root_documents" msgid="4051252304075469250">"Documentos"</string>
+</resources>
diff --git a/packages/ExternalStorageProvider/res/values-ru/strings.xml b/packages/ExternalStorageProvider/res/values-ru/strings.xml
index b6c1095..740272f 100644
--- a/packages/ExternalStorageProvider/res/values-ru/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ru/strings.xml
@@ -17,6 +17,6 @@
 <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="7123375275748530234">"Внешний накопитель"</string>
-    <string name="root_internal_storage" msgid="827844243068584127">"Внутренняя память"</string>
+    <string name="root_internal_storage" msgid="827844243068584127">"Внутренний накопитель"</string>
     <string name="root_documents" msgid="4051252304075469250">"Документы"</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/res/values-ug/strings.xml b/packages/ExternalStorageProvider/res/values-ug/strings.xml
index a7f691a..251612b 100644
--- a/packages/ExternalStorageProvider/res/values-ug/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-ug/strings.xml
@@ -15,7 +15,10 @@
      limitations under the License.
 -->
 <resources>
+  <!-- Title of the external storage application [CHAR LIMIT=32] -->
   <string name="app_label">سىرتقى ساقلىغۇچ</string>
+  <!-- Title for documents backend that offers internal storage. [CHAR LIMIT=24] -->
   <string name="root_internal_storage">ئىچىدىكى ساقلىغۇچ</string>
+  <!-- Title for documents backend that offers documents. [CHAR LIMIT=24] -->
   <string name="root_documents">پۈتۈكلەر</string>
 </resources>
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 18335b6..46b73d8 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -169,6 +169,14 @@ public class ExternalStorageProvider extends DocumentsProvider {
                     root.visiblePath = null;
                 }
                 root.path = volume.getInternalPathForUser(userId);
+
+                // Force all ext4/f2fs sdcard acccess through the sdcard FUSE layer to ensure the
+                // correct permissions for accessing files and directories.
+                if (volume.getType() == VolumeInfo.TYPE_PUBLIC && root.visiblePath != null
+                    && ("ext4".equals(volume.fsType) || "f2fs".equals(volume.fsType))) {
+                    root.path = root.visiblePath;
+                }
+
                 root.docId = getDocIdForFile(root.path);
 
             } catch (FileNotFoundException e) {
diff --git a/packages/FusedLocation/res/values-as-rIN/strings.xml b/packages/FusedLocation/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-as-rIN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-ast-rES/strings.xml b/packages/FusedLocation/res/values-ast-rES/strings.xml
index 3077218..e2ede7c 100644
--- a/packages/FusedLocation/res/values-ast-rES/strings.xml
+++ b/packages/FusedLocation/res/values-ast-rES/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">Llocalización combinada</string>
 </resources>
diff --git a/packages/FusedLocation/res/values-az-rAZ/strings.xml b/packages/FusedLocation/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..31962e4
--- /dev/null
+++ b/packages/FusedLocation/res/values-az-rAZ/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="5379477904423203699">"Qarışmış Yer"</string>
+</resources>
diff --git a/packages/FusedLocation/res/values-be/strings.xml b/packages/FusedLocation/res/values-be/strings.xml
index 597f549..44c6c5a 100644
--- a/packages/FusedLocation/res/values-be/strings.xml
+++ b/packages/FusedLocation/res/values-be/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">Fused Location</string>
 </resources>
diff --git a/packages/FusedLocation/res/values-br-rFR/strings.xml b/packages/FusedLocation/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-br-rFR/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-bs-rBA/strings.xml b/packages/FusedLocation/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-bs-rBA/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-csb-rPL/strings.xml b/packages/FusedLocation/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-csb-rPL/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-cy/strings.xml b/packages/FusedLocation/res/values-cy/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-cy/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-en-rPT/strings.xml b/packages/FusedLocation/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-en-rPT/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-eo/strings.xml b/packages/FusedLocation/res/values-eo/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-eo/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-es-rCO/strings.xml b/packages/FusedLocation/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-es-rCO/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-es-rMX/strings.xml b/packages/FusedLocation/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-es-rMX/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-frp-rIT/strings.xml b/packages/FusedLocation/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-frp-rIT/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-fy-rNL/strings.xml b/packages/FusedLocation/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-fy-rNL/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-ga-rIE/strings.xml b/packages/FusedLocation/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-ga-rIE/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-gd-rGB/strings.xml b/packages/FusedLocation/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-gd-rGB/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-ku/strings.xml b/packages/FusedLocation/res/values-ku/strings.xml
index b2e420d..06c99da 100644
--- a/packages/FusedLocation/res/values-ku/strings.xml
+++ b/packages/FusedLocation/res/values-ku/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">شوێنه‌ فیوزه‌کان</string>
 </resources>
diff --git a/packages/FusedLocation/res/values-lb/strings.xml b/packages/FusedLocation/res/values-lb/strings.xml
index 3330a6d..964c2fd 100644
--- a/packages/FusedLocation/res/values-lb/strings.xml
+++ b/packages/FusedLocation/res/values-lb/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">Fusionéiert Lokaliséierung</string>
 </resources>
diff --git a/packages/FusedLocation/res/values-oc-rFR/strings.xml b/packages/FusedLocation/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-oc-rFR/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-or-rIN/strings.xml b/packages/FusedLocation/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..19fd84c
--- /dev/null
+++ b/packages/FusedLocation/res/values-or-rIN/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/FusedLocation/res/values-ug/strings.xml b/packages/FusedLocation/res/values-ug/strings.xml
index 1f02fae..0c38cfa 100644
--- a/packages/FusedLocation/res/values-ug/strings.xml
+++ b/packages/FusedLocation/res/values-ug/strings.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">بىرلەشكەن ئورنى</string>
 </resources>
diff --git a/packages/InputDevices/res/values-as-rIN/strings.xml b/packages/InputDevices/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-as-rIN/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-ast-rES/strings.xml b/packages/InputDevices/res/values-ast-rES/strings.xml
index c1e3a75..6870a2a 100644
--- a/packages/InputDevices/res/values-ast-rES/strings.xml
+++ b/packages/InputDevices/res/values-ast-rES/strings.xml
@@ -1,43 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">Preseos d\'entrada</string>
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
   <string name="keyboard_layouts_label">Tecláu d\'Android</string>
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_uk_label">Inglés (UK)</string>
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_label">Inglés (US)</string>
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_intl">Inglés (US), estilu International</string>
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_colemak_label">Inglés (US), estilu Colemak</string>
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_dvorak_label">Inglés (US), estilu Dvorak</string>
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_german_label">Alemán</string>
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_label">Francés</string>
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_ca_label">Francés (Canadá)</string>
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_label">Rusu</string>
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_mac_label">Rusu, estilu Mac</string>
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_spanish_label">Español</string>
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_french_label">Francés de Suiza</string>
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_german_label">Alemán suizu</string>
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_belgian">Belga</string>
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_bulgarian">Búlgaru</string>
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_italian">Italianu</string>
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_danish">Danés</string>
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_norwegian">Noruegu</string>
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swedish">Suecu</string>
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_finnish">Finlandés</string>
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_croatian">Croata</string>
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_czech">Checu</string>
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_estonian">Estoniu</string>
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hungarian">Húngaru</string>
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_icelandic">Islandés</string>
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_brazilian">Brasileñu</string>
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_portuguese">Portugués</string>
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovak">Eslovacu</string>
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovenian">Eslovenu</string>
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_turkish">Turcu</string>
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_ukrainian">Ucrainianu</string>
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_arabic">Árabe</string>
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_greek">Griegu</string>
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hebrew">Hebréu</string>
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_lithuanian">Lituanu</string>
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_spanish_latin">Español (Llatinu)</string>
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_latvian">Letón</string>
 </resources>
diff --git a/packages/InputDevices/res/values-az-rAZ/strings.xml b/packages/InputDevices/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..d69059c
--- /dev/null
+++ b/packages/InputDevices/res/values-az-rAZ/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="8016145283189546017">"Daxiletmə Cihazları"</string>
+    <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android klaviaturası"</string>
+    <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"İngilis (BK)"</string>
+    <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"İngilis (ABŞ)"</string>
+    <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"İngilis (ABŞ), Beynəlxalq üslub"</string>
+    <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"İngilis (ABŞ), Colemak üslubu"</string>
+    <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"İngilis (ABŞ), Dvorak üslubu"</string>
+    <string name="keyboard_layout_german_label" msgid="8451565865467909999">"Alman"</string>
+    <string name="keyboard_layout_french_label" msgid="813450119589383723">"Fransız"</string>
+    <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"Fransız dili (Kanada)"</string>
+    <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Rus"</string>
+    <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Rus, Mac üslubu"</string>
+    <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"İspan"</string>
+    <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"İsverçə Fransızı"</string>
+    <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"İsveçrə Almanı"</string>
+    <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Belçikalı"</string>
+    <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Bolqar"</string>
+    <string name="keyboard_layout_italian" msgid="6497079660449781213">"İtalyan"</string>
+    <string name="keyboard_layout_danish" msgid="8036432066627127851">"Danimarkalı"</string>
+    <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Norveçli"</string>
+    <string name="keyboard_layout_swedish" msgid="732959109088479351">"İsveç"</string>
+    <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Fin"</string>
+    <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Xorvat"</string>
+    <string name="keyboard_layout_czech" msgid="1349256901452975343">"Çex"</string>
+    <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Eston"</string>
+    <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Macar"</string>
+    <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"İslandiyalı"</string>
+    <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"Braziliyalı"</string>
+    <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"Portuqal"</string>
+    <string name="keyboard_layout_slovak" msgid="2469379934672837296">"Slovak"</string>
+    <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"Sloven"</string>
+    <string name="keyboard_layout_turkish" msgid="7736163250907964898">"Türk"</string>
+    <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"Ukrayna"</string>
+    <string name="keyboard_layout_arabic" msgid="5671970465174968712">"Ərəb"</string>
+    <string name="keyboard_layout_greek" msgid="7289253560162386040">"Yunan"</string>
+    <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"İvrit"</string>
+    <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"Litva"</string>
+    <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"İspan (Latın)"</string>
+    <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latış"</string>
+</resources>
diff --git a/packages/InputDevices/res/values-be/strings.xml b/packages/InputDevices/res/values-be/strings.xml
index 872143f..9bca6cc 100644
--- a/packages/InputDevices/res/values-be/strings.xml
+++ b/packages/InputDevices/res/values-be/strings.xml
@@ -1,43 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">Прылады ўводу</string>
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
   <string name="keyboard_layouts_label">Клавіятура Android</string>
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_uk_label">Англійская (Вялікабрытанія)</string>
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_label">Англійская (ЗША)</string>
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_intl">Англійская (ЗША, міжнародная)</string>
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_colemak_label">Англійская (ЗША, Colemak)</string>
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_dvorak_label">Англійская (ЗША, Dvorak)</string>
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_german_label">Нямецкая</string>
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_label">Французская</string>
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_ca_label">Французская (Канада)</string>
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_label">Руская</string>
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_mac_label">Руская, раскладка Mac</string>
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_spanish_label">Іспанская</string>
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_french_label">Французская (Швейцарыя)</string>
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_german_label">Нямецкая (Швейцарыя)</string>
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_belgian">Бельгійская</string>
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_bulgarian">Балгарская</string>
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_italian">Італьянская</string>
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_danish">Дацкая</string>
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_norwegian">Нарвежская</string>
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swedish">Шведская</string>
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_finnish">Фінская</string>
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_croatian">Харвацкая</string>
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_czech">Чэшская</string>
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_estonian">Эстонская</string>
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hungarian">Венгерская</string>
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_icelandic">Ісландская</string>
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_brazilian">Бразільская</string>
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_portuguese">Партугальская</string>
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovak">Славацкая</string>
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovenian">Славенская</string>
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_turkish">Турэцкая</string>
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_ukrainian">Украінская</string>
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_arabic">Арабская</string>
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_greek">Грэцкая</string>
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hebrew">Hebrew</string>
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_lithuanian">Літоўская</string>
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_spanish_latin">Іспанская (Лацінская Амерыка)</string>
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_latvian">Латышская</string>
 </resources>
diff --git a/packages/InputDevices/res/values-br-rFR/strings.xml b/packages/InputDevices/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-br-rFR/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-bs-rBA/strings.xml b/packages/InputDevices/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-bs-rBA/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-csb-rPL/strings.xml b/packages/InputDevices/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-csb-rPL/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-cy/strings.xml b/packages/InputDevices/res/values-cy/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-cy/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-en-rPT/strings.xml b/packages/InputDevices/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-en-rPT/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-eo/strings.xml b/packages/InputDevices/res/values-eo/strings.xml
index 6f46f59..1e70b04 100644
--- a/packages/InputDevices/res/values-eo/strings.xml
+++ b/packages/InputDevices/res/values-eo/strings.xml
@@ -1,11 +1,71 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_german_label">Germana</string>
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_french_label">Franca</string>
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_french_ca_label">Franca (Kanado)</string>
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_russian_label">Rusa</string>
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_spanish_label">Hispana</string>
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_belgian">Belga</string>
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_bulgarian">Bulgara</string>
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_italian">Itala</string>
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_danish">Dana</string>
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_norwegian">Norvega</string>
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_swedish">Sveda</string>
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_finnish">Finna</string>
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_croatian">Kroata</string>
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_czech">Ĉeĥa</string>
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_estonian">Estona</string>
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_hungarian">Hungara</string>
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_icelandic">Islanda</string>
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_brazilian">Brazila</string>
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_portuguese">Portugala</string>
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_slovak">Slovaka</string>
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_slovenian">Slovena</string>
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_turkish">Turka</string>
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_ukrainian">Ukraina</string>
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_arabic">Araba</string>
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_greek">Greka</string>
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hebrew">Hebrea</string>
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_lithuanian">Litova</string>
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+  <string name="keyboard_layout_latvian">Latva</string>
 </resources>
diff --git a/packages/InputDevices/res/values-es-rCO/strings.xml b/packages/InputDevices/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-es-rCO/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-es-rMX/strings.xml b/packages/InputDevices/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-es-rMX/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-frp-rIT/strings.xml b/packages/InputDevices/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-frp-rIT/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-fy-rNL/strings.xml b/packages/InputDevices/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-fy-rNL/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-ga-rIE/strings.xml b/packages/InputDevices/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-ga-rIE/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-gd-rGB/strings.xml b/packages/InputDevices/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-gd-rGB/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-ku/strings.xml b/packages/InputDevices/res/values-ku/strings.xml
index b002621..43c774c 100644
--- a/packages/InputDevices/res/values-ku/strings.xml
+++ b/packages/InputDevices/res/values-ku/strings.xml
@@ -1,37 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">ئامێری تێچان</string>
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
   <string name="keyboard_layouts_label">ته‌خته‌کلیلی ئه‌ندرۆید</string>
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_uk_label">ئینگلیزی (به‌ریتانیا)</string>
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_label">ئینگلیزی (ئه‌مریکا)</string>
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_intl">ئینگلیزی (ئه‌مریکا)، شێوازی نێوده‌وڵه‌تی</string>
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_colemak_label">ئینگلیزی (ئه‌مریکا)، شێوازی کۆلیمارک</string>
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_dvorak_label">ئینگلیزی(ئه‌مریکا)، شێوازی دڤۆراک</string>
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_german_label">ئه‌ڵمانی</string>
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_label">فه‌ره‌نسی</string>
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_ca_label">فه‌ره‌نسی (که‌نه‌دا)</string>
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_label">ڕووسی</string>
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_mac_label">ڕووسی، شێوازی ماک</string>
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_spanish_label">ئیسپانی</string>
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_french_label">فه‌ره‌نسیی سویسری</string>
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_german_label">فه‌ره‌نسیی ئه‌ڵمانی</string>
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_belgian">به‌لجیکی</string>
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_bulgarian">بولگاری</string>
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_italian">ئیتالی</string>
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_danish">دانی</string>
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_norwegian">نه‌رویجی</string>
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swedish">سویدی</string>
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_finnish">فینله‌ندی</string>
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_croatian">کرواتی</string>
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_czech">چیکی</string>
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_estonian">ئیستۆنی</string>
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hungarian">هه‌نگاری</string>
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_icelandic">ئایسله‌ندی</string>
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_brazilian">به‌ڕازیلی</string>
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_portuguese">پورتوگالی</string>
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovak">سلۆڤاکی</string>
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovenian">سلۆڤینی</string>
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_turkish">تورکی</string>
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_ukrainian">ئۆکرانی</string>
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
 </resources>
diff --git a/packages/InputDevices/res/values-lb/strings.xml b/packages/InputDevices/res/values-lb/strings.xml
index 3193fa6..2441b02 100644
--- a/packages/InputDevices/res/values-lb/strings.xml
+++ b/packages/InputDevices/res/values-lb/strings.xml
@@ -1,43 +1,82 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">Apparater fir anzeginn</string>
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
   <string name="keyboard_layouts_label">Android-Tastatur</string>
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_uk_label">Englesch (Groussbritannien)</string>
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_label">Englesch (USA)</string>
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_intl">Englesch (USA), international</string>
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_colemak_label">Englesch (USA), Colemak</string>
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_dvorak_label">Englesch (USA), Dvorak</string>
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_german_label">Däitsch</string>
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_label">Franséisch</string>
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_ca_label">Franséisch (Kanada)</string>
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_label">Russesch</string>
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_mac_label">Russesch, Mac</string>
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_spanish_label">Spuenesch</string>
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_french_label">Schwäizer Franséisch</string>
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_german_label">Schwäizer Däitsch</string>
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_belgian">Belsch</string>
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_bulgarian">Bulgaresch</string>
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_italian">Italienesch</string>
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_danish">Dänesch</string>
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_norwegian">Norwegesch</string>
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swedish">Schwedesch</string>
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_finnish">Finnesch</string>
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_croatian">Kroatesch</string>
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_czech">Tschechesch</string>
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_estonian">Estnesch</string>
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hungarian">Ungaresch</string>
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_icelandic">Islännesch</string>
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_brazilian">Brasilianesch</string>
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_portuguese">Portugisesch</string>
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovak">Slowakesch</string>
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovenian">Slowenesch</string>
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_turkish">Tierkesch</string>
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_ukrainian">Ukrainesch</string>
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_arabic">Arabesch</string>
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_greek">Griichesch</string>
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hebrew">Hebräesch</string>
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_lithuanian">Litauesch</string>
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_spanish_latin">Spuenesch (Latäin)</string>
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_latvian">Lettesch</string>
 </resources>
diff --git a/packages/InputDevices/res/values-oc-rFR/strings.xml b/packages/InputDevices/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-oc-rFR/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-or-rIN/strings.xml b/packages/InputDevices/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..1f992a5
--- /dev/null
+++ b/packages/InputDevices/res/values-or-rIN/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
+</resources>
diff --git a/packages/InputDevices/res/values-pt-rBR/strings.xml b/packages/InputDevices/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e9a0a38
--- /dev/null
+++ b/packages/InputDevices/res/values-pt-rBR/strings.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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="8016145283189546017">"Dispositivos de entrada"</string>
+    <string name="keyboard_layouts_label" msgid="6688773268302087545">"Teclado do Android"</string>
+    <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Inglês (Reino Unido)"</string>
+    <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Inglês (EUA)"</string>
+    <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"Inglês (EUA), estilo internacional"</string>
+    <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"Inglês (EUA), estilo Colemak"</string>
+    <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"Inglês (EUA), estilo Dvorak"</string>
+    <string name="keyboard_layout_german_label" msgid="8451565865467909999">"Alemão"</string>
+    <string name="keyboard_layout_french_label" msgid="813450119589383723">"Francês"</string>
+    <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"Francês (Canadá)"</string>
+    <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Russo"</string>
+    <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Russo, estilo Mac"</string>
+    <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"Espanhol"</string>
+    <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"Francês suíço"</string>
+    <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"Alemão suíço"</string>
+    <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Belga"</string>
+    <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Búlgaro"</string>
+    <string name="keyboard_layout_italian" msgid="6497079660449781213">"Italiano"</string>
+    <string name="keyboard_layout_danish" msgid="8036432066627127851">"Dinamarquês"</string>
+    <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Norueguês"</string>
+    <string name="keyboard_layout_swedish" msgid="732959109088479351">"Sueco"</string>
+    <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Finlandês"</string>
+    <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Croata"</string>
+    <string name="keyboard_layout_czech" msgid="1349256901452975343">"Tcheco"</string>
+    <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Estoniano"</string>
+    <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Húngaro"</string>
+    <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"Islandês"</string>
+    <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"Brasileiro"</string>
+    <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"Português"</string>
+    <string name="keyboard_layout_slovak" msgid="2469379934672837296">"Eslovaco"</string>
+    <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"Esloveno"</string>
+    <string name="keyboard_layout_turkish" msgid="7736163250907964898">"Turco"</string>
+    <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"Ucraniano"</string>
+    <string name="keyboard_layout_arabic" msgid="5671970465174968712">"Árabe"</string>
+    <string name="keyboard_layout_greek" msgid="7289253560162386040">"Grego"</string>
+    <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"Hebraico"</string>
+    <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"Lituano"</string>
+    <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Espanhol (América Latina)"</string>
+    <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Letão"</string>
+</resources>
diff --git a/packages/InputDevices/res/values-ug/strings.xml b/packages/InputDevices/res/values-ug/strings.xml
index a82c1b1..a793948 100644
--- a/packages/InputDevices/res/values-ug/strings.xml
+++ b/packages/InputDevices/res/values-ug/strings.xml
@@ -1,37 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+  <!-- Name of the application. [CHAR LIMIT=35] -->
   <string name="app_label">كىرگۈزۈش ئۈسكۈنىلىرى</string>
+  <!-- Keyboard layouts label, used to describe the set of all built-in layouts in the UI. [CHAR LIMIT=35] -->
   <string name="keyboard_layouts_label">ئاندىرويىد ھەرپتاختا</string>
+  <!-- UK English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_uk_label">ئىنگلىزچە (ئەنگلىيە)</string>
+  <!-- US English keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_label">ئىنگلىزچە (ئا ق ش)</string>
+  <!-- US English (International style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_intl">ئىنگلىزچە (ئا ق ش)، خەلقئارا ئۇسلۇبى</string>
+  <!-- US English (Colemak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_colemak_label">ئىنگلىزچە (ئا ق ش)، Colemak ئۇسلۇبى</string>
+  <!-- US English (Dvorak style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_english_us_dvorak_label">ئىنگلىزچە (ئا ق ش)، Dvorak ئۇسلۇبى</string>
+  <!-- German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_german_label">گېرمانچە</string>
+  <!-- French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_label">فىرانسۇزچە</string>
+  <!-- Canadian French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_french_ca_label">فىرانسۇزچە (كانادا)</string>
+  <!-- Russian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_label">رۇسچە</string>
+  <!-- Russian (Mac style) keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_russian_mac_label">رۇسچە، Mac ئۇسلۇبى</string>
+  <!-- Spanish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_spanish_label">ئىسپانچە</string>
+  <!-- Swiss French keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_french_label">فىرانسۇزچە شىۋېتسارىيە</string>
+  <!-- Swiss German keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swiss_german_label">گېرمانچە شىۋېتسارىيە</string>
+  <!-- Belgian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_belgian">بېلگىيەچە</string>
+  <!-- Bulgarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_bulgarian">بۇلغارچە</string>
+  <!-- Italian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_italian">ئىتالىيانچە</string>
+  <!-- Danish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_danish">دانىشچە</string>
+  <!-- Norwegian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_norwegian">نورۋىگىيەچە</string>
+  <!-- Swedish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_swedish">شۋېدچە</string>
+  <!-- Finnish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_finnish">فىنچە</string>
+  <!-- Croatian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_croatian">خورۋاتچە</string>
+  <!-- Czech keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_czech">چېخچە</string>
+  <!-- Estonian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_estonian">ئېستونچە</string>
+  <!-- Hungarian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_hungarian">ھونگىرچە</string>
+  <!-- Icelandic keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_icelandic">ئىسلاندچە</string>
+  <!-- Brazilian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_brazilian">بىرازىلىيەچە</string>
+  <!-- Portuguese keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_portuguese">پورتۇگالچە</string>
+  <!-- Slovak keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovak">سلوۋاكچە</string>
+  <!-- Slovenian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_slovenian">سىلوۋېنىيەچە</string>
+  <!-- Turkish keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_turkish">تۈركچە</string>
+  <!-- Ukrainian keyboard layout label. [CHAR LIMIT=35] -->
   <string name="keyboard_layout_ukrainian">ئۇكرائىنچە</string>
+  <!-- Arabic keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Greek keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Hebrew keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Lithuanian keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Spanish (Latin) keyboard layout label. [CHAR LIMIT=35] -->
+  <!-- Latvian keyboard layout label. [CHAR LIMIT=35] -->
 </resources>
diff --git a/packages/InputDevices/res/values-uk/strings.xml b/packages/InputDevices/res/values-uk/strings.xml
index d8152d4..43a3fe6 100644
--- a/packages/InputDevices/res/values-uk/strings.xml
+++ b/packages/InputDevices/res/values-uk/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">"англійська (Великобританія)"</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>
diff --git a/packages/InputDevices/res/values-uz-rUZ/strings.xml b/packages/InputDevices/res/values-uz-rUZ/strings.xml
index 0a99ad3..3b6772b 100644
--- a/packages/InputDevices/res/values-uz-rUZ/strings.xml
+++ b/packages/InputDevices/res/values-uz-rUZ/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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="8016145283189546017">"Kiruvchi qurilmalar"</string>
+    <string name="app_label" msgid="8016145283189546017">"Kiritish qurilmalari"</string>
     <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android klaviaturasi"</string>
     <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Inglizcha (BQ)"</string>
     <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Inglizcha (AQSH)"</string>
diff --git a/packages/Keyguard/res/layout/keyguard_status_view.xml b/packages/Keyguard/res/layout/keyguard_status_view.xml
index fc0b568..e957f6a 100644
--- a/packages/Keyguard/res/layout/keyguard_status_view.xml
+++ b/packages/Keyguard/res/layout/keyguard_status_view.xml
@@ -34,6 +34,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal|top"
         android:orientation="vertical" >
+
         <TextClock
             android:id="@+id/clock_view"
             android:layout_width="wrap_content"
@@ -47,6 +48,19 @@
             android:layout_marginBottom="@dimen/bottom_text_spacing_digital" />
 
         <include layout="@layout/keyguard_status_area" />
+
+        <TextView android:id="@+id/weather_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:textColor="@color/clock_white"
+            style="@style/widget_label"
+            android:textAllCaps="true"
+            android:letterSpacing="0.15"
+            android:gravity="center"
+            android:singleLine="true"
+            android:visibility="gone"/>
+
         <TextView
             android:id="@+id/owner_info"
             android:layout_marginLeft="16dp"
diff --git a/packages/Keyguard/res/values-af/cm_strings.xml b/packages/Keyguard/res/values-af/cm_strings.xml
index c9fb74e..1605f19 100644
--- a/packages/Keyguard/res/values-af/cm_strings.xml
+++ b/packages/Keyguard/res/values-af/cm_strings.xml
@@ -16,7 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM Perso gesluit</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Ongeldige kaart.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Sleutel SIM PIN, jy het <xliff:g id="number">%d</xliff:g> oorblywende poging voordat jy jou diensverskaffer moet kontak om jou toestel te ontsluit.</item>
+    <item quantity="other">Sleutel SIM PIN, Jy het <xliff:g id="number">%d</xliff:g> oorblywende pogings oor.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Fout: Invoer is korter as die minimum lengte</string>
 </resources>
diff --git a/packages/Keyguard/res/values-am/cm_strings.xml b/packages/Keyguard/res/values-am/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-am/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ar/cm_strings.xml b/packages/Keyguard/res/values-ar/cm_strings.xml
index 46f5512..348be57 100644
--- a/packages/Keyguard/res/values-ar/cm_strings.xml
+++ b/packages/Keyguard/res/values-ar/cm_strings.xml
@@ -16,5 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">الشريحة SIM مغلقة</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">بطاقة غير صالحة.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">خطأ: المدخل أقصر من الحد الأدنى للطول</string>
 </resources>
diff --git a/packages/Keyguard/res/values-as-rIN/cm_strings.xml b/packages/Keyguard/res/values-as-rIN/cm_strings.xml
new file mode 100644
index 0000000..9f70040
--- /dev/null
+++ b/packages/Keyguard/res/values-as-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM কাৰ্ড পাৰ্চো লক কৰা আছে</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">অবৈধ কাৰ্ড।</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">আপোনাৰ SIM PIN প্ৰৱেশ কৰক, আপোনাৰ <xliff:g id="number">%d</xliff:g>টা প্ৰচেষ্টা বাকী আছে, তাৰ আগতে আপুনি ডিভাইচ আনলক কৰিবলৈ কেৰিয়াৰক যোগাযোগ কৰিবই লাগিব।</item>
+    <item quantity="other">SIM PIN প্ৰৱেশ কৰক, আপোনাৰ <xliff:g id="number">%d</xliff:g>টা প্ৰচেষ্টা বাকী আছে।</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">ত্ৰুটি: ইনপুট ন্যূনতম দৈৰ্ঘতকৈ চুটি</string>
+</resources>
diff --git a/packages/Keyguard/res/values-as-rIN/strings.xml b/packages/Keyguard/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-as-rIN/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-ast-rES/cm_strings.xml b/packages/Keyguard/res/values-ast-rES/cm_strings.xml
index ead7e33..5099baf 100644
--- a/packages/Keyguard/res/values-ast-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/cm_strings.xml
@@ -16,5 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM/RUIM con bloquéu personal</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Tarxeta inválida.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Fallu: La entrada ye más curtia que\'l llargor mínimu</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ast-rES/strings.xml b/packages/Keyguard/res/values-ast-rES/strings.xml
index 46bc659..c268778 100644
--- a/packages/Keyguard/res/values-ast-rES/strings.xml
+++ b/packages/Keyguard/res/values-ast-rES/strings.xml
@@ -19,77 +19,230 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
   <string name="app_name">Bloquéu</string>
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_code">Inxerta\'l códigu PIN.</string>
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_puk_code">Escribi\'l PUK de la tarxeta SIM y un códigu PIN nuevu</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">Códigu PUK de la tarxeta SIM</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">Códigu nuevu PIN de tarxeta SIM</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">Toca pa introducir contraseña</font></string>
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_password_code">Inxerta la contraseña pa desbloquiar.</string>
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_password_code">Inxerta\'l códigu PIN pa desbloquiar.</string>
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
   <string name="keyguard_password_wrong_pin_code">Códigu PIN incorreutu</string>
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
   <string name="keyguard_charged">Cargada</string>
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
   <string name="keyguard_plugged_in">Cargando</string>
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <string name="keyguard_plugged_in_charging_fast">Carga rápida</string>
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <string name="keyguard_plugged_in_charging_slowly">Carga lenta</string>
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
   <string name="keyguard_low_battery">Coneuta\'l cargador.</string>
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Empobina al menú pa desbloquiar la pantalla.</string>
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Bloquiada pa la rede</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message_short">Falta la tarxeta SIM</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="tablet">Nun s\'inxertó nenguna tarxeta SIM na tablet.</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="default">Nun s\'inxertó nenguna tarxeta SIM nel teléfonu.</string>
+  <!-- Shown to ask the user to insert a SIM card. -->
   <string name="keyguard_missing_sim_instructions">Inxerta una tarxeta SIM.</string>
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
   <string name="keyguard_missing_sim_instructions_long">Falta la tarxeta SIM o nun pue lleese. Inxerta una tarxeta SIM.</string>
+  <!-- Shown when SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_message_short">Tarxeta SIM inutilizable</string>
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_instructions">La to tarxeta SIM inhabilitóse dafechu.\n Pa obtener otra, ponte en contautu col to fornidor de servicios de telefonía.</string>
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
   <string name="keyguard_sim_locked_message">La tarxeta SIM ta bloquiada.</string>
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
   <string name="keyguard_sim_puk_locked_message">La tarxeta SIM ta bloquiada col códigu PUK.</string>
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
   <string name="keyguard_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM…</string>
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
   <string name="keyguard_accessibility_pattern_unlock">Desbloquéu por patrón</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">Desbloquéu por PIN</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">Desbloquéu por contraseña</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Área de patrón</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Área pa eslizar</string>
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Próxima alarma afitada a les <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Desaniciar</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_enter">Intro</string>
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">¿Escaecisti\'l patrón?</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">El patrón ye incorreutu</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">Contraseña incorreuta</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">PIN incorreutu</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown">Inténtalo otra vegada en <xliff:g id="NUMBER">%d</xliff:g> segundos.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">Dibuxa\'l to patrón de desbloquéu.</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">Inxerta\'l PIN de la tarxeta SIM.</string>
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
   <string name="kg_pin_instructions">Inxerta\'l PIN.</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">Escribi la contraseña.</string>
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint">La tarxeta SIM ta inhabilitada. Pa continuar, inxerta\'l códigu PUK. Si quies más información, ponte en contautu col operador</string>
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
   <string name="kg_puk_enter_pin_hint">Inxerta\'l códigu PIN deseáu</string>
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
   <string name="kg_enter_confirm_pin_hint">Confirma\'l códigu PIN</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">Desbloquiando tarxeta SIM…</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">Inxerta un códigu PIN con una llonxitú ente cuatro y ocho díxitos.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
   <string name="kg_invalid_sim_puk_hint">El códigu PUK tien de tener ocho númberos como mínimu.</string>
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">Vuelvi a inxertar el códigu PUK correutu. Si inxertes un códigu incorreutu delles vegaes, va inhabilitase la tarxeta SIM.</string>
+  <!-- String shown in PUK screen when PIN codes don't match -->
   <string name="kg_invalid_confirm_pin_hint" product="default">Los códigos PIN nun concasen.</string>
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
   <string name="kg_login_too_many_attempts">Abondos intentos incorreutos de crear el patrón</string>
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
   <string name="kg_too_many_failed_pin_attempts_dialog_message">Inxertasti un códigu PIN incorreutu <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
   <string name="kg_too_many_failed_password_attempts_dialog_message">Inxertasti una contraseña incorreuta <xliff:g id="NUMBER_0">%d</xliff:g> vegaes. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
   <string name="kg_too_many_failed_pattern_attempts_dialog_message">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. \n\nInténtalo otra vegada en <xliff:g id="NUMBER_1">%d</xliff:g> segundos.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_almost_at_wipe" product="tablet">
        Intentasti desbloquiar la tablet <xliff:g id="number">%d</xliff:g> vegaes.
        Dempués de <xliff:g id="number">%d</xliff:g> intentos fallíos más,
        esta tablet va resetease, desaniciando tolos sos datos.
     </string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_almost_at_wipe" product="default">
        Intentasti desbloquiar el teléfonu tablet <xliff:g id="number">%d</xliff:g> vegaes.
        Dempués de <xliff:g id="number">%d</xliff:g> intentos fallíos más,
        esta tablet va resetease, desaniciando tolos sos datos.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_now_wiping" product="tablet">
        Intentasti desbloquiar la tablet <xliff:g id="number">%d</xliff:g> vegaes.
        Esta tablet va resetease, desaniciando tolos sos datos.    </string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tablet">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tener d\'usar una cuenta de corréu-e pa desbloquiar la tablet.\n\n Inténtalo otra vegada en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="default">Fallasti <xliff:g id="NUMBER_0">%d</xliff:g> vegaes al dibuxar el patrón de desbloquéu. Si falles otres <xliff:g id="NUMBER_1">%d</xliff:g> vegaes, vas tener d\'usar una cuenta de corréu-e pa desbloquiar el teléfonu.\n\n Inténtalo otra vegada en <xliff:g id="NUMBER_2">%d</xliff:g> segundos.</string>
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
   <string name="kg_password_wrong_pin_code_pukked">Códigu PIN de la tarxeta SIM incorreutu. Tienes de contautar col to operador pa desbloquiar el preséu.</string>
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <plurals name="kg_password_wrong_pin_code">
+    <item quantity="one">Códigu PIN de la tarxeta SIM incorreutu. Queda <xliff:g id="NUMBER">%d</xliff:g> intentu pa tener que ponete en contautu col to operador pa desbloquiar el preséu.</item>
+    <item quantity="other">Códigu PIN de la tarxeta SIM incorreutu. Queden <xliff:g id="NUMBER">%d</xliff:g> intentos.</item>
+  </plurals>
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
   <string name="kg_password_wrong_puk_code_dead">La tarxeta SIM nun pue usase. Ponte en contautu col to operador.</string>
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <plurals name="kg_password_wrong_puk_code">
+    <item quantity="one">Códigu PUK de la tarxeta SIM incorreutu. Quédate <xliff:g id="NUMBER">%d</xliff:g> intentu pa que la tarxeta SIM nun pueda usase de mou permanente.</item>
+    <item quantity="other">Códigu PUK de la tarxeta SIM incorreutu. Quédente <xliff:g id="NUMBER">%d</xliff:g> intentos pa que la tarxeta SIM nun pueda usase de mou permanente.</item>
+  </plurals>
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
   <string name="kg_password_pin_failed">Fallu al intentar desbloquiar la tarxeta SIM col códigu PIN</string>
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
   <string name="kg_password_puk_failed">Fallu al intentar desbloquiar la tarxeta SIM col códigu PUK</string>
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
   <string name="kg_pin_accepted">Códigu aceutáu</string>
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
   <string name="keyguard_carrier_default">Ensin serviciu</string>
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <string name="airplane_mode">Mou avión</string>
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_restart_pattern">Solicítase\'l patrón al reaniciar el preséu.</string>
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_restart_pin">Solicítase\'l PIN al reaniciar el preséu.</string>
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_restart_password">Solicítase la contraseña al reaniciar el preséu</string>
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_timeout_pattern">Solicítase\'l patrón por razones de seguridá.</string>
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_timeout_pin">Por razones de seguridá solicítase\'l PIN.</string>
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_timeout_password">Por razones de seguridá, ingresa la contraseña.</string>
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_switch_profiles_pattern">Solicítase\'l patrón al camudar de perfil.</string>
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_switch_profiles_pin">Solicítase\'l PIN al camudar de perfil.</string>
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <string name="kg_prompt_reason_switch_profiles_password">Solicítase la contraseña al camudar de perfil.</string>
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <plurals name="kg_prompt_reason_time_pattern">
+    <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma\'l patrón.</item>
+    <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma\'l patrón.</item>
+  </plurals>
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <plurals name="kg_prompt_reason_time_pin">
+    <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma\'l PIN.</item>
+    <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma\'l PIN.</item>
+  </plurals>
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <plurals name="kg_prompt_reason_time_password">
+    <item quantity="one">Hai <xliff:g id="number">%d</xliff:g> hora que nun se desbloquia\'l preséu. Confirma la contraseña.</item>
+    <item quantity="other">Hai <xliff:g id="number">%d</xliff:g> hores que nun se desbloquia\'l preséu. Confirma la contraseña.</item>
+  </plurals>
+  <!-- Fingerprint hint message when finger was not recognized.-->
+  <string name="fingerprint_not_recognized">Non reconocío</string>
 </resources>
diff --git a/packages/Keyguard/res/values-az-rAZ/cm_strings.xml b/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
index 260bf77..46ee7e1 100644
--- a/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
+++ b/packages/Keyguard/res/values-az-rAZ/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Etibarsız kart.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-be/cm_strings.xml b/packages/Keyguard/res/values-be/cm_strings.xml
index 9a7baf5..74002f0 100644
--- a/packages/Keyguard/res/values-be/cm_strings.xml
+++ b/packages/Keyguard/res/values-be/cm_strings.xml
@@ -16,12 +16,16 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM-картка заблакавана аператарам</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Памылка карты.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Увядзіце PIN-код. У вас засталася <xliff:g id="number">%d</xliff:g> спроба перад тым, як вам давядзецца звярнуцца да аператара дзеля разблакоўкі.</item>
     <item quantity="few">Увядзіце PIN-код. У вас засталося<xliff:g id="number">%d</xliff:g> спробы.</item>
     <item quantity="other">Увядзіце PIN-код. У вас засталося <xliff:g id="number">%d</xliff:g> спробы.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Памылка: маленькая даўжыня</string>
 </resources>
diff --git a/packages/Keyguard/res/values-be/strings.xml b/packages/Keyguard/res/values-be/strings.xml
new file mode 100644
index 0000000..7378ef8
--- /dev/null
+++ b/packages/Keyguard/res/values-be/strings.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <string name="airplane_mode">Рэжым лёту</string>
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-bg/cm_strings.xml b/packages/Keyguard/res/values-bg/cm_strings.xml
index 08e97f6..6ac51c5 100644
--- a/packages/Keyguard/res/values-bg/cm_strings.xml
+++ b/packages/Keyguard/res/values-bg/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">СИМ картата е блокирана от оператора</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Невалидна карта.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Въведете ПИН кода на СИМ картата, имате още <xliff:g id="number">%d </xliff:g> останал опит, преди да трябва да се свържете с вашия оператор за отключване на устройството.</item>
     <item quantity="other">Въведете ПИН кода на СИМ картата, имате още <xliff:g id="number">%d </xliff:g> останали опити.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Грешка: Въведеното е по-късо от минималната дължина</string>
 </resources>
diff --git a/packages/Keyguard/res/values-bn-rBD/cm_strings.xml b/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
index bdb0111..5f1282b 100644
--- a/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
+++ b/packages/Keyguard/res/values-bn-rBD/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">অবৈধ কার্ড।</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-br-rFR/cm_strings.xml b/packages/Keyguard/res/values-br-rFR/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-br-rFR/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-br-rFR/strings.xml b/packages/Keyguard/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-br-rFR/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-bs-rBA/cm_strings.xml b/packages/Keyguard/res/values-bs-rBA/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-bs-rBA/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-bs-rBA/strings.xml b/packages/Keyguard/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-bs-rBA/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-ca/cm_strings.xml b/packages/Keyguard/res/values-ca/cm_strings.xml
index 83bfdce..553478b 100644
--- a/packages/Keyguard/res/values-ca/cm_strings.xml
+++ b/packages/Keyguard/res/values-ca/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">La targeta SIM té un bloqueig Personal</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Targeta invàlida.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Introdueix el PIN de la SIM, tens <xliff:g id="number">%d</xliff:g> intent restant abans que hagis de contactar amb el teu operador per desbloquejar el teu dispositiu.</item>
     <item quantity="other">Introdueix el PIN de la SIM, tens <xliff:g id="number">%d</xliff:g> intents restants.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Error: L\'entrada és més curta que la longitud mínima</string>
 </resources>
diff --git a/packages/Keyguard/res/values-cs/cm_strings.xml b/packages/Keyguard/res/values-cs/cm_strings.xml
index 20fae9d..a66d9a4 100644
--- a/packages/Keyguard/res/values-cs/cm_strings.xml
+++ b/packages/Keyguard/res/values-cs/cm_strings.xml
@@ -16,12 +16,16 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM je zamčená pomocí Perso</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Neplatná SIM karta.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývající pokus než budete muset kontaktovat operátora pro odemčení zařízení.</item>
     <item quantity="few">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývající pokusy.</item>
     <item quantity="other">Zadejte PIN kód, máte <xliff:g id="number">%d</xliff:g> zbývajících pokusů.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Chyba: vstup je kratší než minimální délka</string>
 </resources>
diff --git a/packages/Keyguard/res/values-csb-rPL/cm_strings.xml b/packages/Keyguard/res/values-csb-rPL/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-csb-rPL/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-csb-rPL/strings.xml b/packages/Keyguard/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-csb-rPL/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-cy/cm_strings.xml b/packages/Keyguard/res/values-cy/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-cy/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-cy/strings.xml b/packages/Keyguard/res/values-cy/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-cy/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-da/cm_strings.xml b/packages/Keyguard/res/values-da/cm_strings.xml
index 34c3190..9fd131c 100644
--- a/packages/Keyguard/res/values-da/cm_strings.xml
+++ b/packages/Keyguard/res/values-da/cm_strings.xml
@@ -16,5 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM-kortet er Perso-låst</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Ugyldigt SIM-kort.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Fejl: Input er kortere end minimumslængden</string>
 </resources>
diff --git a/packages/Keyguard/res/values-de/cm_strings.xml b/packages/Keyguard/res/values-de/cm_strings.xml
index 2369d8e..d5bf58d 100644
--- a/packages/Keyguard/res/values-de/cm_strings.xml
+++ b/packages/Keyguard/res/values-de/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM-Karte ist gesperrt</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Ungültige SIM-Karte.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
-    <item quantity="one">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuch, bevor Sie den Netzbetreiber zum Entsperren des Gerätes kontaktieren müssen.</item>
+    <item quantity="one">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuch, bevor Sie den Netzbetreiber zum Entsperren des Geräts kontaktieren müssen.</item>
     <item quantity="other">SIM-PIN eingeben. Sie haben noch <xliff:g id="number">%d</xliff:g> Versuche, bevor Sie den Netzbetreiber zum Entsperren des Gerätes kontaktieren müssen.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Fehler: Eingabe ist kürzer als die Mindestlänge.</string>
 </resources>
diff --git a/packages/Keyguard/res/values-de/strings.xml b/packages/Keyguard/res/values-de/strings.xml
index 65bda9f..737f533 100644
--- a/packages/Keyguard/res/values-de/strings.xml
+++ b/packages/Keyguard/res/values-de/strings.xml
@@ -22,7 +22,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="719438068451601849">"Keyguard"</string>
     <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"PIN-Code eingeben"</string>
-    <string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"Gib den PUK-Code der SIM-Karte und den neuen PIN-Code ein."</string>
+    <string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"Geben Sie den PUK-Code der SIM-Karte und den neuen PIN-Code ein."</string>
     <string name="keyguard_password_enter_puk_prompt" msgid="1801941051094974609">"PUK-Code der SIM-Karte"</string>
     <string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"Neuer PIN-Code der SIM-Karte"</string>
     <string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"Zur Passworteingabe berühren"</font></string>
@@ -39,10 +39,10 @@
     <string name="keyguard_missing_sim_message_short" msgid="494980561304211931">"Keine SIM-Karte"</string>
     <string name="keyguard_missing_sim_message" product="tablet" msgid="1445849005909260039">"Keine SIM-Karte im Tablet"</string>
     <string name="keyguard_missing_sim_message" product="default" msgid="3481110395508637643">"Keine SIM-Karte im Telefon"</string>
-    <string name="keyguard_missing_sim_instructions" msgid="5210891509995942250">"Lege eine SIM-Karte ein."</string>
-    <string name="keyguard_missing_sim_instructions_long" msgid="5968985489463870358">"SIM-Karte fehlt oder ist nicht lesbar. Bitte lege eine SIM-Karte ein."</string>
+    <string name="keyguard_missing_sim_instructions" msgid="5210891509995942250">"Legen Sie eine SIM-Karte ein."</string>
+    <string name="keyguard_missing_sim_instructions_long" msgid="5968985489463870358">"SIM-Karte fehlt oder ist nicht lesbar. Bitte legen Sie eine SIM-Karte ein."</string>
     <string name="keyguard_permanent_disabled_sim_message_short" msgid="8340813989586622356">"SIM-Karte unbrauchbar"</string>
-    <string name="keyguard_permanent_disabled_sim_instructions" msgid="5892940909699723544">"Deine SIM-Karte wurde dauerhaft deaktiviert.\n Wende dich an deinen Mobilfunkanbieter, um eine andere SIM-Karte zu erhalten."</string>
+    <string name="keyguard_permanent_disabled_sim_instructions" msgid="5892940909699723544">"Ihre SIM-Karte wurde dauerhaft deaktiviert.\n Wenden Sie sich an Ihren Mobilfunkanbieter, um eine andere SIM-Karte zu erhalten."</string>
     <string name="keyguard_sim_locked_message" msgid="6875773413306380902">"SIM-Karte ist gesperrt."</string>
     <string name="keyguard_sim_puk_locked_message" msgid="3747232467471801633">"SIM-Karte ist gesperrt. PUK-Eingabe erforderlich."</string>
     <string name="keyguard_sim_unlock_progress_dialog_message" msgid="7975221805033614426">"SIM-Karte wird entsperrt…"</string>
@@ -61,48 +61,48 @@
     <string name="kg_wrong_pattern" msgid="1850806070801358830">"Falsches Muster"</string>
     <string name="kg_wrong_password" msgid="2333281762128113157">"Falsches Passwort"</string>
     <string name="kg_wrong_pin" msgid="1131306510833563801">"Falsche PIN"</string>
-    <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Versuche es in <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut."</string>
+    <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Versuchen Sie es in <xliff:g id="NUMBER">%d</xliff:g> Sekunden erneut."</string>
     <string name="kg_pattern_instructions" msgid="398978611683075868">"Muster zeichnen"</string>
     <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"SIM-PIN eingeben"</string>
     <string name="kg_sim_pin_instructions_multi" msgid="7818515973197201434">"SIM-PIN für \"<xliff:g id="CARRIER">%1$s</xliff:g>\" eingeben"</string>
     <string name="kg_pin_instructions" msgid="2377242233495111557">"PIN eingeben"</string>
     <string name="kg_password_instructions" msgid="5753646556186936819">"Passwort eingeben"</string>
-    <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Die SIM-Karte ist jetzt deaktiviert. Gib den PUK-Code ein, um fortzufahren. Weitere Informationen erhältst du von deinem Mobilfunkanbieter."</string>
-    <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"Die SIM-Karte \"<xliff:g id="CARRIER">%1$s</xliff:g>\" ist jetzt deaktiviert. Gib den PUK-Code ein, um fortzufahren. Weitere Informationen erhältst du von deinem Mobilfunkanbieter."</string>
+    <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Die SIM-Karte ist jetzt deaktiviert. Geben Sie den PUK-Code ein, um fortzufahren. Weitere Informationen erhalten Sie von Ihrem Mobilfunkanbieter."</string>
+    <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"Die SIM-Karte \"<xliff:g id="CARRIER">%1$s</xliff:g>\" ist jetzt deaktiviert. Geben Sie den PUK-Code ein, um fortzufahren. Weitere Informationen erhalten Sie von Ihrem Mobilfunkanbieter."</string>
     <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Gewünschten PIN-Code eingeben"</string>
     <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Gewünschten PIN-Code bestätigen"</string>
     <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM-Karte wird entsperrt…"</string>
-    <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Gib eine 4- bis 8-stellige PIN ein."</string>
+    <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Geben Sie eine 4- bis 8-stellige PIN ein."</string>
     <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Der PUK-Code muss mindestens 8 Ziffern betragen."</string>
-    <string name="kg_invalid_puk" msgid="3638289409676051243">"Gib den richtigen PUK-Code ein. Bei wiederholten Versuchen wird die SIM-Karte dauerhaft deaktiviert."</string>
+    <string name="kg_invalid_puk" msgid="3638289409676051243">"Geben Sie den richtigen PUK-Code ein. Bei wiederholten Versuchen wird die SIM-Karte dauerhaft deaktiviert."</string>
     <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-Codes stimmen nicht überein"</string>
     <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Zu viele Musterversuche"</string>
-    <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Du hast deine PIN <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch eingegeben.\n\nVersuche es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string>
-    <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Du hast dein Passwort <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch eingegeben.\n\nVersuche es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string>
-    <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Du hast dein Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. \n\nVersuche es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string>
-    <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="8774056606869646621">"Du hast <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird dieses Tablet zurückgesetzt. Dadurch werden alle Gerätedaten gelöscht."</string>
-    <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="1843331751334128428">"Du hast <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird dieses Telefon zurückgesetzt. Dadurch werden alle Gerätedaten gelöscht."</string>
-    <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="258925501999698032">"Du hast <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Dieses Tablet wird nun zurückgesetzt und alle Gerätedaten werden gelöscht."</string>
-    <string name="kg_failed_attempts_now_wiping" product="default" msgid="7154028908459817066">"Du hast <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Dieses Telefon wird nun zurückgesetzt und alle Gerätedaten werden gelöscht."</string>
-    <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="6159955099372112688">"Du hast <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird dieser Nutzer entfernt. Dadurch werden alle Nutzerdaten gelöscht."</string>
-    <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="6945823186629369880">"Du hast <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird dieser Nutzer entfernt. Dadurch werden alle Nutzerdaten gelöscht."</string>
-    <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="3963486905355778734">"Du hast <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Dieser Nutzer wird nun entfernt und alle Nutzerdaten werden gelöscht."</string>
-    <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="7729009752252111673">"Du hast <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Dieser Nutzer wird nun entfernt und alle Nutzerdaten werden gelöscht."</string>
-    <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="4621778507387853694">"Du hast <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird das Arbeitsprofil entfernt. Dadurch werden alle Profildaten gelöscht."</string>
-    <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Du hast <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird das Arbeitsprofil entfernt. Dadurch werden alle Profildaten gelöscht."</string>
-    <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Du hast <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Das Arbeitsprofil wird nun entfernt und alle Profildaten werden gelöscht."</string>
-    <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Du hast <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Das Arbeitsprofil wird nun entfernt und alle Profildaten werden gelöscht."</string>
-    <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Du hast dein Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wirst du aufgefordert, dein Tablet mithilfe eines E-Mail-Kontos zu entsperren.\n\n Versuche es in <xliff:g id="NUMBER_2">%d</xliff:g> Sekunden erneut."</string>
-    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Du hast dein Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wirst du aufgefordert, dein Telefon mithilfe eines E-Mail-Kontos zu entsperren.\n\n Versuche es in <xliff:g id="NUMBER_2">%d</xliff:g> Sekunden erneut."</string>
-    <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Falscher PIN-Code der SIM-Karte. Bitte wende dich an deinen Mobilfunkanbieter, damit er dein Gerät entsperrt."</string>
+    <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Sie haben Ihre PIN <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch eingegeben.\n\nVersuchen Sie es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string>
+    <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Sie haben Ihr Passwort <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch eingegeben.\n\nVersuchen Sie es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string>
+    <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Sie haben Ihr Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. \n\nVersuchen Sie es in <xliff:g id="NUMBER_1">%d</xliff:g> Sekunden erneut."</string>
+    <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="8774056606869646621">"Sie haben <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird dieses Tablet zurückgesetzt. Dadurch werden alle Gerätedaten gelöscht."</string>
+    <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="1843331751334128428">"Sie haben <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird dieses Telefon zurückgesetzt. Dadurch werden alle Gerätedaten gelöscht."</string>
+    <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="258925501999698032">"Sie haben <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Dieses Tablet wird nun zurückgesetzt und alle Gerätedaten werden gelöscht."</string>
+    <string name="kg_failed_attempts_now_wiping" product="default" msgid="7154028908459817066">"Sie haben <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Dieses Telefon wird nun zurückgesetzt und alle Gerätedaten werden gelöscht."</string>
+    <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="6159955099372112688">"Sie haben <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird dieser Nutzer entfernt. Dadurch werden alle Nutzerdaten gelöscht."</string>
+    <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="6945823186629369880">"Sie haben <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird dieser Nutzer entfernt. Dadurch werden alle Nutzerdaten gelöscht."</string>
+    <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="3963486905355778734">"Sie haben <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Dieser Nutzer wird nun entfernt und alle Nutzerdaten werden gelöscht."</string>
+    <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="7729009752252111673">"Sie haben <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Dieser Nutzer wird nun entfernt und alle Nutzerdaten werden gelöscht."</string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="4621778507387853694">"Sie haben <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird das Arbeitsprofil entfernt. Dadurch werden alle Profildaten gelöscht."</string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Sie haben <xliff:g id="NUMBER_0">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen wird das Arbeitsprofil entfernt. Dadurch werden alle Profildaten gelöscht."</string>
+    <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Sie haben <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Tablet zu entsperren. Das Arbeitsprofil wird nun entfernt und alle Profildaten werden gelöscht."</string>
+    <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Sie haben <xliff:g id="NUMBER">%d</xliff:g>-mal erfolglos versucht, das Telefon zu entsperren. Das Arbeitsprofil wird nun entfernt und alle Profildaten werden gelöscht."</string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Sie haben Ihr Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen werden Sie aufgefordert, Ihr Tablet mithilfe eines E-Mail-Kontos zu entsperren.\n\n Versuchen Sie es in <xliff:g id="NUMBER_2">%d</xliff:g> Sekunden erneut."</string>
+    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Sie haben Ihr Entsperrungsmuster <xliff:g id="NUMBER_0">%d</xliff:g>-mal falsch gezeichnet. Nach <xliff:g id="NUMBER_1">%d</xliff:g> weiteren erfolglosen Versuchen werden Sie aufgefordert, Ihr Telefon mithilfe eines E-Mail-Kontos zu entsperren.\n\n Versuchen Sie es in <xliff:g id="NUMBER_2">%d</xliff:g> Sekunden erneut."</string>
+    <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Falscher PIN-Code der SIM-Karte. Bitte wenden Sie sich an Ihren Mobilfunkanbieter, damit er Ihr Gerät entsperrt."</string>
     <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249">
-      <item quantity="other">Falscher PIN-Code der SIM-Karte. Du hast noch <xliff:g id="NUMBER_1">%d</xliff:g> Versuche.</item>
-      <item quantity="one">Falscher PIN-Code der SIM-Karte. Du hast noch <xliff:g id="NUMBER_0">%d</xliff:g> Versuch, bevor du das Gerät von deinem Mobilfunkanbieter entsperren lassen musst.</item>
+      <item quantity="other">Falscher PIN-Code der SIM-Karte. Sie haben noch <xliff:g id="NUMBER_1">%d</xliff:g> Versuche.</item>
+      <item quantity="one">Falscher PIN-Code der SIM-Karte. Sie haben noch <xliff:g id="NUMBER_0">%d</xliff:g> Versuch, bevor Sie das Gerät von Ihrem Mobilfunkanbieter entsperren lassen müssen.</item>
     </plurals>
-    <string name="kg_password_wrong_puk_code_dead" msgid="7077536808291316208">"Die SIM-Karte kann nicht verwendet werden. Bitte wende dich an deinen Mobilfunkanbieter."</string>
+    <string name="kg_password_wrong_puk_code_dead" msgid="7077536808291316208">"Die SIM-Karte kann nicht verwendet werden. Bitte wenden Sie sich an Ihren Mobilfunkanbieter."</string>
     <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="7576227366999858780">
-      <item quantity="other">Falscher PUK-Code der SIM-Karte. Du hast noch <xliff:g id="NUMBER_1">%d</xliff:g> Versuche, bevor deine SIM-Karte endgültig gesperrt wird.</item>
-      <item quantity="one">Falscher PUK-Code der SIM-Karte. Du hast noch <xliff:g id="NUMBER_0">%d</xliff:g> Versuch, bevor deine SIM-Karte endgültig gesperrt wird.</item>
+      <item quantity="other">Falscher PUK-Code der SIM-Karte. Sie haben noch <xliff:g id="NUMBER_1">%d</xliff:g> Versuche, bevor Ihre SIM-Karte endgültig gesperrt wird.</item>
+      <item quantity="one">Falscher PUK-Code der SIM-Karte. Sie haben noch <xliff:g id="NUMBER_0">%d</xliff:g> Versuch, bevor Ihre SIM-Karte endgültig gesperrt wird.</item>
     </plurals>
     <string name="kg_password_pin_failed" msgid="6268288093558031564">"Fehler beim Entsperren mit der PIN der SIM-Karte"</string>
     <string name="kg_password_puk_failed" msgid="2838824369502455984">"Fehler beim Entsperren mithilfe des PUK-Codes der SIM-Karte"</string>
@@ -120,16 +120,16 @@
     <string name="kg_prompt_reason_switch_profiles_pin" msgid="8108020184731052246">"Beim Profilwechsel ist die Eingabe der PIN erforderlich."</string>
     <string name="kg_prompt_reason_switch_profiles_password" msgid="6755997057852042672">"Beim Profilwechsel ist die Eingabe des Passworts erforderlich."</string>
     <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="2697444392228541853">
-      <item quantity="other">Das Gerät wurde seit <xliff:g id="NUMBER_1">%d</xliff:g> Stunden nicht mehr entsperrt. Bestätige das Muster.</item>
-      <item quantity="one">Das Gerät wurde seit <xliff:g id="NUMBER_0">%d</xliff:g> Stunde nicht mehr entsperrt. Bestätige das Muster.</item>
+      <item quantity="other">Das Gerät wurde seit <xliff:g id="NUMBER_1">%d</xliff:g> Stunden nicht mehr entsperrt. Bestätigen Sie das Muster.</item>
+      <item quantity="one">Das Gerät wurde seit <xliff:g id="NUMBER_0">%d</xliff:g> Stunde nicht mehr entsperrt. Bestätigen Sie das Muster.</item>
     </plurals>
     <plurals name="kg_prompt_reason_time_pin" formatted="false" msgid="2118758475374354849">
-      <item quantity="other">Das Gerät wurde seit <xliff:g id="NUMBER_1">%d</xliff:g> Stunden nicht mehr entsperrt. Bestätige die PIN.</item>
-      <item quantity="one">Das Gerät wurde seit <xliff:g id="NUMBER_0">%d</xliff:g> Stunde nicht mehr entsperrt. Bestätige die PIN.</item>
+      <item quantity="other">Das Gerät wurde seit <xliff:g id="NUMBER_1">%d</xliff:g> Stunden nicht mehr entsperrt. Bestätigen Sie die PIN.</item>
+      <item quantity="one">Das Gerät wurde seit <xliff:g id="NUMBER_0">%d</xliff:g> Stunde nicht mehr entsperrt. Bestätigen Sie die PIN.</item>
     </plurals>
     <plurals name="kg_prompt_reason_time_password" formatted="false" msgid="5132693663364913675">
-      <item quantity="other">Das Gerät wurde seit <xliff:g id="NUMBER_1">%d</xliff:g> Stunden nicht mehr entsperrt. Bestätige das Passwort.</item>
-      <item quantity="one">Das Gerät wurde seit <xliff:g id="NUMBER_0">%d</xliff:g> Stunde nicht mehr entsperrt. Bestätige das Passwort.</item>
+      <item quantity="other">Das Gerät wurde seit <xliff:g id="NUMBER_1">%d</xliff:g> Stunden nicht mehr entsperrt. Bestätigen Sie das Passwort.</item>
+      <item quantity="one">Das Gerät wurde seit <xliff:g id="NUMBER_0">%d</xliff:g> Stunde nicht mehr entsperrt. Bestätigen Sie das Passwort.</item>
     </plurals>
     <string name="fingerprint_not_recognized" msgid="2690661881608146617">"Nicht erkannt"</string>
 </resources>
diff --git a/packages/Keyguard/res/values-el/cm_strings.xml b/packages/Keyguard/res/values-el/cm_strings.xml
index 6ea7b00..78e5498 100644
--- a/packages/Keyguard/res/values-el/cm_strings.xml
+++ b/packages/Keyguard/res/values-el/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">Η κάρτα SIM είναι κλειδωμένη</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Μη έγκυρη κάρτα.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Εισάγετε το PIN, έχετε <xliff:g id="number">%d</xliff:g> προσπάθειες πριν χρειαστεί να επικοινωνήσετε με τον πάροχό σας για να ξεκλειδώσετε τη συσκευή σας.</item>
     <item quantity="other">Εισάγετε το PIN, έχετε <xliff:g id="number">%d</xliff:g> προσπάθειες.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Σφάλμα: Το μήκος εισόδου είναι μικρότερο από το ελάχιστο μήκος</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rAU/cm_strings.xml b/packages/Keyguard/res/values-en-rAU/cm_strings.xml
index 5bf42fa..6261b2a 100644
--- a/packages/Keyguard/res/values-en-rAU/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rAU/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Invalid card.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-en-rGB/cm_strings.xml b/packages/Keyguard/res/values-en-rGB/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-en-rGB/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-en-rIN/cm_strings.xml b/packages/Keyguard/res/values-en-rIN/cm_strings.xml
index f737d9e..c0f7bbb 100644
--- a/packages/Keyguard/res/values-en-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-en-rIN/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM is Perso locked</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Invalid card.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
     <item quantity="other">Enter SIM PIN, you have <xliff:g id="number">%d</xliff:g> remaining attempts.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Error: Input shorter than minimum length</string>
 </resources>
diff --git a/packages/Keyguard/res/values-en-rPT/cm_strings.xml b/packages/Keyguard/res/values-en-rPT/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-en-rPT/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-en-rPT/strings.xml b/packages/Keyguard/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-en-rPT/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-eo/cm_strings.xml b/packages/Keyguard/res/values-eo/cm_strings.xml
index 60da84e..0ba09aa 100644
--- a/packages/Keyguard/res/values-eo/cm_strings.xml
+++ b/packages/Keyguard/res/values-eo/cm_strings.xml
@@ -16,5 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="lockscreen_sim_error_message_short">Nevalida karto.</string>
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-eo/strings.xml b/packages/Keyguard/res/values-eo/strings.xml
index dcaafc1..170dcac 100644
--- a/packages/Keyguard/res/values-eo/strings.xml
+++ b/packages/Keyguard/res/values-eo/strings.xml
@@ -19,7 +19,127 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="keyguard_plugged_in">Ŝarĝado</string>
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Forigi</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
   <string name="keyguard_carrier_default">Neniu servo.</string>
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <string name="airplane_mode">Aviadila reĝimo</string>
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
 </resources>
diff --git a/packages/Keyguard/res/values-es-rCO/cm_strings.xml b/packages/Keyguard/res/values-es-rCO/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-es-rCO/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-es-rCO/strings.xml b/packages/Keyguard/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-es-rCO/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-es-rMX/cm_strings.xml b/packages/Keyguard/res/values-es-rMX/cm_strings.xml
new file mode 100644
index 0000000..ff28392
--- /dev/null
+++ b/packages/Keyguard/res/values-es-rMX/cm_strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
+</resources>
diff --git a/packages/Keyguard/res/values-es-rMX/strings.xml b/packages/Keyguard/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-es-rMX/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-es-rUS/cm_strings.xml b/packages/Keyguard/res/values-es-rUS/cm_strings.xml
new file mode 100644
index 0000000..078fc60
--- /dev/null
+++ b/packages/Keyguard/res/values-es-rUS/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">Tarjeta no válida.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">Introduce el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de tener que contactar a tu operador para desbloquear el dispositivo.</item>
+    <item quantity="other">Introduce el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes antes de tener que contactar a tu operador para desbloquear el dispositivo.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
+</resources>
diff --git a/packages/Keyguard/res/values-es/cm_strings.xml b/packages/Keyguard/res/values-es/cm_strings.xml
index 72ed182..1e2e79a 100644
--- a/packages/Keyguard/res/values-es/cm_strings.xml
+++ b/packages/Keyguard/res/values-es/cm_strings.xml
@@ -16,10 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">La tarjeta SIM tiene un bloqueo personalizado</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Tarjeta no válida.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Introduce el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intento restante antes de tener que comunicarte con tu operadora para desbloquear el dispositivo.</item>
     <item quantity="other">Introduce el código PIN. Tienes <xliff:g id="number">%d</xliff:g> intentos restantes.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Error: La entrada es más corta que la longitud mínima</string>
 </resources>
diff --git a/packages/Keyguard/res/values-et-rEE/cm_strings.xml b/packages/Keyguard/res/values-et-rEE/cm_strings.xml
index 01fd936..3a284d7 100644
--- a/packages/Keyguard/res/values-et-rEE/cm_strings.xml
+++ b/packages/Keyguard/res/values-et-rEE/cm_strings.xml
@@ -16,5 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM/RUIM on Perso lukustatud</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Kehtetu kaart.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Viga: PIN liiga lühike</string>
 </resources>
diff --git a/packages/Keyguard/res/values-eu-rES/cm_strings.xml b/packages/Keyguard/res/values-eu-rES/cm_strings.xml
index 41081c9..aaed5c3 100644
--- a/packages/Keyguard/res/values-eu-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-eu-rES/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM txartelak blokeo pertsonala du</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Txartela baliogabea.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Sartu SIM txartelaren PIN kodea, saiakera  <xliff:g id="number">%d</xliff:g> geratzen zaizu gailua desblokeatzeko zure operadorearekin kontaktuan jarri behar aurretik.</item>
     <item quantity="other">Sartu SIM txartelaren PIN kodea, <xliff:g id="number">%d</xliff:g> saiakera geratzen zaizkizu.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Errorea: Sarrera gutxieneko luzera baino laburragoa da</string>
 </resources>
diff --git a/packages/Keyguard/res/values-fa/cm_strings.xml b/packages/Keyguard/res/values-fa/cm_strings.xml
index 84bca66..d069475 100644
--- a/packages/Keyguard/res/values-fa/cm_strings.xml
+++ b/packages/Keyguard/res/values-fa/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">سیم کارت نامعتبر.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-fi/cm_strings.xml b/packages/Keyguard/res/values-fi/cm_strings.xml
index 62cc982..b8eb2f6 100644
--- a/packages/Keyguard/res/values-fi/cm_strings.xml
+++ b/packages/Keyguard/res/values-fi/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM-kortti on Perso-lukittu</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Virheellinen kortti.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Syötä SIM-kortin PIN-koodi, sinulla on <xliff:g id="number">%d</xliff:g> yritys jäljellä, tai sinun on pyydetttävä operaattoriasi poistamaan laitteen lukitus.</item>
     <item quantity="other">Anna SIM-kortin PIN-koodi, sinulla on <xliff:g id="number">%d</xliff:g> yritystä jäljellä.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Virhe: Syöttö lyhyempi kuin vähimmäispituus</string>
 </resources>
diff --git a/packages/Keyguard/res/values-fil-rPH/cm_strings.xml b/packages/Keyguard/res/values-fil-rPH/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-fil-rPH/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-fr-rCA/cm_strings.xml b/packages/Keyguard/res/values-fr-rCA/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-fr-rCA/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-fr/cm_strings.xml b/packages/Keyguard/res/values-fr/cm_strings.xml
index 4d3398e..9cf3816 100644
--- a/packages/Keyguard/res/values-fr/cm_strings.xml
+++ b/packages/Keyguard/res/values-fr/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">La carte SIM possède un verrouillage personnel</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Carte SIM incorrecte.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Entrez le code PIN de la carte SIM, il vous reste <xliff:g id="number">%d</xliff:g> tentative avant d\'avoir à contacter votre opérateur pour déverrouiller votre appareil.</item>
     <item quantity="other">Entrez le code PIN de la carte SIM, il vous reste <xliff:g id="number">%d</xliff:g> tentatives.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Erreur : code entré trop court</string>
 </resources>
diff --git a/packages/Keyguard/res/values-frp-rIT/cm_strings.xml b/packages/Keyguard/res/values-frp-rIT/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-frp-rIT/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-frp-rIT/strings.xml b/packages/Keyguard/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-frp-rIT/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-fy-rNL/cm_strings.xml b/packages/Keyguard/res/values-fy-rNL/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-fy-rNL/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-fy-rNL/strings.xml b/packages/Keyguard/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-fy-rNL/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-ga-rIE/cm_strings.xml b/packages/Keyguard/res/values-ga-rIE/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ga-rIE/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ga-rIE/strings.xml b/packages/Keyguard/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-ga-rIE/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-gd-rGB/cm_strings.xml b/packages/Keyguard/res/values-gd-rGB/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-gd-rGB/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-gd-rGB/strings.xml b/packages/Keyguard/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-gd-rGB/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-gl-rES/cm_strings.xml b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
index 1e46e59..4221609 100644
--- a/packages/Keyguard/res/values-gl-rES/cm_strings.xml
+++ b/packages/Keyguard/res/values-gl-rES/cm_strings.xml
@@ -16,7 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">A SIM/RUIM personalizada está bloqueada</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Esta tarxeta non é válida.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Erro: O dato introducido é máis curto có mínimo esixido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-gu-rIN/cm_strings.xml b/packages/Keyguard/res/values-gu-rIN/cm_strings.xml
new file mode 100644
index 0000000..7e4d6f5
--- /dev/null
+++ b/packages/Keyguard/res/values-gu-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM કાર્ડ Perso લૉક કર્યું છે</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">અપ્રમાણિત કાર્ડ.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">SIM PIN દાખલ કરો, તમારું ડિવાઇસ તમારા પ્રદાતા પાસે અનલૉક કરવા તેમનો સંપર્ક સાધતા પહેલાં તમારી પાસે <xliff:g id="number">%d</xliff:g> પ્રયાસો બાકી રહ્યાં છે.</item>
+    <item quantity="other">SIM PIN દાખલ કરો, તમારી પાસે <xliff:g id="number">%d</xliff:g> પ્રયાસો બાકી છે.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">ભૂલ: લધુત્તમ લંબાઇ કરતા ઇનપુટ ટૂંકુ છે</string>
+</resources>
diff --git a/packages/Keyguard/res/values-hi/cm_strings.xml b/packages/Keyguard/res/values-hi/cm_strings.xml
index 424c41c..db6aed7 100644
--- a/packages/Keyguard/res/values-hi/cm_strings.xml
+++ b/packages/Keyguard/res/values-hi/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">अमान्य कार्ड।</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-hr/cm_strings.xml b/packages/Keyguard/res/values-hr/cm_strings.xml
index fc1c567..0ccbe4f 100644
--- a/packages/Keyguard/res/values-hr/cm_strings.xml
+++ b/packages/Keyguard/res/values-hr/cm_strings.xml
@@ -16,12 +16,16 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM kartica je Perso zaključana</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Kartica nije valjana.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Upišite SIM PIN, preostao vam je <xliff:g id="number">%d</xliff:g> pokušaj nakon čega ćete morati kontaktirati svog pružatelja usluga da otključa vaš uređaj.</item>
     <item quantity="few">Upišite SIM PIN, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
     <item quantity="other">Upišite SIM PIN, preostalo vam je <xliff:g id="number">%d</xliff:g> pokušaja.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Pogreška: Ulaz je kraći od minimalne potrebne duljine</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hu/cm_strings.xml b/packages/Keyguard/res/values-hu/cm_strings.xml
index b985e02..5eedde4 100644
--- a/packages/Keyguard/res/values-hu/cm_strings.xml
+++ b/packages/Keyguard/res/values-hu/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM Perso zárva</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Érvénytelen kártya.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Adja meg a SIM-kártya PIN-kódját. <xliff:g id="number">%d</xliff:g> kísérlete maradt mielőtt fel kell vennie a kapcsolatot a mobilszolgáltatójával a készülék feloldásához.</item>
     <item quantity="other">Adja meg a SIM-kártya PIN-kódját. <xliff:g id="number">%d</xliff:g> kísérlete maradt.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Hiba: A bemeneti adat rövidebb, mint a minimális hossz</string>
 </resources>
diff --git a/packages/Keyguard/res/values-hu/strings.xml b/packages/Keyguard/res/values-hu/strings.xml
index 55cf24f..6f8f189 100644
--- a/packages/Keyguard/res/values-hu/strings.xml
+++ b/packages/Keyguard/res/values-hu/strings.xml
@@ -24,11 +24,11 @@
     <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Írja be a PIN kódot"</string>
     <string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"Írja be a SIM kártya PUK kódját, majd az új PIN kódot"</string>
     <string name="keyguard_password_enter_puk_prompt" msgid="1801941051094974609">"SIM kártya PUK kódja"</string>
-    <string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"Új PIN-kód a SIM kártyához"</string>
+    <string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"Új PIN kód a SIM kártyához"</string>
     <string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"Érintsen jelszó megadásához"</font></string>
     <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"A feloldáshoz írja be a jelszót"</string>
     <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Feloldáshoz írja be a PIN kódot"</string>
-    <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Helytelen PIN-kód."</string>
+    <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Helytelen PIN kód."</string>
     <string name="keyguard_charged" msgid="3272223906073492454">"Feltöltve"</string>
     <string name="keyguard_plugged_in" msgid="9087497435553252863">"Töltés"</string>
     <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"Gyors töltés folyamatban"</string>
@@ -51,8 +51,8 @@
     <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Feloldás jelszóval"</string>
     <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Mintaterület"</string>
     <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Csúsztatási terület"</string>
-    <string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"PIN-kód területe"</string>
-    <string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"SIM PIN-kód területe"</string>
+    <string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"PIN kód területe"</string>
+    <string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"SIM PIN kód területe"</string>
     <string name="keyguard_accessibility_sim_puk_area" msgid="1880823406954996207">"SIM PUK kód területe"</string>
     <string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"A következő riasztás beállított ideje: <xliff:g id="ALARM">%1$s</xliff:g>"</string>
     <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Delete"</string>
@@ -60,7 +60,7 @@
     <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Elfelejtett minta"</string>
     <string name="kg_wrong_pattern" msgid="1850806070801358830">"Helytelen minta"</string>
     <string name="kg_wrong_password" msgid="2333281762128113157">"Helytelen jelszó"</string>
-    <string name="kg_wrong_pin" msgid="1131306510833563801">"Helytelen PIN-kód"</string>
+    <string name="kg_wrong_pin" msgid="1131306510833563801">"Helytelen PIN kód"</string>
     <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Próbálkozzon újra <xliff:g id="NUMBER">%d</xliff:g> másodperc múlva."</string>
     <string name="kg_pattern_instructions" msgid="398978611683075868">"Rajzolja le a mintát"</string>
     <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Adja meg a SIM kártya PIN kódját"</string>
@@ -69,8 +69,8 @@
     <string name="kg_password_instructions" msgid="5753646556186936819">"Írja be a jelszót"</string>
     <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"A SIM kártya le van tiltva. A folytatáshoz adja meg a PUK kódot. A részletekért vegye fel a kapcsolatot szolgáltatójával."</string>
     <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"A(z) „<xliff:g id="CARRIER">%1$s</xliff:g>” SIM kártyát a rendszer letiltotta. A folytatáshoz adja meg a PUK kódot. A részletekért vegye a fel a kapcsolatot szolgáltatójával."</string>
-    <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Kívánt PIN-kód megadása"</string>
-    <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Kívánt PIN-kód megerősítése"</string>
+    <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Kívánt PIN kód megadása"</string>
+    <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Kívánt PIN kód megerősítése"</string>
     <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM kártya feloldása..."</string>
     <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"4–8 számjegyű PIN kódot írjon be."</string>
     <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"A PUK kód legalább  8 számjegyből kell, hogy álljon."</string>
@@ -94,7 +94,7 @@
     <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"<xliff:g id="NUMBER">%d</xliff:g> alkalommal próbálkozott sikertelenül a telefon zárolásának feloldásával. A rendszer eltávolítja munkahelyi profilját, és összes profiladata törlődik."</string>
     <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"<xliff:g id="NUMBER_0">%d</xliff:g> alkalommal helytelenül rajzolta le a feloldási mintát. További <xliff:g id="NUMBER_1">%d</xliff:g> sikertelen kísérlet után egy e-mail fiók használatával kell feloldania a táblagépét.\n\n Kérjük, próbálja újra <xliff:g id="NUMBER_2">%d</xliff:g> másodperc múlva."</string>
     <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"<xliff:g id="NUMBER_0">%d</xliff:g> alkalommal helytelenül rajzolta le a feloldási mintát. További <xliff:g id="NUMBER_1">%d</xliff:g> sikertelen kísérlet után egy e-mail fiók használatával kell feloldania a telefonját.\n\n Kérjük, próbálja újra <xliff:g id="NUMBER_2">%d</xliff:g> másodperc múlva."</string>
-    <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Helytelen PIN-kód a SIM kártyához; vegye fel a kapcsolatot szolgáltatójával az eszköz feloldásához."</string>
+    <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Helytelen PIN kód a SIM kártyához; vegye fel a kapcsolatot szolgáltatójával az eszköz feloldásához."</string>
     <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249">
       <item quantity="other">A SIM kártya PIN kódja helytelen. <xliff:g id="NUMBER_1">%d</xliff:g> próbálkozás maradt.</item>
       <item quantity="one">A SIM kártya PIN kódja helytelen. <xliff:g id="NUMBER_0">%d</xliff:g> próbálkozás maradt. Utána a szolgáltatótól kell feloldást kérnie.</item>
@@ -114,7 +114,7 @@
     <string name="kg_prompt_reason_restart_pin" msgid="994878216570694974">"Ha újraindítja az eszközt, meg kell adnia a PIN kódot."</string>
     <string name="kg_prompt_reason_restart_password" msgid="2375742919528461664">"Ha újraindítja az eszközt, meg kell adnia a jelszót."</string>
     <string name="kg_prompt_reason_timeout_pattern" msgid="8930047492617900785">"Minta szükséges a nagyobb biztonság érdekében."</string>
-    <string name="kg_prompt_reason_timeout_pin" msgid="7470468607947726377">"PIN-kód szükséges a nagyobb biztonság érdekében."</string>
+    <string name="kg_prompt_reason_timeout_pin" msgid="7470468607947726377">"PIN kód szükséges a nagyobb biztonság érdekében."</string>
     <string name="kg_prompt_reason_timeout_password" msgid="1177412542773936957">"Jelszó szükséges a nagyobb biztonság érdekében."</string>
     <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3802056699323773969">"Ha vált a profilok között, meg kell adnia a mintát."</string>
     <string name="kg_prompt_reason_switch_profiles_pin" msgid="8108020184731052246">"Ha vált a profilok között, meg kell adnia a PIN kódot."</string>
diff --git a/packages/Keyguard/res/values-hy-rAM/cm_strings.xml b/packages/Keyguard/res/values-hy-rAM/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-hy-rAM/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-in/cm_strings.xml b/packages/Keyguard/res/values-in/cm_strings.xml
index 0a880fb..16e6bf5 100644
--- a/packages/Keyguard/res/values-in/cm_strings.xml
+++ b/packages/Keyguard/res/values-in/cm_strings.xml
@@ -16,5 +16,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">Kartu SIM terkunci operator seluler lain</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Kartu tidak valid.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="other">Masukkan PIN SIM, Anda memiliki <xliff:g id="number">%d</xliff:g> upaya tersisa.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Kesalahan: Masukan lebih pendek dari panjang minimum</string>
 </resources>
diff --git a/packages/Keyguard/res/values-is-rIS/cm_strings.xml b/packages/Keyguard/res/values-is-rIS/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-is-rIS/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-it/cm_strings.xml b/packages/Keyguard/res/values-it/cm_strings.xml
index 1c48611..f0dd7e3 100644
--- a/packages/Keyguard/res/values-it/cm_strings.xml
+++ b/packages/Keyguard/res/values-it/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM bloccata</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Scheda non valida.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Inserisci il PIN della SIM, hai ancora <xliff:g id="number">%d</xliff:g> tentativo rimanente prima di dover contattare l\'operatore per sbloccare il dispositivo.</item>
     <item quantity="other">Inserisci il PIN della SIM, hai ancora <xliff:g id="number">%d</xliff:g> tentativi rimanenti.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Errore: input non sufficientemente lungo</string>
 </resources>
diff --git a/packages/Keyguard/res/values-iw/cm_strings.xml b/packages/Keyguard/res/values-iw/cm_strings.xml
index 0cd676b..faaecee 100644
--- a/packages/Keyguard/res/values-iw/cm_strings.xml
+++ b/packages/Keyguard/res/values-iw/cm_strings.xml
@@ -16,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="keyguard_perso_locked_message">כרטיס SIM נעול להתאמות</string>
-  <string name="lockscreen_sim_error_message_short">כרטיס שגוי.</string>
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">כרטיס SIM נעול להתאמות אישיות</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">כרטיס לא חוקי.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
-    <item quantity="one">הזן את קוד ה-PIN של כרטיס ה-SIM, נותר לך ניסיון <xliff:g id="number">%d</xliff:g> לפני שתיאלץ לפנות לספק הסלולרי שלך על מנת לבטל את נעילת המכשיר.</item>
+    <item quantity="one">הזן את קוד ה-PIN של כרטיס ה-SIM, נותר לך ניסיון <xliff:g id="number">%d</xliff:g> לפני שתיאלץ לפנות לספק התקשורת שלך על מנת לבטל את נעילת המכשיר.</item>
+    <item quantity="two">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
+    <item quantity="many">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
     <item quantity="other">הזן את קוד ה-PIN של כרטיס ה-SIM, נותרו לך <xliff:g id="number">%d</xliff:g> ניסיונות.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">שגיאה: הקלט קצר יותר מהאורך המינימלי</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ja/cm_strings.xml b/packages/Keyguard/res/values-ja/cm_strings.xml
index 0088dfc..7049ab6 100644
--- a/packages/Keyguard/res/values-ja/cm_strings.xml
+++ b/packages/Keyguard/res/values-ja/cm_strings.xml
@@ -16,10 +16,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIMはペルソロックされています</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">無効なカードです。</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="other">SIMのPINを入力してください、残り<xliff:g id="number">%d</xliff:g>回試行することができます。</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">エラー: 入力が最小長よりも短いです</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ja/strings.xml b/packages/Keyguard/res/values-ja/strings.xml
index 3230beb..cea4319 100644
--- a/packages/Keyguard/res/values-ja/strings.xml
+++ b/packages/Keyguard/res/values-ja/strings.xml
@@ -110,8 +110,8 @@
     <string name="keyguard_carrier_default" msgid="8700650403054042153">"通信サービスはありません。"</string>
     <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"入力方法の切り替えボタン。"</string>
     <string name="airplane_mode" msgid="3122107900897202805">"機内モード"</string>
-    <string name="kg_prompt_reason_restart_pattern" msgid="489430505491862444">"端末を再起動した時にはパターンが必要です。"</string>
-    <string name="kg_prompt_reason_restart_pin" msgid="994878216570694974">"端末を再起動した時にはPINが必要です。"</string>
+    <string name="kg_prompt_reason_restart_pattern" msgid="489430505491862444">"端末を再起動するにはパターンが必要です。"</string>
+    <string name="kg_prompt_reason_restart_pin" msgid="994878216570694974">"端末を再起動するにはPINが必要です。"</string>
     <string name="kg_prompt_reason_restart_password" msgid="2375742919528461664">"端末を再起動した時にはパスワードが必要です。"</string>
     <string name="kg_prompt_reason_timeout_pattern" msgid="8930047492617900785">"セキュリティを強化するため、パターンが必要です。"</string>
     <string name="kg_prompt_reason_timeout_pin" msgid="7470468607947726377">"セキュリティを強化するため、PINが必要です。"</string>
diff --git a/packages/Keyguard/res/values-ka-rGE/cm_strings.xml b/packages/Keyguard/res/values-ka-rGE/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ka-rGE/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml b/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-kk-rKZ/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-km-rKH/cm_strings.xml b/packages/Keyguard/res/values-km-rKH/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-km-rKH/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-kn-rIN/cm_strings.xml b/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
index fd17bce..7b7f4e2 100644
--- a/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
+++ b/packages/Keyguard/res/values-kn-rIN/cm_strings.xml
@@ -16,5 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">ಸಿಮ್/ಆರ್‍ಯುಐಎಂ ಪರ್ಸೊ ಲಾಕ್ ಆಗಿದೆ</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">ಅಮಾನ್ಯ ಕಾರ್ಡ್.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">ಸಿಮ್ ಪಿನ್ ಬರೆಯಿರಿ, ನಿಮಗೆ<xliff:g id="number">%d</xliff:g> ಪ್ರಯತ್ನ ಉಳಿದಿದೆ ನಂತರ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‍ಲಾಕ್ ಮಾಡಲು ಮೊದಲು ನಿಮ್ಮ ವಾಹಕಕ್ಕೆ ಸಂಪರ್ಕಿಸಬೇಕಾಗುತ್ತದೆ.</item>
+    <item quantity="other">ಸಿಮ್ ಪಿನ್ ಬರೆಯಿರಿ, ನಿಮಗೆ<xliff:g id="number">%d</xliff:g> ಪ್ರಯತ್ನ ಉಳಿದಿದೆ ನಂತರ ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‍ಲಾಕ್ ಮಾಡಲು ಮೊದಲು ನಿಮ್ಮ ವಾಹಕಕ್ಕೆ ಸಂಪರ್ಕಿಸಬೇಕಾಗುತ್ತದೆ.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">ದೋಷ: ಇನ್ಪುಟ್ ಕನಿಷ್ಠ ಉದ್ದ ಚಿಕ್ಕದಾಗಿರುತ್ತವೆ</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ko/cm_strings.xml b/packages/Keyguard/res/values-ko/cm_strings.xml
index 4be11f7..3ca8c32 100644
--- a/packages/Keyguard/res/values-ko/cm_strings.xml
+++ b/packages/Keyguard/res/values-ko/cm_strings.xml
@@ -16,10 +16,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM이 Perso lock되어 있습니다.</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">올바르지 않은 카드입니다.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="other">SIM PIN을 입력하십시오. <xliff:g id="number">%d</xliff:g>회 후에는 이동통신사에 연락하여 기기를 잠금 해제해야 합니다.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">오류: 입력한 값이 최소 길이보다 짧음</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ku/cm_strings.xml b/packages/Keyguard/res/values-ku/cm_strings.xml
index d5fed16..969ee48 100644
--- a/packages/Keyguard/res/values-ku/cm_strings.xml
+++ b/packages/Keyguard/res/values-ku/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">کارته‌که‌ نادرووستە.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-ku/strings.xml b/packages/Keyguard/res/values-ku/strings.xml
index 84be97e..336eff9 100644
--- a/packages/Keyguard/res/values-ku/strings.xml
+++ b/packages/Keyguard/res/values-ku/strings.xml
@@ -19,59 +19,133 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_code">PIN کۆد بنوسه‌</string>
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_puk_code">PUK ی سیمکارته‌که‌ و  PIN ی نوێ بنوسه‌</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">کۆدی PUK ی سیمکارت</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">پین کۆدی نوێی سیمکارت</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">بیسووه‌ بۆ نوسینی تێپەڕەوشە</font></string>
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_password_code">تێپه‌ڕه‌وشه‌ بنوسه‌ بۆ کردنه‌وه‌</string>
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_password_code">PIN بنوسه‌ بۆ کردنه‌وه‌</string>
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
   <string name="keyguard_password_wrong_pin_code">پین کۆد هەڵە بوو.</string>
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
   <string name="keyguard_charged">بارگاویی بوو</string>
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
   <string name="keyguard_low_battery">بارگاویکه‌رەکەت ببەستەوە.</string>
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">دەست بنێ بە پێڕستدا بۆ کردنه‌وه‌.</string>
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تۆڕی نێت داخرا</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message_short">سیمکارتی تێدا نییە</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="tablet">تابلێته‌که‌ سیمکارتی تێدا نییه‌.</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="default">ته‌له‌فۆنه‌که‌ سیمکارتی تێدا نییه‌.</string>
+  <!-- Shown to ask the user to insert a SIM card. -->
   <string name="keyguard_missing_sim_instructions">سیمکارتێکی تێبکه‌.</string>
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
   <string name="keyguard_missing_sim_instructions_long">سیمکارتی تێ نه‌کراوه‌ یان نایخوێنێته‌وه‌. سیمکارتێکی تێکه‌.</string>
+  <!-- Shown when SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_message_short">سیمکارتەکە بەکارنایەت.</string>
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_instructions">سیمکارتەکەت بۆ هه‌میشه‌ لەکار خرا .\n 
     پەیوەندیی بکە بە دابینکه‌ری ڕاژه‌ی بێته‌له‌وه‌ بۆ سیمکارتێکی تر.</string>
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
   <string name="keyguard_sim_locked_message">سیمکارتەکە داخرا.</string>
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
   <string name="keyguard_sim_puk_locked_message">سیمکارتەکە به‌ شێوه‌ی PUK داخرا.</string>
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
   <string name="keyguard_sim_unlock_progress_dialog_message">کردنەوەی سیمکارت\u2026</string>
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
   <string name="keyguard_accessibility_pattern_unlock">کردنه‌وه‌ بە کێشان.</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">کردنه‌وه‌ی پین.</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">کردنه‌وه‌ی تێپه‌ڕه‌وشه‌.</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">ناوچەی خه‌تکێشان.</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">ناوچەی لادان.</string>
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">سڕینه‌وه‌</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_enter">دانان</string>
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">بیرچونی خه‌تکێشان</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">خه‌تکێشان هه‌ڵه‌یه‌</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">تێپەڕەوشە هەڵەیه‌</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">PIN هەڵەیە</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown">دووبارە هەوڵبدەرەوە له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">خه‌ت بکێشه‌</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">دانانی PIN ی سیم</string>
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
   <string name="kg_pin_instructions">دانانی PIN</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">دانانی تێپەڕەوشە</string>
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint">ئێستا سیمه‌که‌ ناکارایه‌. کۆدی PUK دابنێ بۆ به‌رده‌وامبوون. بۆ زانیاریی زیاتر په‌یوه‌ندیی بکه‌ به‌ کۆمپانیای دابینه‌که‌ره‌وه‌.</string>
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
   <string name="kg_puk_enter_pin_hint">دانانی PIN کۆد بە ئارەزوی خۆت</string>
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
   <string name="kg_enter_confirm_pin_hint">دڵنیاکردنەوەی PIN کۆد</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">کردنه‌وه‌ی سیمکارت\u2026</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">PIN ێک بنوسه‌ له‌ 4 بۆ 8 ژماره‌ پێکهاتبێت.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
   <string name="kg_invalid_sim_puk_hint">کۆدی PUK ده‌بێت 8 ژمارە یان زیاتر بێت.</string>
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">دوبارە کۆدی PUK لێدەرەوە. هه‌وڵی چه‌ندباره‌ سیمکارته‌که‌ت له‌کار ده‌خات.</string>
+  <!-- String shown in PUK screen when PIN codes don't match -->
   <string name="kg_invalid_confirm_pin_hint" product="default">PIN کۆد هاوتا نییە</string>
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
   <string name="kg_login_too_many_attempts">زۆر هه‌وڵی خه‌تکێشانت داوه‌</string>
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
   <string name="kg_too_many_failed_pin_attempts_dialog_message">
         بە هەڵە PIN ت نوسیوە <xliff:g id="number">%d</xliff:g> جار.
         \n\nدوبارە هەوڵبدەرەوە له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
     
     </string>
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
   <string name="kg_too_many_failed_password_attempts_dialog_message">
         بەهەڵە تێپەڕە وشەت لێداوە <xliff:g id="number">%d</xliff:g> جار.
         \n\nدوبارە هەوڵبدەرەوە له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
@@ -83,22 +157,76 @@
     
    
 </string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tablet">
        به‌ هه‌ڵه‌ کردنەوەی خه‌تکێشانه‌که‌ت داوە <xliff:g id="number">%d</xliff:g> times جار.
        پاش <xliff:g id="number">%d</xliff:g> هه‌وڵی سه‌رنه‌که‌وتووی زیاتر،
        داوات لێ ده‌کرێت تابلێته‌که‌ت بکه‌یته‌وه‌ به‌ به‌کارهێنانی هه‌ژماری ئیمه‌یڵ.\n\n
        جارێکی تر هه‌وڵ بده‌ره‌وه‌ له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
     </string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="default">
        به‌ هه‌ڵه‌ کردنەوەی خه‌تکێشانه‌که‌ت لێداوە <xliff:g id="number">%d</xliff:g> times جار.
        پاش <xliff:g id="number">%d</xliff:g> هه‌وڵی سه‌رنه‌که‌وتووی زیاتر،
        داوات لێ ده‌کرێت ته‌له‌فۆنه‌که‌ بکه‌یته‌وه‌ به‌ به‌کارهێنانی هه‌ژماری ئیمه‌یڵ. \n\n
        جارێکی تر هه‌وڵ بده‌ره‌وه‌ له‌ <xliff:g id="number">%d</xliff:g> چرکه‌دا.
     </string>
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
   <string name="kg_password_wrong_pin_code_pukked">PIN کۆد هه‌ڵه‌یه‌ پێویسته‌ ئێستا په‌یوه‌ندیی بکه‌یت به‌ کۆمپانیای دابینکه‌ره‌وه‌ بۆ کردنه‌وه‌ی ئامێره‌که‌ت.</string>
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <plurals name="kg_password_wrong_pin_code">
+    <item quantity="one">PIN کۆدی سیم هه‌ڵه‌یه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی که‌ پێویست بکات په‌یوه‌ندیی به‌ کۆمپانیای دابینکه‌ره‌وه‌ بکه‌یت.</item>
+    <item quantity="other">کۆدی سیمکارت هەڵەیە .تۆ ته‌نیا <xliff:g id="number">%d</xliff:g> هەوڵێکت ماوە پێشی ئەوەی پەیوەندی بکەیت بە کۆمپانیاوە  بۆ کردنەوەی ئامێرەکەت .</item>
+  </plurals>
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
   <string name="kg_password_wrong_puk_code_dead">سیمه‌که‌ له‌کار که‌وتووه‌. په‌یوه‌ندیی بکه‌ به‌ کۆمپانیای دابینکه‌ره‌وه‌.</string>
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <plurals name="kg_password_wrong_puk_code">
+    <item quantity="one">PUK کۆدی سیم هه‌ڵه‌یه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی سیمه‌که‌ به‌ یه‌کجاریی له‌کار بکه‌وێت.</item>
+    <item quantity="other">PUK کۆدی سیم به‌ هه‌ڵه‌ لێدراوه‌، <xliff:g id="number">%d</xliff:g> هه‌وڵت ماوه‌ به‌رله‌وه‌ی سیمه‌که‌ به‌ یه‌کجاریی له‌کار بکه‌وێت.</item>
+  </plurals>
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
   <string name="kg_password_pin_failed">کارپێکردنی PIN ی سیم شکستی هێنا!</string>
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
   <string name="kg_password_puk_failed">کارپێکردنی PUK ی سیم شکستی هێنا!</string>
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
   <string name="kg_pin_accepted">کۆدەکە وه‌رگیرا!</string>
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
   <string name="keyguard_carrier_default">خزمەتگوزاریی به‌رده‌ست نییە.</string>
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
 </resources>
diff --git a/packages/Keyguard/res/values-ky-rKG/cm_strings.xml b/packages/Keyguard/res/values-ky-rKG/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ky-rKG/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-lb/cm_strings.xml b/packages/Keyguard/res/values-lb/cm_strings.xml
index 805aad0..7e662b9 100644
--- a/packages/Keyguard/res/values-lb/cm_strings.xml
+++ b/packages/Keyguard/res/values-lb/cm_strings.xml
@@ -16,5 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM/RUIM huet eng personaliséiert Spärung</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Ongëlteg Kaart.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Feeler: Agab ass méi kuerz wéi d\'Mindestlängt</string>
 </resources>
diff --git a/packages/Keyguard/res/values-lb/strings.xml b/packages/Keyguard/res/values-lb/strings.xml
index f0cd53f..0763983 100644
--- a/packages/Keyguard/res/values-lb/strings.xml
+++ b/packages/Keyguard/res/values-lb/strings.xml
@@ -19,87 +19,217 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
   <string name="app_name">Tastespär</string>
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_code">PIN-Code aginn</string>
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_puk_code">SIM-PUK an nei PIN aginn</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">SIM-PUK-Code</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">Neie SIM-PIN-Code</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">Dréck fir d\'Passwuert anzeginn</font></string>
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_password_code">Passwuert agi fir z\'entspären</string>
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_password_code">PIN agi fir z\'entspären</string>
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
   <string name="keyguard_password_wrong_pin_code">Falsche PIN-Code.</string>
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
   <string name="keyguard_charged">Opgelueden</string>
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
   <string name="keyguard_plugged_in">Gëtt opgelueden</string>
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <string name="keyguard_plugged_in_charging_fast">Gëtt séier opgelueden</string>
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <string name="keyguard_plugged_in_charging_slowly">Gëtt lues opgelueden</string>
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
   <string name="keyguard_low_battery">Connectéier däin Oplueder.</string>
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menü drécke fir z\'entspären.</string>
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">Netzwierk gespaart</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message_short">Keng SIM-Kaart</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="tablet">Keng SIM-Kaart am Tablet.</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="default">Keng SIM-Kaart am Telefon.</string>
+  <!-- Shown to ask the user to insert a SIM card. -->
   <string name="keyguard_missing_sim_instructions">SIM-Kaart asetzen.</string>
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
   <string name="keyguard_missing_sim_instructions_long">D\'SIM-Kaart feelt oder ass net liesbar. Setz eng SIM-Kaart an.</string>
+  <!-- Shown when SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_message_short">Onbenotzbar SIM-Kaart.</string>
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_instructions">Deng SIM-Kaart gouf permanent ausgeschalt.\n
 Kontaktéier däi Provider fir eng aner SIM-Kaart ze kréien.</string>
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
   <string name="keyguard_sim_locked_message">D\'SIM-Kaart ass gespaart.</string>
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
   <string name="keyguard_sim_puk_locked_message">D\'SIM-Kaart ass PUK-gespaart.</string>
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
   <string name="keyguard_sim_unlock_progress_dialog_message">D\'SIM-Kaart gëtt entspaart\u2026</string>
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
   <string name="keyguard_accessibility_pattern_unlock">Entspäre mat Muster.</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">Entspäre mat PIN.</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">Entspäre mat Passwuert.</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">Musterberäich.</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">Beräich fir Fangerbeweegung.</string>
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_area">PIN-Beräich</string>
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_sim_pin_area">SIM-PIN-Beräich</string>
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_sim_puk_area">SIM-PUK-Beräich</string>
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_next_alarm">Nächste Wecker gesat fir <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">Läschen</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_enter">Enter</string>
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">Muster vergiess</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">Falscht Muster</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">Falscht Passwuert</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">Falsche PIN</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown">Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">Mol däi Muster</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">SIM-PIN aginn</string>
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
   <string name="kg_sim_pin_instructions_multi">SIM-PIN fir \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\" aginn</string>
+  <!-- Instructions for using the PIN unlock screen -->
   <string name="kg_pin_instructions">PIN aginn</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">Passwuert aginn</string>
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint">D\'SIM ass elo desaktivéiert. Gëff e PUK-Code a fir weiderzemaachen. Kontaktéier däi Provider fir Detailer.</string>
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint_multi">D\'SIM \"<xliff:g id="carrier" example="CARD 1">%1$s</xliff:g>\" ass elo desaktivéiert. Gëff de PUK-Code an, fir weiderzemaachen. Kontaktéier däi Provider fir méi Detailer.</string>
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
   <string name="kg_puk_enter_pin_hint">Gëff de gewënschte PIN-Code an</string>
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
   <string name="kg_enter_confirm_pin_hint">Bestäteg de gewënschte PIN-Code</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">D\'SIM-Kaart gëtt entspaart\u2026</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">Gëff e PIN an, deen tëscht 4 an 8 Zifferen huet.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
   <string name="kg_invalid_sim_puk_hint">De PUK-Code misst 8 oder méi Zifferen hunn.</string>
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">Gëff de korrekte PUK-Code nees an. Bei widderhuelende Versich gëtt d\'SIM permanent desaktivéiert.</string>
+  <!-- String shown in PUK screen when PIN codes don't match -->
   <string name="kg_invalid_confirm_pin_hint" product="default">D\'PIN-Codë stëmmen net iwwereneen</string>
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
   <string name="kg_login_too_many_attempts">Ze vill Musterversich</string>
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
   <string name="kg_too_many_failed_pin_attempts_dialog_message">Du hues däi PIN <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
   <string name="kg_too_many_failed_password_attempts_dialog_message">Du hues däi Passwuert <xliff:g id="number">%d</xliff:g>-mol falsch aginn.\n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
   <string name="kg_too_many_failed_pattern_attempts_dialog_message">
         Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt.
         \n\nProbéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.
     </string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_almost_at_wipe" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Tablet op d\'Wierksastellungen zréckgesat an all d\'Date gi verluer.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_almost_at_wipe" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Telefon op d\'Wierksastellungen zréckgesat an all d\'Date gi verluer.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_now_wiping" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Tablet z\'entspären. Dësen Tablet gëtt zréckgesat, wat all d\'Date läscht.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_now_wiping" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Telefon z\'entspären. Dësen Telefon gëtt zréckgesat, wat all d\'Date läscht.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_almost_at_erase_user" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt dëse Benotzer a seng Benotzerdate geläscht.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_almost_at_erase_user" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt dëse Benotzer a seng Benotzerdate geläscht.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_now_erasing_user" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Tablet z\'entspären. Dëse Benotzer a seng Date gi geläscht.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_now_erasing_user" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht, den Telefon z\'entspären. Dëse Benotzer a seng Date gi geläscht.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Aarbechtsprofil a seng Profildate geläscht.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_almost_at_erase_profile" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëtt den Aarbechtsprofil a seng Profildate geläscht.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_now_erasing_profile" product="tablet">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Tablet z\'entspären. Den Aarbechtsprofil a seng Profildate gi geläscht.</string>
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
   <string name="kg_failed_attempts_now_erasing_profile" product="default">Du hues <xliff:g id="number">%d</xliff:g>-mol ouni Erfolleg versicht den Telefon z\'entspären. Den Aarbechtsprofil a seng Profildate gi geläscht.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tablet">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëss du gefrot däin Tablet duerch en E-Mail-Kont z\'entspären. Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="default">Du hues däin Entspärmuster <xliff:g id="number">%d</xliff:g>-mol falsch gemoolt. No <xliff:g id="number">%d</xliff:g> weidere feelgeschloene Versich gëss du gefrot däin Telefon duerch en E-Mail-Kont z\'entspären. Probéier nees a(n) <xliff:g id="number">%d</xliff:g> Sekonnen.</string>
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
   <string name="kg_password_wrong_pin_code_pukked">Inkorrekte SIM-PIN-Code. Du muss elo däi Provider kontaktéiere fir däin Apparat z\'entspären.</string>
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <plurals name="kg_password_wrong_pin_code">
+    <item quantity="one">Inkorrekte SIM-PIN-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versuch iwwreg ier s de däi Provider kontaktéiere muss fir däin Apparat z\'entspären.</item>
+    <item quantity="other">Inkorrekte SIM-PIN-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versich iwwreg.</item>
+  </plurals>
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
   <string name="kg_password_wrong_puk_code_dead">D\'SIM ass onbrauchbar. Kontaktéier däi Provider.</string>
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <plurals name="kg_password_wrong_puk_code">
+    <item quantity="one">Inkorrekte SIM-PUK-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versuch iwwreg ier deng SIM permanent onbrauchbar gëtt.</item>
+    <item quantity="other">Inkorrekte SIM-PUK-Code, du hues nach <xliff:g id="number">%d</xliff:g> Versich iwwreg ier deng SIM permanent onbrauchbar gëtt.</item>
+  </plurals>
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
   <string name="kg_password_pin_failed">SIM-PIN-Operatioun feelgeschloen!</string>
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
   <string name="kg_password_puk_failed">SIM-PUK-Operatioun feelgeschloen!</string>
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
   <string name="kg_pin_accepted">Code acceptéiert!</string>
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
   <string name="keyguard_carrier_default">Kee Service.</string>
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Knäppche fir d\'Method fir anzeginn ze wiesselen.</string>
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
 </resources>
diff --git a/packages/Keyguard/res/values-lo-rLA/cm_strings.xml b/packages/Keyguard/res/values-lo-rLA/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-lo-rLA/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-lt/cm_strings.xml b/packages/Keyguard/res/values-lt/cm_strings.xml
index 9f0cd5e..752fb39 100644
--- a/packages/Keyguard/res/values-lt/cm_strings.xml
+++ b/packages/Keyguard/res/values-lt/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Neteisinga kortelė.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-lv/cm_strings.xml b/packages/Keyguard/res/values-lv/cm_strings.xml
index f2b5d62..0694d2f 100644
--- a/packages/Keyguard/res/values-lv/cm_strings.xml
+++ b/packages/Keyguard/res/values-lv/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM ir personīgi bloķēta</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Nepareiza karte.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="zero">Ievadiet SIM kartes PIN kodu, jums ir atlicis <xliff:g id="number">%d </xliff:g> mēģinājums.</item>
     <item quantity="one">Ievadiet SIM kartes PIN kodu, jums ir atlicis <xliff:g id="number">%d </xliff:g> mēģinājums.</item>
     <item quantity="other">Ievadiet SIM kartes PIN kodu, jums ir atlikuši <xliff:g id="number">%d </xliff:g> mēģinājumi.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-mk-rMK/cm_strings.xml b/packages/Keyguard/res/values-mk-rMK/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-mk-rMK/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ml-rIN/cm_strings.xml b/packages/Keyguard/res/values-ml-rIN/cm_strings.xml
new file mode 100644
index 0000000..ea7f205
--- /dev/null
+++ b/packages/Keyguard/res/values-ml-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">സിം കാർഡ് ലോക്ക്</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">അസാധുവായ കാർഡ്.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">സിം പിൻ നൽകുക,നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് നിങ്ങളുടെ കാരിയർ ബന്ധപ്പെടണം അവശേഷിക്കെ <xliff:g id="number">%d</xliff:g>ശ്രമം നിങ്ങളെ ഉണ്ടു.</item>
+    <item quantity="other">സിം പിൻ നൽകുക,നിങ്ങളുടെ ഉപകരണം അൺലോക്കുചെയ്യുന്നതിന് <xliff:g id="number">%d</xliff:g>ശ്രമം നിങ്ങളെ ഉണ്ടു.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">പിശക്: മിനിമം കാരക്ടറുകൾ ഇല്ല</string>
+</resources>
diff --git a/packages/Keyguard/res/values-mn-rMN/cm_strings.xml b/packages/Keyguard/res/values-mn-rMN/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-mn-rMN/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-mr-rIN/cm_strings.xml b/packages/Keyguard/res/values-mr-rIN/cm_strings.xml
new file mode 100644
index 0000000..c3020ed
--- /dev/null
+++ b/packages/Keyguard/res/values-mr-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">सिम कार्ड पर्सो लॉक्ड आहे</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">अवैध कार्ड.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">सिम पिन लिहा, तुमचे डिव्हाइस अनलॉक करण्यासाठी तुम्ही तुमच्या वाहकाशी संपर्क करण्यापूर्वी तुमच्याकडे <xliff:g id="number">%d</xliff:g> प्रयत्न शिल्लक आहे.</item>
+    <item quantity="other">सिम पिन लिहा, तुमच्याकडे <xliff:g id="number">%d</xliff:g> प्रयत्न शिल्लक आहेत.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">त्रुटी: इनपुट किमान लांबीहून लहान</string>
+</resources>
diff --git a/packages/Keyguard/res/values-mr-rIN/strings.xml b/packages/Keyguard/res/values-mr-rIN/strings.xml
index da9863f..3d9e901 100644
--- a/packages/Keyguard/res/values-mr-rIN/strings.xml
+++ b/packages/Keyguard/res/values-mr-rIN/strings.xml
@@ -31,7 +31,7 @@
     <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"अयोग्य पिन कोड."</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_fast" msgid="6671162730167305479">"दृतपणे चार्ज होत आहे"</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>
diff --git a/packages/Keyguard/res/values-ms-rMY/cm_strings.xml b/packages/Keyguard/res/values-ms-rMY/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ms-rMY/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-my-rMM/cm_strings.xml b/packages/Keyguard/res/values-my-rMM/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-my-rMM/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-nb/cm_strings.xml b/packages/Keyguard/res/values-nb/cm_strings.xml
index bdbebac..99dad15 100644
--- a/packages/Keyguard/res/values-nb/cm_strings.xml
+++ b/packages/Keyguard/res/values-nb/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="keyguard_perso_locked_message">SIM/RUIM er Person låst</string>
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM-kort er Person låst</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Ugyldig kort.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Angi SIM PIN, du har <xliff:g id="number">%d</xliff:g> forsøk igjen før må du kontakte operatøren for å låse opp enheten.</item>
     <item quantity="other">Angi SIM PIN, du har <xliff:g id="number">%d</xliff:g> gjenstående forsøk.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Feil: Input kortere enn minimumslengden</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ne-rNP/cm_strings.xml b/packages/Keyguard/res/values-ne-rNP/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ne-rNP/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ne-rNP/strings.xml b/packages/Keyguard/res/values-ne-rNP/strings.xml
index 4a5907e..d18d0f2 100644
--- a/packages/Keyguard/res/values-ne-rNP/strings.xml
+++ b/packages/Keyguard/res/values-ne-rNP/strings.xml
@@ -82,22 +82,22 @@
     <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"तपाईँले तपाईँको अनलक ढाँचा गलत तरिकाले <xliff:g id="NUMBER_0">%d</xliff:g> पटक खिच्नु भएको छ। \n\n <xliff:g id="NUMBER_1">%d</xliff:g> सेकेन्डमा फेरि कोसिस गर्नुहोस्।"</string>
     <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="8774056606869646621">"तपाईंले गलत तरिकाले ट्याब्लेट अनलक गर्ने प्रयास गर्नु भएको छ<xliff:g id="NUMBER_0">%d</xliff:g>पटक।  <xliff:g id="NUMBER_1">%d</xliff:g> थप असफल प्रयासहरूपछि, यो ट्याब्लेट रिसेट हुनेछ जसले आफ्नो सम्पूर्ण डेटा मेट्नेछ।"</string>
     <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="1843331751334128428">"तपाईंले गलत तरिकाले फोन अनलक गर्ने प्रयास गर्नु भएको छ <xliff:g id="NUMBER_0">%d</xliff:g> पटक। पछि <xliff:g id="NUMBER_1">%d</xliff:g> थप असफल प्रयासहरूपछि, यो फोन  रिसेट हुनेछ जसले सम्पूर्ण डेटा मेटाउनेछ।।"</string>
-    <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="258925501999698032">"तपाईँ गलत तरिकाले ट्याब्लेट अनलक गर्ने प्रयास गर्नु भएको छ <xliff:g id="NUMBER">%d</xliff:g> पटक। यो ट्याब्लेट रिेसेट गरिनेछ जसले सम्पूर्ण डेटा मेट्नेछ।"</string>
+    <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="258925501999698032">"तपाईं गलत तरिकाले ट्याब्लेट अनलक गर्ने प्रयास गर्नु भएको छ <xliff:g id="NUMBER">%d</xliff:g> पटक। यो ट्याब्लेट रिेसेट गरिनेछ जसले सम्पूर्ण डेटा मेट्नेछ।"</string>
     <string name="kg_failed_attempts_now_wiping" product="default" msgid="7154028908459817066">"तपाईंले गलत तरिकाले फोन अनलक गर्ने प्रयास गर्नु भएको छ <xliff:g id="NUMBER">%d</xliff:g> पटक। यो फोन रिसेट गरिनेछ जसले सम्पूर्ण डेटा मेट्नेछ।"</string>
     <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="6159955099372112688">"तपाईंले गलत तरिकाले  ट्याब्लेट अनलक गर्ने प्रयास गर्नु भएको छ<xliff:g id="NUMBER_0">%d</xliff:g> पटक।  <xliff:g id="NUMBER_1">%d</xliff:g> थप असफल प्रयासहरूपछि, यो प्रयोगकर्ता हटाइनेछ जसले सम्पूर्ण प्रयोगकर्ता डेटा मेट्नेछ।"</string>
     <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="6945823186629369880">"तपाईंले गलत तरिकाले फोन अनलक गर्ने प्रयास गर्नु भएको छ <xliff:g id="NUMBER_0">%d</xliff:g> पटक। <xliff:g id="NUMBER_1">%d</xliff:g> थप असफल प्रयासहरूपछि, यो प्रयोगकर्ता हटाइनेछ जसले  सबै प्रयोगकर्ता डेटा मेट्नेछ।"</string>
     <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="3963486905355778734">"तपाईंले गलत तरिकाले ट्याब्लेट अनलक गर्ने प्रयास गर्नु भएको छ<xliff:g id="NUMBER">%d</xliff:g> पटक। यो प्रयोगकर्ता हटाइनेछ जसले सम्पूर्ण प्रयोगकर्ता डेटा मेट्नेछ ।"</string>
     <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="7729009752252111673">"तपाईंले गलत तरिकाले फोन अनलक गर्ने प्रयास गर्नु भएको छ<xliff:g id="NUMBER">%d</xliff:g> पटक। यो प्रयोगकर्ता हटाइनेछ जसले सम्पूर्ण प्रयोगकर्ता डेटा मेट्नेछ।"</string>
-    <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="4621778507387853694">"तपाईँ गलत तरिकाले ट्याब्लेट अनलक गर्ने प्रयास गर्नु भएको छ<xliff:g id="NUMBER_0">%d</xliff:g> पटक। <xliff:g id="NUMBER_1">%d</xliff:g> थप असफल प्रयासहरूपछि, काम प्रोफाइल हटाइनेछ जसले सबै प्रोफाइल डेटा मेट्नेछ।"</string>
+    <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="4621778507387853694">"तपाईं गलत तरिकाले ट्याब्लेट अनलक गर्ने प्रयास गर्नु भएको छ<xliff:g id="NUMBER_0">%d</xliff:g> पटक। <xliff:g id="NUMBER_1">%d</xliff:g> थप असफल प्रयासहरूपछि, काम प्रोफाइल हटाइनेछ जसले सबै प्रोफाइल डेटा मेट्नेछ।"</string>
     <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"तपाईंले गलत तरिकाले फोन अनलक गर्ने प्रयास गर्नु भएको छ <xliff:g id="NUMBER_0">%d</xliff:g> पटक। <xliff:g id="NUMBER_1">%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="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">%d</xliff:g> पटक कोर्नुभयो। <xliff:g id="NUMBER_1">%d</xliff:g> विफल प्रयत्नहरू पछि, तपाईंलाई आफ्नो ट्याब्लेट इमेल खाता प्रयोग गरेर अनलक गर्न सोधिने छ।\n\n फेरि प्रयास गर्नुहोस् <xliff:g id="NUMBER_2">%d</xliff:g> सेकेन्डहरूमा।"</string>
     <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"तपाईँले आफ्नो अनलक ढाँचा गलत रूपमा <xliff:g id="NUMBER_0">%d</xliff:g> पटक तान्नु भएको छ। <xliff:g id="NUMBER_1">%d</xliff:g> धेरै असफल प्रयासहरूपछि, तपाईँलाई एउटा इमेल खाताको प्रयोग गरेर तपाईँको फोन अनलक गर्न सोधिने छ।\n\n फेरि <xliff:g id="NUMBER_2">%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>
-      <item quantity="one">SIM PIN कोड गलत छ, तपाईँले अाफ्नो यन्त्र खोल्नलाई तपाईँको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईँसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
+      <item quantity="other"> गलत SIM PIN कोड, तपाईं सँग <xliff:g id="NUMBER_1">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
+      <item quantity="one">SIM PIN कोड गलत छ, तपाईंले अाफ्नो यन्त्र खोल्नलाई तपाईंको वाहकसँग सम्पर्क गर्नै पर्न अघि तपाईंसँग <xliff:g id="NUMBER_0">%d</xliff:g> पटक प्रयास बाँकी छ।</item>
     </plurals>
     <string name="kg_password_wrong_puk_code_dead" msgid="7077536808291316208">"SIM प्रयोग बिहिन छ। तपाईंको वाहकलाई सम्पर्क गर्नुहोस्।"</string>
     <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="7576227366999858780">
diff --git a/packages/Keyguard/res/values-nl/cm_strings.xml b/packages/Keyguard/res/values-nl/cm_strings.xml
index a2266f9..4eba178 100644
--- a/packages/Keyguard/res/values-nl/cm_strings.xml
+++ b/packages/Keyguard/res/values-nl/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">Simkaart is Perso-vergrendeld</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Ongeldige simkaart.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">SIM-PIN invoeren, u heeft <xliff:g id="number">%d</xliff:g> resterende pogingen voordat u contact moet opnemen met uw provider om uw apparaat te ontgrendelen.</item>
     <item quantity="other">SIM-PIN invoeren, u heeft <xliff:g id="number">%d</xliff:g> resterende pogingen.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Fout: Invoer is korter dan minimumlengte</string>
 </resources>
diff --git a/packages/Keyguard/res/values-oc-rFR/cm_strings.xml b/packages/Keyguard/res/values-oc-rFR/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-oc-rFR/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-oc-rFR/strings.xml b/packages/Keyguard/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-oc-rFR/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-or-rIN/cm_strings.xml b/packages/Keyguard/res/values-or-rIN/cm_strings.xml
new file mode 100644
index 0000000..b20e2bb
--- /dev/null
+++ b/packages/Keyguard/res/values-or-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM କାର୍ଡ଼ Perso ବନ୍ଦ ଅଛି</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">ଅବୈଧ କାର୍ଡ୍‍।</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">SIM, PIN ପ୍ରବେଶ କରନ୍ତୁ, ଆପଣଙ୍କ ଡିଭାଇସ୍‍ ଅନ୍‍ଲକ୍‍ କରିବା ପାଇଁ ଆପଣଙ୍କ ମୋବାଇଲ୍‍ ଅପରେଟରଙ୍କ ସହିତ ସମ୍ପର୍କ କରିବା ପୂର୍ବରୁ ଆପଣଙ୍କର <xliff:g id="number">%d</xliff:g> ଚେଷ୍ଟା ବାକି ଅଛି।</item>
+    <item quantity="other">SIM, PIN ପ୍ରବେଶ କରନ୍ତୁ, ଆପଣଙ୍କର <xliff:g id="number">%d</xliff:g> ଚେଷ୍ଟା ବାକି ଅଛି।</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">ତୃଟି: ଇନ୍ପୁଟ୍ ଛୋଟ ଅଛି ମିନିମମ୍ ଲମ୍ବରୁ</string>
+</resources>
diff --git a/packages/Keyguard/res/values-or-rIN/strings.xml b/packages/Keyguard/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..b53b53e
--- /dev/null
+++ b/packages/Keyguard/res/values-or-rIN/strings.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/* //device/apps/common/assets/res/any/strings.xml
+**
+** Copyright 2006, 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown when there is no SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card. -->
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
+  <!-- Shown when SIM card is permanently disabled. -->
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
+  <!-- Message shown when user enters wrong pattern -->
+  <!-- Message shown when user enters wrong password -->
+  <!-- Message shown when user enters wrong PIN -->
+  <!-- Countdown message shown after too many failed unlock attempts -->
+  <!-- Instructions for using the pattern unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen -->
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
+  <!-- Instructions for using the password unlock screen -->
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
+  <!-- Message shown when the user enters an invalid PUK code -->
+  <!-- String shown in PUK screen when PIN codes don't match -->
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
+</resources>
diff --git a/packages/Keyguard/res/values-pa-rIN/cm_strings.xml b/packages/Keyguard/res/values-pa-rIN/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-pa-rIN/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-pl/cm_strings.xml b/packages/Keyguard/res/values-pl/cm_strings.xml
index 1a2563c..855bf81 100644
--- a/packages/Keyguard/res/values-pl/cm_strings.xml
+++ b/packages/Keyguard/res/values-pl/cm_strings.xml
@@ -16,12 +16,16 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">Blokada Perso karty SIM/RUIM</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Nieprawidłowa karta.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałą próbę zanim będziesz musiał skontaktować się z operatorem, by odblokować urządzenie.</item>
     <item quantity="few">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałe próby.</item>
     <item quantity="other">Wprowadź PIN karty SIM, masz <xliff:g id="number">%d</xliff:g> pozostałych prób.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Błąd: Podany kod jest za krótki</string>
 </resources>
diff --git a/packages/Keyguard/res/values-pt-rBR/cm_strings.xml b/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
index 5ebd5be..d72d43a 100644
--- a/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
+++ b/packages/Keyguard/res/values-pt-rBR/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">O cartão SIM está bloqueado</string>
-  <string name="lockscreen_sim_error_message_short">Cartão SIM inválido.</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">Cartão inválido.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Digite o PIN do cartão SIM, você tem <xliff:g id="number">%d</xliff:g> tentativa restante antes de precisar contatar sua operadora para desbloquear seu aparelho.</item>
     <item quantity="other">Digite o PIN do cartão SIM, você tem <xliff:g id="number">%d</xliff:g> tentativas restantes.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Erro: Entrada mais curta do que o comprimento mínimo</string>
 </resources>
diff --git a/packages/Keyguard/res/values-pt-rPT/cm_strings.xml b/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
index bfa6b3a..2d5c4b1 100644
--- a/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
+++ b/packages/Keyguard/res/values-pt-rPT/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">O cartão SIM está bloqueado</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Cartão inválido.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Digite o código PIN do cartão SIM. Tem mais <xliff:g id="number">%d</xliff:g> tentativa antes de ter de contactar a sua operadora para desbloquear o dispositivo.</item>
     <item quantity="other">Digite o código PIN do cartão SIM. Tem mais <xliff:g id="number">%d</xliff:g> tentativas.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Erro: o tamanho é menor que o requerido</string>
 </resources>
diff --git a/packages/Keyguard/res/values-rm/cm_strings.xml b/packages/Keyguard/res/values-rm/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-rm/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ro/cm_strings.xml b/packages/Keyguard/res/values-ro/cm_strings.xml
index 5f9203b..c9a5723 100644
--- a/packages/Keyguard/res/values-ro/cm_strings.xml
+++ b/packages/Keyguard/res/values-ro/cm_strings.xml
@@ -16,6 +16,10 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Cartelă SIM incorectă.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Eroare: Introducere mai scurtă decât lungimea minimă</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ro/strings.xml b/packages/Keyguard/res/values-ro/strings.xml
index 525c01d..a017564 100644
--- a/packages/Keyguard/res/values-ro/strings.xml
+++ b/packages/Keyguard/res/values-ro/strings.xml
@@ -92,8 +92,8 @@
     <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Ați efectuat <xliff:g id="NUMBER_0">%d</xliff:g> încercări incorecte de deblocare a telefonului. După încă <xliff:g id="NUMBER_1">%d</xliff:g> încercări nereușite, profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string>
     <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a tabletei. Profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string>
     <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a telefonului. Profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string>
-    <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%d</xliff:g> încercări nereuşite, vi se va solicita să deblocați tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%d</xliff:g> (de) secunde."</string>
-    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%d</xliff:g> încercări nereuşite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%d</xliff:g> (de) secunde."</string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%d</xliff:g> (de) secunde."</string>
+    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%d</xliff:g> încercări nereuşite, vi se va solicita să deblocaţi telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%d</xliff:g> (de) secunde."</string>
     <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Codul PIN pentru cardul SIM este incorect. Contactați operatorul pentru a vă debloca dispozitivul."</string>
     <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249">
       <item quantity="few">Codul PIN pentru cardul SIM este incorect. V-au mai rămas <xliff:g id="NUMBER_1">%d</xliff:g> încercări.</item>
diff --git a/packages/Keyguard/res/values-ru/cm_strings.xml b/packages/Keyguard/res/values-ru/cm_strings.xml
index 4d64761..6f42203 100644
--- a/packages/Keyguard/res/values-ru/cm_strings.xml
+++ b/packages/Keyguard/res/values-ru/cm_strings.xml
@@ -16,12 +16,16 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM-карта заблокирована оператором</string>
-  <string name="lockscreen_sim_error_message_short">Ошибка карты.</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">Неисправная SIM-карта.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Введите PIN-код. У вас осталась <xliff:g id="number">%d</xliff:g> попытка перед тем, как вам придется обратиться к оператору для разблокировки.</item>
     <item quantity="few">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попытки.</item>
     <item quantity="other">Введите PIN-код. У вас осталось <xliff:g id="number">%d</xliff:g> попыток.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Ошибка: введено меньше минимальной длины</string>
 </resources>
diff --git a/packages/Keyguard/res/values-si-rLK/cm_strings.xml b/packages/Keyguard/res/values-si-rLK/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-si-rLK/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-sk/cm_strings.xml b/packages/Keyguard/res/values-sk/cm_strings.xml
index 8e5df9a..f54f1ff 100644
--- a/packages/Keyguard/res/values-sk/cm_strings.xml
+++ b/packages/Keyguard/res/values-sk/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Neplatná karta.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-sl/cm_strings.xml b/packages/Keyguard/res/values-sl/cm_strings.xml
index 84c794e..54034a7 100644
--- a/packages/Keyguard/res/values-sl/cm_strings.xml
+++ b/packages/Keyguard/res/values-sl/cm_strings.xml
@@ -16,13 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">Kartica SIM je zaklenjena v načinu Perso</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Neveljavna kartica.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostali poskus, preden boste morali stopiti v stik s svojim ponudnikom, da vam odklene napravo.</item>
     <item quantity="two">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostala poskusa.</item>
     <item quantity="few">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostale poskuse.</item>
     <item quantity="other">Vnesite PIN kartice SIM, imate še <xliff:g id="number">%d</xliff:g> preostalih poskusov.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Napaka: Vnos je krajši od minimalne zahtevane dolžine</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sq-rAL/cm_strings.xml b/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-sq-rAL/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-sr/cm_strings.xml b/packages/Keyguard/res/values-sr/cm_strings.xml
index f770859..9ae4248 100644
--- a/packages/Keyguard/res/values-sr/cm_strings.xml
+++ b/packages/Keyguard/res/values-sr/cm_strings.xml
@@ -16,12 +16,16 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM картица је лично закључана</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Неважећа картица.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостали покушај пре него што мораш контактирати свог оператора да откључаш уређај.</item>
     <item quantity="few">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостала покушаја пре него што мораш контактирати свог оператора да откључаш уређај.</item>
     <item quantity="other">Унеси SIM PIN, имаш <xliff:g id="number">%d</xliff:g> преостала покушаја пре него што мораш контактирати свог оператора да откључаш уређај.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Грешка: Унос је краћи од минималне дужине</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sv/cm_strings.xml b/packages/Keyguard/res/values-sv/cm_strings.xml
index 2a225d4..0b2cbaa 100644
--- a/packages/Keyguard/res/values-sv/cm_strings.xml
+++ b/packages/Keyguard/res/values-sv/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM-kortet är personligt låst</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Ogiltigt SIM.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Ange SIM-kortets PIN-kod, du har <xliff:g id="number">%d</xliff:g> försök kvar innan du behöver kontakta din operatör för att låsa upp din enhet.</item>
     <item quantity="other">Ange SIM-kortets PIN-kod, du har <xliff:g id="number">%d</xliff:g> försök kvar innan du behöver kontakta din operatör för att låsa upp din enhet.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">Fel: Input kortare än minsta längd</string>
 </resources>
diff --git a/packages/Keyguard/res/values-sw/cm_strings.xml b/packages/Keyguard/res/values-sw/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-sw/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-ta-rIN/cm_strings.xml b/packages/Keyguard/res/values-ta-rIN/cm_strings.xml
new file mode 100644
index 0000000..dded59d
--- /dev/null
+++ b/packages/Keyguard/res/values-ta-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM கார்டு பெர்சோ பூட்டப்பட்டது.</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">செல்லுபடியாகாத கார்டு.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">உள்ளிடுக SIM PIN, உங்கள் சாதனத்தை பூட்டுநீக்க உங்கள் கேரியரை தொடர்புகொள்வதற்உ முன்பாக உங்களிடம் <xliff:g id="number">%d</xliff:g> முயற்சி மீதமுள்ளது.</item>
+    <item quantity="other">உள்ளிடுக SIM PIN, உங்களிடம்  <xliff:g id="number">%d</xliff:g>  முயற்சிகள் இதமுள்ளன.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">பிழை: குறைந்தபட்ச நீளத்தைவிட உள்ளீடு சுருக்கமாக உள்ளது.</string>
+</resources>
diff --git a/packages/Keyguard/res/values-te-rIN/cm_strings.xml b/packages/Keyguard/res/values-te-rIN/cm_strings.xml
new file mode 100644
index 0000000..4404c92
--- /dev/null
+++ b/packages/Keyguard/res/values-te-rIN/cm_strings.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM పెర్సో లాక్ చేయబడింది</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <string name="lockscreen_sim_error_message_short">చెల్లని కార్డ్.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="one">SIM PIN ఎంటర్ చేయండి, మీకు <xliff:g id="number">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి ప్రయత్నించే ముందు పరికరాన్ని అన్లాక్ చేసేందుకు మీరు మీ కారియరును సంప్రదించాలి.</item>
+    <item quantity="other">SIM PINను ఎంటర్ చేయండి, మీకు <xliff:g id="number">%d</xliff:g> మిగిలి ఉన్నాయి.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">దోషం: ఇన్‌పుట్ కనీస పొడవుకంటే తక్కువగా ఉంది</string>
+</resources>
diff --git a/packages/Keyguard/res/values-th/cm_strings.xml b/packages/Keyguard/res/values-th/cm_strings.xml
index ce76f24..39f873a 100644
--- a/packages/Keyguard/res/values-th/cm_strings.xml
+++ b/packages/Keyguard/res/values-th/cm_strings.xml
@@ -16,9 +16,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">ซิมการ์ดถูกเปโซล็อค</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">ซิมการ์ดไม่ถูกต้อง</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="other">ใส่รหัสซิมการ์ด สามารถใส่รหัสได้อีก <xliff:g id="number">%d</xliff:g> ก่อนจะต้องติดต่อติดต่อผู้ให้บริการเพื่อปลดล็อคอุปกรณ์ของคุณ</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">ผิดพลาด: ข้อมูลที่ป้อนสั้นกว่าความยาวขั้นต่ำ</string>
 </resources>
diff --git a/packages/Keyguard/res/values-tr/cm_strings.xml b/packages/Keyguard/res/values-tr/cm_strings.xml
index 919607e..b08f821 100644
--- a/packages/Keyguard/res/values-tr/cm_strings.xml
+++ b/packages/Keyguard/res/values-tr/cm_strings.xml
@@ -16,10 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM Özel kilitli</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Geçersiz kart.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">SIM PIN kodunuzu girin, <xliff:g id="number">%d</xliff:g> deneme hakkınız kaldı, yoksa cihazınızın kilidini açabilmek için operatörünüz ile iletişim kurmak zorunda kalacaksınız.</item>
     <item quantity="other">SIM PIN kodunuzu girin, <xliff:g id="number">%d</xliff:g> deneme hakkınız kaldı.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Hata: Giriş en kısa uzunluktan daha kısa</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ug/cm_strings.xml b/packages/Keyguard/res/values-ug/cm_strings.xml
index ce1bb8b..885b4a9 100644
--- a/packages/Keyguard/res/values-ug/cm_strings.xml
+++ b/packages/Keyguard/res/values-ug/cm_strings.xml
@@ -16,5 +16,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">SIM/RUIM قۇلۇپلاندى</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">ئىناۋەتسىز كارتا.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="other">بۇ SIM كارتىنىڭ PIN نى كىرگۈزۈڭ، سىزنىڭ يەنە <xliff:g id="number">%d</xliff:g> قېتىم سىناش پۇرسىتىڭىز بار.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">خاتالىق: كىرگۈزگىنىڭىز بەك قىسقا بۇلۇپ قالدى</string>
 </resources>
diff --git a/packages/Keyguard/res/values-ug/strings.xml b/packages/Keyguard/res/values-ug/strings.xml
index 6c45a13..6ad14ee 100644
--- a/packages/Keyguard/res/values-ug/strings.xml
+++ b/packages/Keyguard/res/values-ug/strings.xml
@@ -19,60 +19,184 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- App label in the manifest  -->
+  <string name="app_name">ئاچقۇچلۇق</string>
+  <!-- Instructions telling the user to enter their SIM PIN to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_code">PIN كودىنى كىرگۈزۈڭ</string>
+  <!-- Instructions telling the user to enter their SIM PUK to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_puk_code">SIM PUK ۋە يېڭى PIN كودىنى كىرگۈزۈڭ</string>
+  <!-- Prompt to enter SIM PUK in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_puk_prompt">SIM PUK كودى</string>
+  <!-- Prompt to enter New SIM PIN in Edit Text Box in unlock screen -->
   <string name="keyguard_password_enter_pin_prompt">يېڭى SIM كارتا PIN كودى</string>
+  <!-- Displayed as hint in passwordEntry EditText on PasswordUnlockScreen [CHAR LIMIT=30]-->
   <string name="keyguard_password_entry_touch_hint"><font size="17">\"بۇ جاينى چېكىپ ئىم كىرگۈزۈڭ\"</font></string>
+  <!-- Instructions telling the user to enter their text password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_password_code">قۇلۇپ ئېچىش ئۈچۈن ئىم كىرگۈزۈڭ</string>
+  <!-- Instructions telling the user to enter their PIN password to unlock the keyguard.
+         Displayed in one line in a large font.  -->
   <string name="keyguard_password_enter_pin_password_code">PIN كىرگۈزۈپ قۇلۇپ ئېچىڭ</string>
+  <!-- Instructions telling the user that they entered the wrong pin while trying
+         to unlock the keyguard.  Displayed in one line in a large font.  -->
   <string name="keyguard_password_wrong_pin_code">PIN كودى خاتا.</string>
+  <!-- When the lock screen is showing, the phone is plugged in and the battery is fully
+         charged, say that it is charged. -->
   <string name="keyguard_charged">توكلاندى</string>
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, say that it's charging.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a fast charger, say that it's charging fast.  -->
+  <!-- When the lock screen is showing and the phone plugged in, and the battery
+         is not fully charged, and it's plugged into a slow charger, say that it's charging slowly.  -->
+  <!-- When the lock screen is showing and the battery is low, warn user to plug
+         in the phone soon. -->
+  <!-- On the keyguard screen, when pattern lock is disabled, only tell them to press menu to unlock.  This is shown in small font at the bottom. -->
   <string name="keyguard_instructions_when_pattern_disabled">Menu نى بېسىپ قۇلۇپنى ئېچىڭ.</string>
+  <!-- SIM messages -->
+  <!-- When the user inserts a sim card from an unsupported network, it becomes network locked -->
   <string name="keyguard_network_locked_message">تور قۇلۇپلانغان</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message_short">SIM كارتا يوق</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="tablet">تاختا كومپيۇتېردا SIM كارتا يوق.</string>
+  <!-- Shown when there is no SIM card. -->
   <string name="keyguard_missing_sim_message" product="default">تېلېفوندا SIM كارتا يوق.</string>
+  <!-- Shown to ask the user to insert a SIM card. -->
   <string name="keyguard_missing_sim_instructions">SIM كارتا قىستۇرۇڭ.</string>
+  <!-- Shown to ask the user to insert a SIM card when sim is missing or not readable. -->
   <string name="keyguard_missing_sim_instructions_long">SIM كارتا يوقالغان ياكى ئوقۇغىلى بولمايدۇ. SIM كارتا قىستۇرۇڭ.</string>
+  <!-- Shown when SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_message_short">SIM كارتىنى ئىشلەتكىلى بولمايدۇ.</string>
+  <!-- Shown to inform the user to SIM card is permanently disabled. -->
   <string name="keyguard_permanent_disabled_sim_instructions">سىزنىڭ SIM كارتىڭىز مەڭگۈلۈك توختىتىلدى.\nسىمسىز تور مۇلازىمىتى تەمىنلىگۈچىڭىز بىلەن ئالاقە قىلىپ، يېڭىدىن بىر SIM كارتىغا ئېرىشىڭ.</string>
+  <!-- Shown to tell the user that their SIM is locked and they must unlock it. -->
   <string name="keyguard_sim_locked_message">SIM كارتا قۇلۇپلانغان.</string>
+  <!-- When the user enters a wrong sim pin too many times, it becomes PUK locked (Pin Unlock Kode) -->
   <string name="keyguard_sim_puk_locked_message">SIM كارتا PUK نۇمۇر ئارقىلىق قۇلۇپلانغان.</string>
+  <!-- For the unlock screen, When the user enters a sim unlock code, it takes a little while to check
+         whether it is valid, and to unlock the sim if it is valid.  we display a
+         progress dialog in the meantime.  this is the emssage. -->
   <string name="keyguard_sim_unlock_progress_dialog_message">SIM كارتا قۇلۇپىنى ئېچىۋاتىدۇ…</string>
+  <!-- Time format strings for fall-back clock widget -->
+  <!-- Time format strings for fall-back clock widget -->
   <string name="keyguard_accessibility_pattern_unlock">ئەدىزەدە قۇلۇپ ئاچىدۇ.</string>
+  <!-- Accessibility description of the pin lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pin_unlock">بۇ Pin دا قۇلۇپ ئاچىدۇ.</string>
+  <!-- Accessibility description of the password lock. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_password_unlock">ئىمدا قۇلۇپ ئاچىدۇ.</string>
+  <!-- Accessibility description of the unlock pattern area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">ئەندىزە دائىرىسى.</string>
+  <!-- Accessibility description of the unlock slide area. [CHAR_LIMIT=none] -->
   <string name="keyguard_accessibility_slide_area">سۈرۈش دائىرىسى</string>
+  <!-- Accessibility description of the PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PIN password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description of the SIM PUK password view. [CHAR_LIMIT=none] -->
+  <!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
+  <!-- KeyguardPinView - accessibility support -->
+  <!-- Description of the Delete button in a KeyboardView. [CHAR LIMIT=NONE] -->
   <string name="keyboardview_keycode_delete">ئۆچۈر</string>
+  <!-- Description of the Enter button in a KeyboardView. [CHAR LIMIT=NONE] -->
+  <!-- Message shown in pattern unlock after some number of unsuccessful attempts -->
   <string name="kg_forgot_pattern_button_text">ئەندىزە ئۇنتۇلغان</string>
+  <!-- Message shown when user enters wrong pattern -->
   <string name="kg_wrong_pattern">ئەندىزە خاتا</string>
+  <!-- Message shown when user enters wrong password -->
   <string name="kg_wrong_password">ئىم خاتا</string>
+  <!-- Message shown when user enters wrong PIN -->
   <string name="kg_wrong_pin">بۇ PIN خاتا</string>
+  <!-- Countdown message shown after too many failed unlock attempts -->
   <string name="kg_too_many_failed_attempts_countdown"><xliff:g id="NUMBER">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Instructions for using the pattern unlock screen -->
   <string name="kg_pattern_instructions">قۇلۇپ ئاچىدىغان ئەندىزە سىزىڭ</string>
+  <!-- Instructions for using the SIM PIN unlock screen -->
   <string name="kg_sim_pin_instructions">كىرگۈزىدىغىنىڭىز SIM PIN</string>
+  <!-- Instructions for using the SIM PIN unlock screen when there's more than one SIM -->
+  <!-- Instructions for using the PIN unlock screen -->
   <string name="kg_pin_instructions">كىرگۈزىدىغىنىڭىز PIN</string>
+  <!-- Instructions for using the password unlock screen -->
   <string name="kg_password_instructions">ئىم كىرگۈزۈڭ</string>
+  <!-- Hint shown in the PUK screen that asks the user to enter the PUK code given to them by their provider -->
   <string name="kg_puk_enter_puk_hint">بۇ SIM كارتا توختىتىلغان. PUK كودى كىرگۈزۈلگەندىلا ئاندىن ئىشلەتكىلى بولىدۇ. مۇناسىۋەتلىك تەپسىلاتلار ئۈچۈن مۇلازىمەت تەمىنلىگۈچىڭىز بىلەن ئالاقە قىلىڭ.</string>
+  <!-- Hint shown when there are multiple SIMs in the device to ask the user to enter the PUK code given to them by their provider -->
+  <!-- Hint shown in the PUK unlock screen PIN TextView -->
   <string name="kg_puk_enter_pin_hint">لازىملىق PIN كودىنى كىرگۈزۈڭ</string>
+  <!-- Message shown when the user needs to confirm the PIN they just entered in the PUK screen -->
   <string name="kg_enter_confirm_pin_hint">لازىملىق PIN كودىنى جەزملەڭ</string>
+  <!-- Message shown in dialog while the device is unlocking the SIM card -->
   <string name="kg_sim_unlock_progress_dialog_message">SIM كارتا قۇلۇپىنى ئېچىۋاتىدۇ…</string>
+  <!-- Message shown when the user enters an invalid SIM pin password in PUK screen -->
   <string name="kg_invalid_sim_pin_hint">4-8 خانىلىق PIN نى كىرگۈزۈڭ.</string>
+  <!-- Message shown when the user enters an invalid PUK code in the PUK screen -->
   <string name="kg_invalid_sim_puk_hint">بۇ PUK كودىدا ئاز دېگەندە 8 ياكى ئۇنىڭدىن كۆپ سان بولىدۇ.</string>
+  <!-- Message shown when the user enters an invalid PUK code -->
   <string name="kg_invalid_puk">توغرا PUK كودىنى قايتا كىرگۈزۈڭ. ئەگەر خاتا كىرگۈزۈشنىڭ قېتىم سانى بەك كۆپ بولۇپ كەتسە SIM كارتا مەڭگۈلۈك توختىتىلىدۇ.</string>
+  <!-- String shown in PUK screen when PIN codes don't match -->
   <string name="kg_invalid_confirm_pin_hint" product="default">بۇ PIN كودى ماسلاشمىدى</string>
+  <!-- Message shown when the user exceeds the maximum number of pattern attempts -->
   <string name="kg_login_too_many_attempts">ئەندىزىسىنى سىناش قېتىم سانى بەك كۆپ بولۇپ كەتتى</string>
+  <!-- Message shown in dialog when max number of attempts are reached for PIN screen of keyguard -->
   <string name="kg_too_many_failed_pin_attempts_dialog_message">سىز PIN نى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Message shown in dialog when max number of attempts are reached for password screen of keyguard -->
   <string name="kg_too_many_failed_password_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئىمنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا كىرگۈزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
   <string name="kg_too_many_failed_pattern_attempts_dialog_message">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز.\n\n <xliff:g id="NUMBER_1">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the device will be wiped. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the device will now be wiped [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the user will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown when user is almost at the limit of password attempts where the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user has exceeded the maximum attempts and the profile will be removed. [CHAR LIMIT=none] -->
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="tablet">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما تورخەت ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تاختا كومپيۇتېر قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ.\n\nيەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Message shown in dialog when user is almost at the limit where they will be
+    locked out and may have to enter an alternate username/password to unlock the phone -->
   <string name="kg_failed_attempts_almost_at_login" product="default">سىز قۇلۇپ ئېچىش ئەندىزىسىنى <xliff:g id="NUMBER_0">%d</xliff:g> قېتىم خاتا سىزدىڭىز. ئەگەر <xliff:g id="NUMBER_1">%d</xliff:g> قېتىم سىناپمۇ مۇۋەپپەقىيەتلىك بولمىسا، سىستېما تورخەت ھېساباتىڭىزدىكى تىزىمغا كىرىش ئۇچۇرى بىلەن تېلېفون قۇلۇپىنى ئېچىشنى تەلەپ قىلىدۇ.\n\nيەنە <xliff:g id="NUMBER_2">%d</xliff:g> سېكۇنتتىن كېيىن قايتا سىناڭ.</string>
+  <!-- Instructions telling the user that they entered the wrong SIM PIN for the last time.
+         Displayed in a dialog box.  -->
   <string name="kg_password_wrong_pin_code_pukked">SIM كارتا PIN كودى توغرا ئەمەس؛ ھازىر مۇلازىمەت سودىگىرىڭىز بىلەن ئالاقە قىلىپ ئۈسكۈنىڭىزنىڭ قۇلۇپىنى ئېچىڭ.</string>
+  <!-- Instructions telling the user that they entered the wrong SIM PIN while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <plurals name="kg_password_wrong_pin_code">
+    <item quantity="other">SIM كارتا PIN كودى توغرا ئەمەس، سىزنىڭ <xliff:g id="NUMBER">%d</xliff:g> قېتىم سىناش پۇرسىتىڭىز بار. ئەگەر يەنىلا مەغلۇپ بولسىڭىز مۇلازىمەت سودىگىرىڭىز بىلەن ئالاقە قىلىپ ئۈسكۈنىڭىزنىڭ قۇلۇپىنى ئېچىڭ.</item>
+  </plurals>
+  <!-- Instructions telling the user that they have exhausted SIM PUK retries and the SIM is now unusable.
+         Displayed in a dialog box.  -->
   <string name="kg_password_wrong_puk_code_dead">SIM كارتىنى ئىشلەتكىلى بولمايدۇ. مۇلازىمەت سودىگىرىڭىز بىلەن ئالاقە قىلىڭ.</string>
+  <!-- Instructions telling the user that they entered the wrong puk while trying
+         to unlock the keyguard.  Displayed in a dialog box.  -->
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with SIM PIN failed. Displayed in one line in a large font.  -->
   <string name="kg_password_pin_failed">SIM كارتا PIN مەشغۇلاتى مەغلۇپ بولدى!</string>
+  <!-- Instructions telling the user that the operation to unlock the keyguard
+         with PUK failed. Displayed in one line in a large font.  -->
   <string name="kg_password_puk_failed">SIM كارتا PUK مەشغۇلاتى مەغلۇپ بولدى!</string>
+  <!-- Notification telling the user that the PIN1 they entered is valid -->
   <string name="kg_pin_accepted">كود توغرا</string>
+  <!-- On the keyguard screen, it shows the carrier the phone is connected to.
+        This is displayed if the phone is not connected to a carrier.-->
   <string name="keyguard_carrier_default">مۇلازىمەت يوق.</string>
+  <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Description of airplane mode -->
+  <!-- An explanation text that the pattern needs to be solved since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the device has just been restarted. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since the user hasn't used strong authentication since quite some time. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pin needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the password needs to be entered since profiles have just been switched. [CHAR LIMIT=80] -->
+  <!-- An explanation text that the pattern needs to be solved since it hasn't been solved in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the pin needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- An explanation text that the password needs to be entered since it hasn't been entered in a while. [CHAR LIMIT=80]-->
+  <!-- Fingerprint hint message when finger was not recognized.-->
 </resources>
diff --git a/packages/Keyguard/res/values-uk/cm_strings.xml b/packages/Keyguard/res/values-uk/cm_strings.xml
index 5c1883b..084c45b 100644
--- a/packages/Keyguard/res/values-uk/cm_strings.xml
+++ b/packages/Keyguard/res/values-uk/cm_strings.xml
@@ -16,11 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM-карта заблокована оператором</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Невірна картка.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="one">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроба перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
     <item quantity="few">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроби перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
     <item quantity="other">Введіть PIN-код. У вас залишилася <xliff:g id="number">%d</xliff:g> спроб перед тим, як вам доведеться звернутися до оператора для розблокування.</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-ur-rPK/cm_strings.xml b/packages/Keyguard/res/values-ur-rPK/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-ur-rPK/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml b/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-uz-rUZ/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values-uz-rUZ/strings.xml b/packages/Keyguard/res/values-uz-rUZ/strings.xml
index eae5ff8..b87298d 100644
--- a/packages/Keyguard/res/values-uz-rUZ/strings.xml
+++ b/packages/Keyguard/res/values-uz-rUZ/strings.xml
@@ -22,9 +22,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="719438068451601849">"Keyguard"</string>
     <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"PIN-kodni kiriting"</string>
-    <string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"SIM karta PUK kodi va yangi PIN kodni tering"</string>
-    <string name="keyguard_password_enter_puk_prompt" msgid="1801941051094974609">"SIM karta PUK kodi"</string>
-    <string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"Yangi SIM karta PIN kodi"</string>
+    <string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"SIM-karta PUK kodi va yangi PIN kodni tering"</string>
+    <string name="keyguard_password_enter_puk_prompt" msgid="1801941051094974609">"SIM-karta PUK kodi"</string>
+    <string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"Yangi SIM-karta PIN kodi"</string>
     <string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"Parolni kiritish uchun bosing"</font></string>
     <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Qulfni ochish uchun parolni kiriting"</string>
     <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Qulfni ochish uchun PIN-kodni kiriting"</string>
@@ -36,24 +36,24 @@
     <string name="keyguard_low_battery" msgid="8143808018719173859">"Zaryadlagichni ulang."</string>
     <string name="keyguard_instructions_when_pattern_disabled" msgid="1332288268600329841">"Qulfni ochish uchun \"Menyu\"ga bosing."</string>
     <string name="keyguard_network_locked_message" msgid="9169717779058037168">"Tarmoq qulflangan"</string>
-    <string name="keyguard_missing_sim_message_short" msgid="494980561304211931">"SIM karta yo‘q"</string>
-    <string name="keyguard_missing_sim_message" product="tablet" msgid="1445849005909260039">"Ushbu planshetda SIM karta yo‘q."</string>
-    <string name="keyguard_missing_sim_message" product="default" msgid="3481110395508637643">"Ushbu telefonda SIM karta yo‘q."</string>
+    <string name="keyguard_missing_sim_message_short" msgid="494980561304211931">"SIM-karta yo‘q"</string>
+    <string name="keyguard_missing_sim_message" product="tablet" msgid="1445849005909260039">"Ushbu planshetda SIM-karta yo‘q."</string>
+    <string name="keyguard_missing_sim_message" product="default" msgid="3481110395508637643">"Ushbu telefonda SIM-karta yo‘q."</string>
     <string name="keyguard_missing_sim_instructions" msgid="5210891509995942250">"Telefonga SIM kartani joylashtiring."</string>
-    <string name="keyguard_missing_sim_instructions_long" msgid="5968985489463870358">"SIM karta qo‘yilmagan yoki o‘qib bo‘lmayapti. SIM kartani joylashtiring."</string>
+    <string name="keyguard_missing_sim_instructions_long" msgid="5968985489463870358">"SIM-karta qo‘yilmagan yoki o‘qib bo‘lmayapti. SIM-kartani joylashtiring."</string>
     <string name="keyguard_permanent_disabled_sim_message_short" msgid="8340813989586622356">"SIM kartadan foydalanib bo‘lmaydi."</string>
-    <string name="keyguard_permanent_disabled_sim_instructions" msgid="5892940909699723544">"SIM kartangiz butunlay o‘chirilgan.\n Boshqa SIM karta olish uchun aloqa operatori bilan bog‘laning."</string>
-    <string name="keyguard_sim_locked_message" msgid="6875773413306380902">"SIM karta qulflangan."</string>
-    <string name="keyguard_sim_puk_locked_message" msgid="3747232467471801633">"SIM karta PUK kod bilan qulflangan."</string>
-    <string name="keyguard_sim_unlock_progress_dialog_message" msgid="7975221805033614426">"SIM karta qulfi ochilmoqda…"</string>
+    <string name="keyguard_permanent_disabled_sim_instructions" msgid="5892940909699723544">"SIM-kartangiz butunlay o‘chirilgan.\n Boshqa SIM-karta olish uchun aloqa operatori bilan bog‘laning."</string>
+    <string name="keyguard_sim_locked_message" msgid="6875773413306380902">"SIM-karta qulflangan."</string>
+    <string name="keyguard_sim_puk_locked_message" msgid="3747232467471801633">"SIM-karta PUK kod bilan qulflangan."</string>
+    <string name="keyguard_sim_unlock_progress_dialog_message" msgid="7975221805033614426">"SIM-karta qulfi ochilmoqda…"</string>
     <string name="keyguard_accessibility_pattern_unlock" msgid="1490840706075246612">"Chizmali qulfni ochish."</string>
     <string name="keyguard_accessibility_pin_unlock" msgid="2469687111784035046">"Pin qulfini ochish."</string>
     <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Parolli qulfni ochish."</string>
     <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Chizmali qulf maydoni."</string>
     <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Maydonni silang"</string>
     <string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"PIN-kod maydoni"</string>
-    <string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"SIM karta PIN kodi maydoni"</string>
-    <string name="keyguard_accessibility_sim_puk_area" msgid="1880823406954996207">"SIM karta PUK kodi maydoni"</string>
+    <string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"SIM-karta PIN kodi maydoni"</string>
+    <string name="keyguard_accessibility_sim_puk_area" msgid="1880823406954996207">"SIM-karta PUK kodi maydoni"</string>
     <string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"Uyg‘otkich signali <xliff:g id="ALARM">%1$s</xliff:g> da chalinadi."</string>
     <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"O‘chirish"</string>
     <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Kiritish"</string>
@@ -67,11 +67,11 @@
     <string name="kg_sim_pin_instructions_multi" msgid="7818515973197201434">"“<xliff:g id="CARRIER">%1$s</xliff:g>” SIM kartasi uchun PIN kodni kiriting"</string>
     <string name="kg_pin_instructions" msgid="2377242233495111557">"PIN kodni tering"</string>
     <string name="kg_password_instructions" msgid="5753646556186936819">"Parol kiriting"</string>
-    <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM karta hozir o‘chirilgan. Davom etish uchun PUK kodni kiriting. To‘liqroq ma’lumot olish uchun tarmoq operatori bilan bog‘laning."</string>
+    <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM-karta hozir o‘chirilgan. Davom etish uchun PUK kodni kiriting. To‘liqroq ma’lumot olish uchun tarmoq operatori bilan bog‘laning."</string>
     <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"“<xliff:g id="CARRIER">%1$s</xliff:g>” SIM kartasi o‘chirib qo‘yildi. Davom etish uchun PUK kodni kiriting. Tafsilotlar uchun aloqa operatoringizga murojaat qiling."</string>
     <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"So‘ralgan PIN kodni kiriting"</string>
     <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"So‘ralgan PIN kodni tasdiqlang"</string>
-    <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM karta qulfi ochilmoqda…"</string>
+    <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"SIM-karta qulfi ochilmoqda…"</string>
     <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"4 tadan 8 ta raqamgacha bo‘lgan PIN kodni kiriting."</string>
     <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK kod kamida 8 ta raqam bo‘lishi shart."</string>
     <string name="kg_invalid_puk" msgid="3638289409676051243">"To‘g‘ri PUK kodni qayta kiriting. Qayta-qayta urinishlar SIM kartani butunlay o‘chirib qo‘yadi."</string>
@@ -94,18 +94,18 @@
     <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Siz telefonni qulfdan chiqarish uchun <xliff:g id="NUMBER">%d</xliff:g> marta noto‘g‘ri urinish qildingiz. Endi, ishchi profil o‘chirib tashlanadi va undagi barcha ma’lumotlar ham o‘chib ketadi."</string>
     <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Siz chizmali kalitni  <xliff:g id="NUMBER_0">%d</xliff:g> marta noto‘g‘ri kiritdingiz. <xliff:g id="NUMBER_1">%d</xliff:g> marta muvaffaqiyatsiz urinishdan so‘ng, sizdan e-pochtangizdan foydalanib, planshet qulfini ochishingiz so‘raladi.\n\n <xliff:g id="NUMBER_2">%d</xliff:g> soniyadan so‘ng yana urinib ko‘ring."</string>
     <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Siz chizmali kalitni <xliff:g id="NUMBER_0">%d</xliff:g> marta noto‘g‘ri chizdingiz. <xliff:g id="NUMBER_1">%d</xliff:g> marta muvaffaqiyatsiz urinishdan so‘ng, sizdan e-pochtangizdan foydalanib, telefon qulfini ochishingiz so‘raladi.\n\n <xliff:g id="NUMBER_2">%d</xliff:g> soniyadan so‘ng yana urinib ko‘ring."</string>
-    <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"SIM karta PIN kodi noto‘g‘ri. Qurilma qulfini ochish uchun aloqa operatoringiz bilan bog‘laning."</string>
+    <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"SIM-karta PIN kodi noto‘g‘ri. Qurilma qulfini ochish uchun aloqa operatoringiz bilan bog‘laning."</string>
     <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249">
       <item quantity="other">SIM kartaning PIN kodi noto‘g‘ri. Sizda yana <xliff:g id="NUMBER_1">%d</xliff:g> ta urinish qoldi.</item>
       <item quantity="one">SIM kartaning PIN kodi noto‘g‘ri. Qurilmani qulfdan chiqarish uchun sizda yana <xliff:g id="NUMBER_0">%d</xliff:g> ta urinish qoldi.</item>
     </plurals>
     <string name="kg_password_wrong_puk_code_dead" msgid="7077536808291316208">"SIM kartadan foydalanib bo‘lmaydi. Aloqa operatoringiz bilan bog‘laning."</string>
     <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="7576227366999858780">
-      <item quantity="other">SIM kartaning PUK kodi noto‘g‘ri kiritildi. Yana <xliff:g id="NUMBER_1">%d</xliff:g> ta muvaffaqiyatsiz urinishdan so‘ng SIM karta butunlay ishdan chiqadi.</item>
-      <item quantity="one">SIM kartaning PUK kodi noto‘g‘ri kiritildi. Yana <xliff:g id="NUMBER_0">%d</xliff:g> ta muvaffaqiyatsiz urinishdan so‘ng SIM karta butunlay ishdan chiqadi.</item>
+      <item quantity="other">SIM-kartaning PUK kodi noto‘g‘ri kiritildi. Yana <xliff:g id="NUMBER_1">%d</xliff:g> ta muvaffaqiyatsiz urinishdan so‘ng SIM-karta butunlay ishdan chiqadi.</item>
+      <item quantity="one">SIM-kartaning PUK kodi noto‘g‘ri kiritildi. Yana <xliff:g id="NUMBER_0">%d</xliff:g> ta muvaffaqiyatsiz urinishdan so‘ng SIM-karta butunlay ishdan chiqadi.</item>
     </plurals>
-    <string name="kg_password_pin_failed" msgid="6268288093558031564">"SIM karta PIN jarayoni amalga oshmadi!"</string>
-    <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM karta PUK jarayoni amalga oshmadi!"</string>
+    <string name="kg_password_pin_failed" msgid="6268288093558031564">"SIM-karta PIN jarayoni amalga oshmadi!"</string>
+    <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM-karta PUK jarayoni amalga oshmadi!"</string>
     <string name="kg_pin_accepted" msgid="1448241673570020097">"Kod qabul qilindi!"</string>
     <string name="keyguard_carrier_default" msgid="8700650403054042153">"Aloqa yo‘q."</string>
     <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Kiritish uslubi tugmasini almashtirish."</string>
diff --git a/packages/Keyguard/res/values-vi/cm_strings.xml b/packages/Keyguard/res/values-vi/cm_strings.xml
index 12d4975..b28f62c 100644
--- a/packages/Keyguard/res/values-vi/cm_strings.xml
+++ b/packages/Keyguard/res/values-vi/cm_strings.xml
@@ -16,5 +16,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <string name="keyguard_perso_locked_message">Thẻ SIM bị khóa Perso</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">Thẻ sim không hợp lệ.</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <plurals name="kg_password_default_pin_message">
+    <item quantity="other">Nhập mã PIN của SIM, bạn còn <xliff:g id="number">%d</xliff:g> lần nhập trước khi phải liên hệ với nhà mạng để mở khóa thiết bị.</item>
+  </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+  <string name="kg_invalid_sim_length">Lỗi: Dữ liệu nhập ngắn hơn độ dài tối thiểu</string>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
index 56f8e18..6f94967 100644
--- a/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/cm_strings.xml
@@ -16,10 +16,14 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM 卡已被锁定</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">无效的 SIM 卡。</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
   <plurals name="kg_password_default_pin_message">
     <item quantity="other">输入 SIM 卡 PIN。您还有 <xliff:g id="number">%d</xliff:g> 次尝试机会；若超出此次数，则必须联系运营商以解锁 SIM 卡。</item>
   </plurals>
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">错误：输入长度小于最小长度</string>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rCN/strings.xml b/packages/Keyguard/res/values-zh-rCN/strings.xml
index c7b217c..5b1e45d 100644
--- a/packages/Keyguard/res/values-zh-rCN/strings.xml
+++ b/packages/Keyguard/res/values-zh-rCN/strings.xml
@@ -92,8 +92,8 @@
     <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"您已经 <xliff:g id="NUMBER_0">%d</xliff:g> 次错误地尝试解锁手机。如果再尝试 <xliff:g id="NUMBER_1">%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">%d</xliff:g> 次画错解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐号解锁平板电脑。\n\n请在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒后重试。"</string>
-    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"您已连续 <xliff:g id="NUMBER_0">%d</xliff:g> 次画错解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐号解锁手机。\n\n请在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒后重试。"</string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"您已连续 <xliff:g id="NUMBER_0">%d</xliff:g> 次画错解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐户解锁平板电脑。\n\n请在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒后重试。"</string>
+    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"您已连续 <xliff:g id="NUMBER_0">%d</xliff:g> 次画错解锁图案。如果再尝试 <xliff:g id="NUMBER_1">%d</xliff:g> 次后仍不成功，系统就会要求您使用自己的电子邮件帐户解锁手机。\n\n请在 <xliff:g id="NUMBER_2">%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>
diff --git a/packages/Keyguard/res/values-zh-rHK/cm_strings.xml b/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
index 765485f..fe6d6b8 100644
--- a/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rHK/cm_strings.xml
@@ -16,5 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">SIM 卡無效。</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rTW/cm_strings.xml b/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
index db6ee22..9ab7837 100644
--- a/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
+++ b/packages/Keyguard/res/values-zh-rTW/cm_strings.xml
@@ -16,7 +16,11 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
   <string name="keyguard_perso_locked_message">SIM/RUIM 卡已被鎖定</string>
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
   <string name="lockscreen_sim_error_message_short">無效的 SIM 卡。</string>
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
   <string name="kg_invalid_sim_length">錯誤：輸入少於最小長度</string>
 </resources>
diff --git a/packages/Keyguard/res/values-zh-rTW/strings.xml b/packages/Keyguard/res/values-zh-rTW/strings.xml
index fd8b312..56d0573 100644
--- a/packages/Keyguard/res/values-zh-rTW/strings.xml
+++ b/packages/Keyguard/res/values-zh-rTW/strings.xml
@@ -46,7 +46,7 @@
     <string name="keyguard_sim_locked_message" msgid="6875773413306380902">"SIM 卡處於鎖定狀態。"</string>
     <string name="keyguard_sim_puk_locked_message" msgid="3747232467471801633">"SIM 卡處於 PUK 鎖定狀態"</string>
     <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_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_pattern_area" msgid="7679891324509597904">"圖形區域。"</string>
@@ -79,7 +79,7 @@
     <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"圖形嘗試次數過多"</string>
     <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"您的 PIN 已輸錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次。\n\n請在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒後再試一次。"</string>
     <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"您的密碼已輸錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次。\n\n請在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒後再試一次。"</string>
-    <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"您的解鎖圖案已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次。\n\n請在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒後再試一次。"</string>
+    <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"您的解鎖圖形已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次。\n\n請在 <xliff:g id="NUMBER_1">%d</xliff:g> 秒後再試一次。"</string>
     <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="8774056606869646621">"您嘗試解鎖平板電腦已失敗 <xliff:g id="NUMBER_0">%d</xliff:g> 次，目前還剩 <xliff:g id="NUMBER_1">%d</xliff:g> 次機會。如果失敗次數超過限制，這台平板電腦將會重設，其中的所有資料也會一併遭到刪除。"</string>
     <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="1843331751334128428">"您嘗試解鎖手機已失敗 <xliff:g id="NUMBER_0">%d</xliff:g> 次，目前還剩 <xliff:g id="NUMBER_1">%d</xliff:g> 次機會。如果失敗次數超過限制，系統會重設您的手機，其中的所有資料也會一併遭到刪除。"</string>
     <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="258925501999698032">"您嘗試解鎖平板電腦已失敗 <xliff:g id="NUMBER">%d</xliff:g> 次。這台平板電腦將會重設，其中的所有資料也會一併遭到刪除。"</string>
@@ -92,8 +92,8 @@
     <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"您嘗試解鎖手機已失敗 <xliff:g id="NUMBER_0">%d</xliff:g> 次，目前還剩 <xliff:g id="NUMBER_1">%d</xliff:g> 次機會。如果失敗次數超過限制，您的 Work 設定檔將遭到移除，所有設定檔資料也會一併遭到刪除。"</string>
     <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"您嘗試解鎖平板電腦已失敗 <xliff:g id="NUMBER">%d</xliff:g> 次。您的 Work 設定檔將遭到移除，所有設定檔資料也會一併遭到刪除。"</string>
     <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"您嘗試解鎖手機已失敗 <xliff:g id="NUMBER">%d</xliff:g> 次。您的 Work 設定檔將遭到移除，所有設定檔資料也會一併遭到刪除。"</string>
-    <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"您的解鎖圖案已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次，如果再嘗試 <xliff:g id="NUMBER_1">%d</xliff:g> 次仍未成功，系統就會要求您透過電子郵件帳戶解除平板電腦的鎖定狀態。\n\n請在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒後再試一次。"</string>
-    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"您的解鎖圖案已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次，如果再嘗試 <xliff:g id="NUMBER_1">%d</xliff:g> 次仍未成功，系統就會要求您透過電子郵件帳戶解除手機的鎖定狀態。\n\n請在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒後再試一次。"</string>
+    <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"您的解鎖圖形已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次，如果再嘗試 <xliff:g id="NUMBER_1">%d</xliff:g> 次仍未成功，系統就會要求您透過電子郵件帳戶解除平板電腦的鎖定狀態。\n\n請在 <xliff:g id="NUMBER_2">%d</xliff:g> 秒後再試一次。"</string>
+    <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"您的解鎖圖形已畫錯 <xliff:g id="NUMBER_0">%d</xliff:g> 次，如果再嘗試 <xliff:g id="NUMBER_1">%d</xliff:g> 次仍未成功，系統就會要求您透過電子郵件帳戶解除手機的鎖定狀態。\n\n請在 <xliff:g id="NUMBER_2">%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>
@@ -113,15 +113,15 @@
     <string name="kg_prompt_reason_restart_pattern" msgid="489430505491862444">"重新啟動裝置時需要確認圖形。"</string>
     <string name="kg_prompt_reason_restart_pin" msgid="994878216570694974">"重新啟動裝置時需要確認 PIN 碼。"</string>
     <string name="kg_prompt_reason_restart_password" msgid="2375742919528461664">"重新啟動裝置時需要確認密碼。"</string>
-    <string name="kg_prompt_reason_timeout_pattern" msgid="8930047492617900785">"請輸入解鎖圖案，以進一步確保資訊安全。"</string>
+    <string name="kg_prompt_reason_timeout_pattern" msgid="8930047492617900785">"請輸入解鎖圖形，以進一步確保資訊安全。"</string>
     <string name="kg_prompt_reason_timeout_pin" msgid="7470468607947726377">"請輸入 PIN 碼，以進一步確保資訊安全。"</string>
     <string name="kg_prompt_reason_timeout_password" msgid="1177412542773936957">"請輸入密碼，以進一步確保資訊安全。"</string>
     <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3802056699323773969">"切換設定檔時需要確認圖形。"</string>
     <string name="kg_prompt_reason_switch_profiles_pin" msgid="8108020184731052246">"切換設定檔時需要確認 PIN 碼。"</string>
     <string name="kg_prompt_reason_switch_profiles_password" msgid="6755997057852042672">"切換設定檔時需要確認密碼。"</string>
     <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="2697444392228541853">
-      <item quantity="other">裝置已有 <xliff:g id="NUMBER_1">%d</xliff:g> 小時未解鎖。請確認圖案。</item>
-      <item quantity="one">裝置已有 <xliff:g id="NUMBER_0">%d</xliff:g> 小時未解鎖。請確認圖案。</item>
+      <item quantity="other">裝置已有 <xliff:g id="NUMBER_1">%d</xliff:g> 小時未解鎖。請確認圖形。</item>
+      <item quantity="one">裝置已有 <xliff:g id="NUMBER_0">%d</xliff:g> 小時未解鎖。請確認圖形。</item>
     </plurals>
     <plurals name="kg_prompt_reason_time_pin" formatted="false" msgid="2118758475374354849">
       <item quantity="other">裝置已有 <xliff:g id="NUMBER_1">%d</xliff:g> 小時未解鎖。請確認 PIN 碼。</item>
diff --git a/packages/Keyguard/res/values-zu/cm_strings.xml b/packages/Keyguard/res/values-zu/cm_strings.xml
new file mode 100644
index 0000000..0ba09aa
--- /dev/null
+++ b/packages/Keyguard/res/values-zu/cm_strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- When the user inserts a sim card with some personalization enabled -->
+  <!-- Shown in the lock screen when there is SIM card IO error. -->
+  <!-- Instructions telling the user remaining times when enter SIM PIN view.  -->
+  <!-- Shown in the KeyguardSimPinView when entry length is too short. -->
+</resources>
diff --git a/packages/Keyguard/res/values/bools.xml b/packages/Keyguard/res/values/bools.xml
index 2b83787..791b758 100644
--- a/packages/Keyguard/res/values/bools.xml
+++ b/packages/Keyguard/res/values/bools.xml
@@ -17,4 +17,5 @@
 <resources>
     <bool name="kg_show_ime_at_screen_on">true</bool>
     <bool name="kg_use_all_caps">true</bool>
+    <bool name="kg_sim_display_name">true</bool>
 </resources>
diff --git a/packages/Keyguard/res/values/config.xml b/packages/Keyguard/res/values/config.xml
index b398ab2..ca7f204 100644
--- a/packages/Keyguard/res/values/config.xml
+++ b/packages/Keyguard/res/values/config.xml
@@ -28,4 +28,10 @@
 
     <!-- Threshold in micro amperes above which a charger is rated as "fast" -->
     <integer name="config_chargingFastThreshold">1500000</integer>
+
+    <!-- Should we listen for fingerprints when the screen is off?  Devices
+         with a rear-mounted sensor want this, but certain devices have
+         the sensor embedded in the power key and listening all the time
+         causes a poor experience. -->
+    <bool name="config_fingerprintWakeAndUnlock">true</bool>
 </resources>
diff --git a/packages/Keyguard/src/com/android/keyguard/CarrierText.java b/packages/Keyguard/src/com/android/keyguard/CarrierText.java
index 8dd56fa..f21ce7f 100644
--- a/packages/Keyguard/src/com/android/keyguard/CarrierText.java
+++ b/packages/Keyguard/src/com/android/keyguard/CarrierText.java
@@ -188,6 +188,25 @@ public class CarrierText extends TextView {
                 }
             }
         }
+        /*
+         * In the case where there is only one sim inserted in a multisim device, if
+         * the voice registration service state is reported as 12 (no service with emergency)
+         * for at least one of the sim concatenate the sim state with Emergency calls only"
+         */
+        if (N < TelephonyManager.getDefault().getPhoneCount() &&
+                 mKeyguardUpdateMonitor.isEmergencyOnly()) {
+            int presentSubId = mKeyguardUpdateMonitor.getPresentSubId();
+
+            if (DEBUG) {
+                Log.d(TAG, " Present sim - sub id: " + presentSubId);
+            }
+            if (presentSubId != -1) {
+                CharSequence emergencyOnlyText =
+                        getContext().getText(com.android.internal.R.string.emergency_calls_only);
+                displayText = getCarrierTextForSimState(
+                        mKeyguardUpdateMonitor.getSimState(presentSubId), emergencyOnlyText);
+            }
+        }
         if (allSimsMissing) {
             if (N != 0) {
                 // Shows "No SIM card | Emergency calls only" on devices that are voice-capable.
diff --git a/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java b/packages/Keyguard/src/com/android/keyguard/EmergencyButton.java
index cbf22c0..93809af 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;
 
@@ -46,6 +49,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
@@ -121,6 +126,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().stopLockTaskMode();
+        } 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/KeyguardAbsKeyInputView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
index b03871a..7fbd658 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardAbsKeyInputView.java
@@ -147,6 +147,7 @@ public abstract class KeyguardAbsKeyInputView extends LinearLayout
 
     private void onPasswordChecked(boolean matched, int timeoutMs, boolean isValidPassword) {
         if (matched) {
+            mLockPatternUtils.sanitizePassword();
             mDismissing = true;
             mCallback.reportUnlockAttempt(true, 0);
             mCallback.dismiss(true);
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
index e8dd871..446f6c1 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardPatternView.java
@@ -133,7 +133,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
         mLockPatternView.setSaveEnabled(false);
         mLockPatternView.setOnPatternListener(new UnlockPatternListener());
         mLockPatternView.setLockPatternUtils(mLockPatternUtils);
-        mLockPatternView.setLockPatternSize(mLockPatternUtils.getLockPatternSize());
+        mLockPatternView.setLockPatternSize(mLockPatternUtils.getLockPatternSize(KeyguardUpdateMonitor.getCurrentUser()));
 
         mLockPatternView.setVisibleDots(mLockPatternUtils.isVisibleDotsEnabled(
                 KeyguardUpdateMonitor.getCurrentUser()));
@@ -262,6 +262,7 @@ public class KeyguardPatternView extends LinearLayout implements KeyguardSecurit
 
         private void onPatternChecked(boolean matched, int timeoutMs, boolean isValidPattern) {
             if (matched) {
+                mLockPatternUtils.sanitizePassword();
                 mCallback.reportUnlockAttempt(true, 0);
                 mLockPatternView.setDisplayMode(LockPatternView.DisplayMode.Correct);
                 mCallback.dismiss(true);
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
index 77215a7..827b378 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityContainer.java
@@ -19,6 +19,7 @@ import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.os.RemoteException;
 import android.os.UserHandle;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -26,6 +27,7 @@ import android.util.Slog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager;
+import android.view.WindowManagerGlobal;
 import android.widget.FrameLayout;
 
 import com.android.internal.widget.LockPatternUtils;
@@ -353,6 +355,12 @@ public class KeyguardSecurityContainer extends FrameLayout implements KeyguardSe
             }
         }
         if (finish) {
+            try {
+                WindowManagerGlobal.getWindowManagerService()
+                        .setLiveLockscreenEdgeDetector(false);
+            } catch (RemoteException e){
+                Log.e(TAG, e.getMessage());
+            }
             mSecurityCallback.finish(strongAuth);
         }
         return finish;
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
index 6012c45..a47e3f5 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSecurityViewFlipper.java
@@ -202,25 +202,10 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard
 
         final int widthSize = MeasureSpec.getSize(widthSpec);
         final int heightSize = MeasureSpec.getSize(heightSpec);
-        int maxWidth = widthSize;
-        int maxHeight = heightSize;
         final int count = getChildCount();
-        for (int i = 0; i < count; i++) {
-            final View child = getChildAt(i);
-            final LayoutParams lp = (LayoutParams) child.getLayoutParams();
-
-            if (lp.maxWidth > 0 && lp.maxWidth < maxWidth) {
-                maxWidth = lp.maxWidth;
-            }
-            if (lp.maxHeight > 0 && lp.maxHeight < maxHeight) {
-                maxHeight = lp.maxHeight;
-            }
-        }
 
         final int wPadding = getPaddingLeft() + getPaddingRight();
         final int hPadding = getPaddingTop() + getPaddingBottom();
-        maxWidth = Math.max(0, maxWidth - wPadding);
-        maxHeight = Math.max(0, maxHeight - hPadding);
 
         int width = widthMode == MeasureSpec.EXACTLY ? widthSize : 0;
         int height = heightMode == MeasureSpec.EXACTLY ? heightSize : 0;
@@ -228,6 +213,8 @@ public class KeyguardSecurityViewFlipper extends ViewFlipper implements Keyguard
             final View child = getChildAt(i);
             final LayoutParams lp = (LayoutParams) child.getLayoutParams();
 
+            int maxWidth = Math.max(0, lp.maxWidth - wPadding);
+            int maxHeight = Math.max(0, lp.maxHeight - hPadding);
             final int childWidthSpec = makeChildMeasureSpec(maxWidth, lp.width);
             final int childHeightSpec = makeChildMeasureSpec(maxHeight, lp.height);
 
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
index 4d26adf..0d74184 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardSimPinView.java
@@ -260,6 +260,7 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
                                 mRemainingAttempts = -1;
                                 KeyguardUpdateMonitor.getInstance(getContext())
                                         .reportSimUnlocked(mSubId);
+                                mShowDefaultMessage = true;
                                 if (mCallback != null) {
                                     mCallback.dismiss(true);
                                 }
@@ -327,8 +328,12 @@ public class KeyguardSimPinView extends KeyguardPinBasedInputView {
             msg = rez.getString(R.string.kg_sim_pin_instructions);
         } else {
             SubscriptionInfo info = monitor.getSubscriptionInfoForSubId(mSubId);
-            CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash
-            msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName);
+            if (rez.getBoolean(R.bool.kg_sim_display_name)) {
+                CharSequence displayName = info != null ? info.getDisplayName() : ""; // don't crash
+                msg = rez.getString(R.string.kg_sim_pin_instructions_multi, displayName);
+            } else {
+                msg = rez.getString(R.string.kg_sim_pin_instructions);
+            }
             if (info != null) {
                 color = info.getIconTint();
             }
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
index 5e09729..70a9f5c 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardUpdateMonitor.java
@@ -69,6 +69,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map.Entry;
 
+import cyanogenmod.providers.CMSettings;
+
 import static android.os.BatteryManager.BATTERY_HEALTH_UNKNOWN;
 import static android.os.BatteryManager.BATTERY_STATUS_FULL;
 import static android.os.BatteryManager.BATTERY_STATUS_UNKNOWN;
@@ -381,6 +383,36 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
         return mSubscriptionInfo;
     }
 
+    public boolean isEmergencyOnly() {
+        boolean isEmerg = false;
+        ServiceState state;
+        for (int slotId = 0; slotId < TelephonyManager.getDefault().getPhoneCount(); slotId++) {
+            state = null;
+            int[] subId = mSubscriptionManager.getSubId(slotId);
+            if (subId != null && subId.length > 0) {
+                state = mServiceStates.get(subId[0]);
+            }
+            if (state != null) {
+                if (state.getVoiceRegState() == ServiceState.STATE_IN_SERVICE)
+                    return false;
+                else if (state.isEmergencyOnly()) {
+                    isEmerg = true;
+                }
+            }
+        }
+        return isEmerg;
+    }
+
+    public int getPresentSubId() {
+        for (int slotId = 0; slotId < TelephonyManager.getDefault().getPhoneCount(); slotId++) {
+            int[] subId = mSubscriptionManager.getSubId(slotId);
+            if (subId != null && subId.length > 0 && getSimState(subId[0]) != State.ABSENT) {
+                return subId[0];
+            }
+        }
+        return -1;
+    }
+
     @Override
     public void onTrustManagedChanged(boolean managed, int userId) {
         mUserTrustIsManaged.put(userId, managed);
@@ -430,7 +462,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
         }
     }
 
-    private void handleFingerprintAuthenticated() {
+
+    private void handleFingerprintAuthenticated(int authUserId) {
         try {
             final int userId;
             try {
@@ -439,6 +472,10 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
                 Log.e(TAG, "Failed to get current user id: ", e);
                 return;
             }
+            if (userId != authUserId) {
+                Log.d(TAG, "Fingerprint authenticated for wrong user: " + authUserId);
+                return;
+            }
             if (isFingerprintDisabled(userId)) {
                 Log.d(TAG, "Fingerprint disabled by DPM for userId: " + userId);
                 return;
@@ -705,7 +742,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
 
         @Override
         public void onAuthenticationSucceeded(AuthenticationResult result) {
-            handleFingerprintAuthenticated();
+            handleFingerprintAuthenticated(result.getUserId());
         }
 
         @Override
@@ -1048,9 +1085,16 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     }
 
     private boolean shouldListenForFingerprint() {
-        return (mKeyguardIsVisible || !mDeviceInteractive || mBouncer || mGoingToSleep)
-                && !mSwitchingUser && !mFingerprintAlreadyAuthenticated
-                && !isFingerprintDisabled(getCurrentUser());
+        if (!mSwitchingUser && !mFingerprintAlreadyAuthenticated
+                && !isFingerprintDisabled(getCurrentUser())) {
+            if (mContext.getResources().getBoolean(
+                    com.android.keyguard.R.bool.config_fingerprintWakeAndUnlock)) {
+                return mKeyguardIsVisible || !mDeviceInteractive || mBouncer || mGoingToSleep;
+            } else {
+                return mDeviceInteractive && (mKeyguardIsVisible || mBouncer);
+            }
+        }
+        return false;
     }
 
     private void startListeningForFingerprint() {
@@ -1088,8 +1132,8 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
     }
 
     private boolean isDeviceProvisionedInSettingsDb() {
-        return Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.DEVICE_PROVISIONED, 0) != 0;
+        return CMSettings.Secure.getInt(mContext.getContentResolver(),
+                CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED, 0) != 0;
     }
 
     private void watchForDeviceProvisioning() {
@@ -1106,7 +1150,7 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener {
         };
 
         mContext.getContentResolver().registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED),
+                CMSettings.Secure.getUriFor(CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED),
                 false, mDeviceProvisionedObserver);
 
         // prevent a race condition between where we check the flag and where we register the
diff --git a/packages/PrintSpooler/res/drawable/ic_add.xml b/packages/PrintSpooler/res/drawable/ic_add.xml
new file mode 100644
index 0000000..d8e9206
--- /dev/null
+++ b/packages/PrintSpooler/res/drawable/ic_add.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2016 The CyanogenMod 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:width="24.0dp"
+        android:height="24.0dp"
+        android:viewportWidth="24"
+        android:viewportHeight="24">
+
+    <path
+        android:fillColor="?android:attr/colorControlNormal"
+        android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+</vector>
diff --git a/packages/PrintSpooler/res/menu/select_printer_activity.xml b/packages/PrintSpooler/res/menu/select_printer_activity.xml
index 8da5769..15cc139 100644
--- a/packages/PrintSpooler/res/menu/select_printer_activity.xml
+++ b/packages/PrintSpooler/res/menu/select_printer_activity.xml
@@ -19,7 +19,7 @@
     <item
         android:id="@+id/action_search"
         android:title="@string/search"
-        android:icon="@*android:drawable/ic_search"
+        android:icon="@*android:drawable/ic_search_api_material"
         android:actionViewClass="android.widget.SearchView"
         android:showAsAction="ifRoom|collapseActionView"
         android:alphabeticShortcut="f"
@@ -29,7 +29,7 @@
     <item
         android:id="@+id/action_add_printer"
         android:title="@string/print_add_printer"
-        android:icon="@*android:drawable/create_contact"
+        android:icon="@drawable/ic_add"
         android:showAsAction="ifRoom"
         android:alphabeticShortcut="a">
     </item>
diff --git a/packages/PrintSpooler/res/values-af/strings.xml b/packages/PrintSpooler/res/values-af/strings.xml
index 482bd22..0cfa0de 100644
--- a/packages/PrintSpooler/res/values-af/strings.xml
+++ b/packages/PrintSpooler/res/values-af/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Papiergrootte"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Papiergrootte:"</string>
     <string name="label_color" msgid="1108690305218188969">"Kleur"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dupleks"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Tweesydig"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Oriëntasie"</string>
     <string name="label_pages" msgid="7768589729282182230">"Bladsye"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Al <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-am/strings.xml b/packages/PrintSpooler/res/values-am/strings.xml
index 588c337..72fc67b 100644
--- a/packages/PrintSpooler/res/values-am/strings.xml
+++ b/packages/PrintSpooler/res/values-am/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"የወረቀት መጠን"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"የወረቀት መጠን፦"</string>
     <string name="label_color" msgid="1108690305218188969">"ቀለም"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"ባለ ሁለት-ጎን"</string>
     <string name="label_orientation" msgid="2853142581990496477">"አቀማመጠ ገፅ"</string>
     <string name="label_pages" msgid="7768589729282182230">"ገፆች"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"ሁሉም <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ar/strings.xml b/packages/PrintSpooler/res/values-ar/strings.xml
index 83d5994..e28c7bd 100644
--- a/packages/PrintSpooler/res/values-ar/strings.xml
+++ b/packages/PrintSpooler/res/values-ar/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"حجم الورق"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"حجم الورق:"</string>
     <string name="label_color" msgid="1108690305218188969">"ألوان"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"مزدوج"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"الجانبان"</string>
     <string name="label_orientation" msgid="2853142581990496477">"الاتجاه"</string>
     <string name="label_pages" msgid="7768589729282182230">"الصفحات"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"جميع الصفحات وعددها <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-as-rIN/strings.xml b/packages/PrintSpooler/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-as-rIN/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-ast-rES/strings.xml b/packages/PrintSpooler/res/values-ast-rES/strings.xml
index 68cc206..a6e8a9d 100644
--- a/packages/PrintSpooler/res/values-ast-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-ast-rES/strings.xml
@@ -15,69 +15,165 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
   <string name="app_label">Cola d\'impresión</string>
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
   <string name="more_options_button">Más opciones</string>
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
   <string name="label_destination">Destín</string>
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
   <string name="label_copies">Copies</string>
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
   <string name="label_copies_summary">Copies:</string>
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
   <string name="label_paper_size">Tamañu papel</string>
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
   <string name="label_paper_size_summary">Tamañu papel:</string>
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
   <string name="label_color">Color</string>
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <string name="label_duplex">Dambos llaos</string>
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
   <string name="label_orientation">Orientación</string>
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
   <string name="label_pages">Páxines</string>
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
   <string name="template_all_pages">Too <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
   <string name="template_page_range">Rangu de <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
   <string name="pages_range_example">ex. 1—5,8,11—13</string>
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
   <string name="print_preview">Previsualizar impresión</string>
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
   <string name="install_for_print_preview">Instalar visor PDF pa previsualizar</string>
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
   <string name="printing_app_crashed">Falló l\'aplicación d\'impresión</string>
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
   <string name="generating_print_job">Xenerando trabayu d\'impresión</string>
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
   <string name="save_as_pdf">Guardar como PDF</string>
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
   <string name="all_printers">Toles imprentadores&#8230;</string>
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
   <string name="print_dialog">Cuadru de diálogu d\'impresión</string>
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
   <string name="current_page_template"><xliff:g id="current_page">%1$d</xliff:g>
         /<xliff:g id="page_count">%2$d</xliff:g></string>
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
   <string name="page_description_template">Páxina <xliff:g id="current_page" example="1">%1$d</xliff:g>
         de <xliff:g id="page_count" example="100">%2$d</xliff:g></string>
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
   <string name="summary_template">Resume, copies <xliff:g id="copies" example="1">%1$s</xliff:g>,
         tamañu papel <xliff:g id="paper_size" example="A4">%2$s</xliff:g></string>
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
   <string name="expand_handle">Remanar espansión</string>
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
   <string name="collapse_handle">Remanar contraición</string>
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_button">Imprentar</string>
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="savetopdf_button">Guardar a PDF</string>
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_options_expanded">Opciones d\'imprentación espandíes</string>
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_options_collapsed">Opciones d\'imprentación contrayíes</string>
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
   <string name="search">Guetar</string>
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
   <string name="all_printers_label">Toles imprentadores</string>
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
   <string name="add_print_service_label">Amestar serviciu</string>
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_shown_utterance">Cuadru de gueta visible</string>
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">Cuadru de gueta anubríu</string>
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
   <string name="print_add_printer">Amestar imprentadora</string>
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
   <string name="print_select_printer">Esbillar imprentadora</string>
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
   <string name="print_forget_printer">Esborrar imprentadora</string>
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <plurals name="print_search_result_count_utterance">
+    <item quantity="one">Atopóse <xliff:g id="count" example="1">%1$s</xliff:g> imprentadora</item>
+    <item quantity="other">Atopáronse <xliff:g id="count" example="2">%1$s</xliff:g> imprentadores</item>
+  </plurals>
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
   <string name="choose_print_service">Elexir serviciu d\'impresión</string>
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
   <string name="print_searching_for_printers">Guetando imprentadores</string>
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
   <string name="print_no_printers">Nun s\'atoparon imprentadores</string>
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
   <string name="printing_notification_title_template">Imprentando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
   <string name="cancelling_notification_title_template">Encaboxando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
   <string name="failed_notification_title_template">Fallu d\'imprentadora <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
   <string name="blocked_notification_title_template">La imprentadora bloquió <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <plurals name="composite_notification_title_template">
+    <item quantity="one"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> trabayu d\'impresión</item>
+    <item quantity="other"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> trabayos d\'impresión</item>
+  </plurals>
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
   <string name="cancel">Encaboxar</string>
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
   <string name="restart">Reaniciar</string>
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
   <string name="no_connection_to_printer">Nun hai conexón cola imprentadora</string>
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
   <string name="reason_unknown">desconocíu</string>
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
   <string name="printer_unavailable"><xliff:g id="print_job_name" example="Canon-123GHT">%1$s</xliff:g> – non disponible</string>
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
   <string-array name="color_mode_labels">
+    <!-- Color mode label: Monochrome color scheme, e.g. one color is used. [CHAR LIMIT=20] -->
     <item>Blancu y prietu</item>
+    <!-- Color mode label: Color color scheme, e.g. many colors are used. [CHAR LIMIT=20] -->
     <item>Color</item>
   </string-array>
+  <!-- Duplex mode labels. -->
+  <string-array name="duplex_mode_labels">
+    <!-- Duplex mode label: No duplex supported. [CHAR LIMIT=20] -->
+    <item>Nengún</item>
+    <!-- Duplex mode label: Turn page sideways along the long edge like a book. [CHAR LIMIT=20] -->
+    <item>Borde llargu</item>
+    <!-- Duplex mode label: Turn page upwards along the short edge like a notepad. [CHAR LIMIT=20] -->
+    <item>Borde curtiu</item>
+  </string-array>
+  <!-- Orientation labels. -->
   <string-array name="orientation_labels">
+    <!-- Orientation label: Portrait page orientation. [CHAR LIMIT=30] -->
     <item>Retratu</item>
+    <!-- Orientation label: Landscape page orientation [CHAR LIMIT=30] -->
     <item>Paisaxe</item>
   </string-array>
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
   <string name="print_write_error_message">Nun pudo escribise nel ficheru</string>
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
   <string name="print_error_default_message">Nun funcionó. Inténtalo otra vegada.</string>
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
   <string name="print_error_retry">Repitir</string>
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
   <string name="print_error_printer_unavailable">La imprentadora nun ta disponible agora.</string>
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
   <string name="print_preparing_preview">Preparando previsualización\u2026</string>
 </resources>
diff --git a/packages/PrintSpooler/res/values-az-rAZ/strings.xml b/packages/PrintSpooler/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..c102745
--- /dev/null
+++ b/packages/PrintSpooler/res/values-az-rAZ/strings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<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">"Çap Spuler"</string>
+    <string name="more_options_button" msgid="2243228396432556771">"Daha çox seçim"</string>
+    <string name="label_destination" msgid="9132510997381599275">"Hədəf"</string>
+    <string name="label_copies" msgid="3634531042822968308">"Surətlər"</string>
+    <string name="label_copies_summary" msgid="3861966063536529540">"Nüsxələr:"</string>
+    <string name="label_paper_size" msgid="908654383827777759">"Kağız ölçüsü"</string>
+    <string name="label_paper_size_summary" msgid="5668204981332138168">"Kağız ölçüsü:"</string>
+    <string name="label_color" msgid="1108690305218188969">"Rəng"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"İkitərəfli"</string>
+    <string name="label_orientation" msgid="2853142581990496477">"Oriyentasiya"</string>
+    <string name="label_pages" msgid="7768589729282182230">"Səhifələr"</string>
+    <string name="template_all_pages" msgid="3322235982020148762">"Bütün <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
+    <string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> diapazonu"</string>
+    <string name="pages_range_example" msgid="8558694453556945172">"məsələn, 1—5,8,11—13"</string>
+    <string name="print_preview" msgid="8010217796057763343">"Çap önizləmə"</string>
+    <string name="install_for_print_preview" msgid="6366303997385509332">"Önizləmə üçün PDF izləyici quraşdırın"</string>
+    <string name="printing_app_crashed" msgid="854477616686566398">"Çap tətbiqi sındı"</string>
+    <string name="generating_print_job" msgid="3119608742651698916">"Çap işi generasiya edilir"</string>
+    <string name="save_as_pdf" msgid="5718454119847596853">"PDF olaraq yadda saxla"</string>
+    <string name="all_printers" msgid="5018829726861876202">"Bütün printerlər..."</string>
+    <string name="print_dialog" msgid="32628687461331979">"Dialoqu çap edin"</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>
+    <string name="page_description_template" msgid="6831239682256197161">"<xliff:g id="PAGE_COUNT">%2$d</xliff:g> səhifədən <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> səhifə"</string>
+    <string name="summary_template" msgid="8899734908625669193">"Cəm, nüsxə <xliff:g id="COPIES">%1$s</xliff:g>, kağız ölçüsü <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
+    <string name="expand_handle" msgid="7282974448109280522">"Dəstəyi genişləndirin"</string>
+    <string name="collapse_handle" msgid="6886637989442507451">"Dəstəyi yığcamlaşdırın"</string>
+    <string name="print_button" msgid="645164566271246268">"Çap"</string>
+    <string name="savetopdf_button" msgid="2976186791686924743">"PDF-də saxlayın"</string>
+    <string name="print_options_expanded" msgid="6944679157471691859">"Çap seçimləri genişləndi"</string>
+    <string name="print_options_collapsed" msgid="7455930445670414332">"Çap seçimləri yığcamlaşdı"</string>
+    <string name="search" msgid="5421724265322228497">"Axtarış"</string>
+    <string name="all_printers_label" msgid="3178848870161526399">"Bütün printerlər"</string>
+    <string name="add_print_service_label" msgid="5356702546188981940">"Xidmət əlavə edin"</string>
+    <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"Axtarış sahəsi görünür"</string>
+    <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"Axtarış sahəsi gizlidir"</string>
+    <string name="print_add_printer" msgid="1088656468360653455">"Printer əlavə edin"</string>
+    <string name="print_select_printer" msgid="7388760939873368698">"Printer seçin"</string>
+    <string name="print_forget_printer" msgid="5035287497291910766">"Printeri unudun"</string>
+    <plurals name="print_search_result_count_utterance" formatted="false" msgid="6997663738361080868">
+      <item quantity="other"><xliff:g id="COUNT_1">%1$s</xliff:g> printer tapıldı</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%1$s</xliff:g> printer tapıldı</item>
+    </plurals>
+    <string name="choose_print_service" msgid="3740309762324459694">"Çap xidmətini seçin"</string>
+    <string name="print_searching_for_printers" msgid="6550424555079932867">"Printer axtarılır"</string>
+    <string name="print_no_printers" msgid="4869403323900054866">"Heç bir printer tapılmadı"</string>
+    <string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> çap edilir"</string>
+    <string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ləğv edilir"</string>
+    <string name="failed_notification_title_template" msgid="2256217208186530973">"Printer xətası <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="blocked_notification_title_template" msgid="1175435827331588646">"Printer <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> işini blokladı"</string>
+    <plurals name="composite_notification_title_template" formatted="false" msgid="6940956968211733780">
+      <item quantity="other"><xliff:g id="PRINT_JOB_NAME_1">%1$d</xliff:g> çap işi</item>
+      <item quantity="one"><xliff:g id="PRINT_JOB_NAME_0">%1$d</xliff:g> çap işi</item>
+    </plurals>
+    <string name="cancel" msgid="4373674107267141885">"Ləğv et"</string>
+    <string name="restart" msgid="2472034227037808749">"Yenidən başlat"</string>
+    <string name="no_connection_to_printer" msgid="2159246915977282728">"Printerə heç bir bağlantı yoxdur"</string>
+    <string name="reason_unknown" msgid="5507940196503246139">"naməlum"</string>
+    <string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>– əlçatmaz"</string>
+  <string-array name="color_mode_labels">
+    <item msgid="7602948745415174937">"Qara &amp; Ağ"</item>
+    <item msgid="2762241247228983754">"Rəng"</item>
+  </string-array>
+  <string-array name="duplex_mode_labels">
+    <item msgid="3882302912790928315">"Heç biri"</item>
+    <item msgid="7296563835355641719">"Uzun kənar"</item>
+    <item msgid="79513688117503758">"Qısa kənar"</item>
+  </string-array>
+  <string-array name="orientation_labels">
+    <item msgid="4061931020926489228">"Portret"</item>
+    <item msgid="3199660090246166812">"Peyzaj"</item>
+  </string-array>
+    <string name="print_write_error_message" msgid="5787642615179572543">"Fayla yazmaq alınmadı"</string>
+    <string name="print_error_default_message" msgid="8602678405502922346">"Üzr istəyirik, alınmadı. Yenidən cəhd edin."</string>
+    <string name="print_error_retry" msgid="1426421728784259538">"Yenidən yoxla"</string>
+    <string name="print_error_printer_unavailable" msgid="8985614415253203381">"Bu printer hazırda əlçatan deyil."</string>
+    <string name="print_preparing_preview" msgid="3939930735671364712">"Önizləməyə hazırlıq gedir..."</string>
+</resources>
diff --git a/packages/PrintSpooler/res/values-be/strings.xml b/packages/PrintSpooler/res/values-be/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-be/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-bg/strings.xml b/packages/PrintSpooler/res/values-bg/strings.xml
index 5df95cb..c88d0d4 100644
--- a/packages/PrintSpooler/res/values-bg/strings.xml
+++ b/packages/PrintSpooler/res/values-bg/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Размер на хартията"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Размер на хартията:"</string>
     <string name="label_color" msgid="1108690305218188969">"Цвят"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Двустранен режим"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Двустранно"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Ориентация"</string>
     <string name="label_pages" msgid="7768589729282182230">"Страници"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Всички <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
@@ -59,7 +59,7 @@
       <item quantity="one">Намерен е <xliff:g id="COUNT_0">%1$s</xliff:g> принтер</item>
     </plurals>
     <string name="choose_print_service" msgid="3740309762324459694">"Избиране на услуга за отпечатване"</string>
-    <string name="print_searching_for_printers" msgid="6550424555079932867">"Търсят се принтери"</string>
+    <string name="print_searching_for_printers" msgid="6550424555079932867">"Търсене на принтери"</string>
     <string name="print_no_printers" msgid="4869403323900054866">"Няма намерени принтери"</string>
     <string name="printing_notification_title_template" msgid="295903957762447362">"„<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>“ се отпечатва"</string>
     <string name="cancelling_notification_title_template" msgid="1821759594704703197">"„<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>“ се анулира"</string>
diff --git a/packages/PrintSpooler/res/values-bn-rBD/strings.xml b/packages/PrintSpooler/res/values-bn-rBD/strings.xml
index cf6ed72..45f20a0 100644
--- a/packages/PrintSpooler/res/values-bn-rBD/strings.xml
+++ b/packages/PrintSpooler/res/values-bn-rBD/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"কাগজের আকার"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"কাগজের আকার:"</string>
     <string name="label_color" msgid="1108690305218188969">"রঙ"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"দ্বৈত"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"দ্বিভুজ"</string>
     <string name="label_orientation" msgid="2853142581990496477">"সজ্জা"</string>
     <string name="label_pages" msgid="7768589729282182230">"পৃষ্ঠাগুলি"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"সমস্ত <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-br-rFR/strings.xml b/packages/PrintSpooler/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-br-rFR/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-bs-rBA/strings.xml b/packages/PrintSpooler/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-bs-rBA/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-ca/strings.xml b/packages/PrintSpooler/res/values-ca/strings.xml
index 04c3b90..612be97 100644
--- a/packages/PrintSpooler/res/values-ca/strings.xml
+++ b/packages/PrintSpooler/res/values-ca/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Mida del paper"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Mida del paper:"</string>
     <string name="label_color" msgid="1108690305218188969">"Color"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dúplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"De dues cares"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientació"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pàgines"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Totes (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
diff --git a/packages/PrintSpooler/res/values-cs/strings.xml b/packages/PrintSpooler/res/values-cs/strings.xml
index ca528c1..99ed75d 100644
--- a/packages/PrintSpooler/res/values-cs/strings.xml
+++ b/packages/PrintSpooler/res/values-cs/strings.xml
@@ -20,11 +20,11 @@
     <string name="more_options_button" msgid="2243228396432556771">"Další možnosti"</string>
     <string name="label_destination" msgid="9132510997381599275">"Cíl"</string>
     <string name="label_copies" msgid="3634531042822968308">"Kopie"</string>
-    <string name="label_copies_summary" msgid="3861966063536529540">"Počet kopií:"</string>
+    <string name="label_copies_summary" msgid="3861966063536529540">"Kopie:"</string>
     <string name="label_paper_size" msgid="908654383827777759">"Velikost papíru"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Velikost papíru:"</string>
     <string name="label_color" msgid="1108690305218188969">"Barva"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Oboustranně"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Oboustranně"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientace"</string>
     <string name="label_pages" msgid="7768589729282182230">"Stránky"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Vše: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
@@ -77,7 +77,7 @@
     <string name="restart" msgid="2472034227037808749">"Restartovat"</string>
     <string name="no_connection_to_printer" msgid="2159246915977282728">"Nelze se připojit k tiskárně"</string>
     <string name="reason_unknown" msgid="5507940196503246139">"neznámé"</string>
-    <string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – není k dispozici"</string>
+    <string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – není k dispozici"</string>
   <string-array name="color_mode_labels">
     <item msgid="7602948745415174937">"Černobíle"</item>
     <item msgid="2762241247228983754">"Barevně"</item>
diff --git a/packages/PrintSpooler/res/values-csb-rPL/strings.xml b/packages/PrintSpooler/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-csb-rPL/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-cy/strings.xml b/packages/PrintSpooler/res/values-cy/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-cy/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-da/strings.xml b/packages/PrintSpooler/res/values-da/strings.xml
index 6b539d7..526e976 100644
--- a/packages/PrintSpooler/res/values-da/strings.xml
+++ b/packages/PrintSpooler/res/values-da/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Papirstørrelse"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Papirstørrelse:"</string>
     <string name="label_color" msgid="1108690305218188969">"Farve"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Tosidet"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Retning"</string>
     <string name="label_pages" msgid="7768589729282182230">"Sider"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Alle <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-de/strings.xml b/packages/PrintSpooler/res/values-de/strings.xml
index e3894c4..ef5e34c 100644
--- a/packages/PrintSpooler/res/values-de/strings.xml
+++ b/packages/PrintSpooler/res/values-de/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Papierformat"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Papierformat:"</string>
     <string name="label_color" msgid="1108690305218188969">"Farbe"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Zweiseitig"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Ausrichtung"</string>
     <string name="label_pages" msgid="7768589729282182230">"Seiten"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Alle <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-el/strings.xml b/packages/PrintSpooler/res/values-el/strings.xml
index ff2fe4e..a4bb04c 100644
--- a/packages/PrintSpooler/res/values-el/strings.xml
+++ b/packages/PrintSpooler/res/values-el/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Μεγέθος χαρτιού"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Μέγεθος χαρτιού:"</string>
     <string name="label_color" msgid="1108690305218188969">"Χρώμα"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Δύο πλευρές"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Δύο όψεων"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Προσανατολισμός"</string>
     <string name="label_pages" msgid="7768589729282182230">"Σελίδες"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Και οι <xliff:g id="PAGE_COUNT">%1$s</xliff:g> σελίδες"</string>
diff --git a/packages/PrintSpooler/res/values-en-rAU/strings.xml b/packages/PrintSpooler/res/values-en-rAU/strings.xml
index e5721b2..9f0d7e5 100644
--- a/packages/PrintSpooler/res/values-en-rAU/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rAU/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Paper size"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Paper size:"</string>
     <string name="label_color" msgid="1108690305218188969">"Colour"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pages"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-en-rGB/strings.xml b/packages/PrintSpooler/res/values-en-rGB/strings.xml
index e5721b2..9f0d7e5 100644
--- a/packages/PrintSpooler/res/values-en-rGB/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rGB/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Paper size"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Paper size:"</string>
     <string name="label_color" msgid="1108690305218188969">"Colour"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pages"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-en-rIN/strings.xml b/packages/PrintSpooler/res/values-en-rIN/strings.xml
index e5721b2..9f0d7e5 100644
--- a/packages/PrintSpooler/res/values-en-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rIN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Paper size"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Paper size:"</string>
     <string name="label_color" msgid="1108690305218188969">"Colour"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pages"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-en-rPT/strings.xml b/packages/PrintSpooler/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-en-rPT/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-eo/strings.xml b/packages/PrintSpooler/res/values-eo/strings.xml
new file mode 100644
index 0000000..b06a0bb
--- /dev/null
+++ b/packages/PrintSpooler/res/values-eo/strings.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <string name="label_copies_summary">Kopioj:</string>
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <string name="all_printers">Ĉiuj presiloj&#8230;</string>
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <string name="print_button">Presi</string>
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <string name="search">Serĉi</string>
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <string name="all_printers_label">Ĉiuj presiloj</string>
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <string name="add_print_service_label">Aldoni servon</string>
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <string name="print_add_printer">Aldoni presilon</string>
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <string name="print_select_printer">Elekti presilon</string>
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <string name="print_forget_printer">Forgesi presilon</string>
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <string name="cancel">Nuligi</string>
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <string name="reason_unknown">nekonata</string>
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <string-array name="color_mode_labels">
+    <!-- Color mode label: Monochrome color scheme, e.g. one color is used. [CHAR LIMIT=20] -->
+    <item>Black &amp; White</item>
+    <!-- Color mode label: Color color scheme, e.g. many colors are used. [CHAR LIMIT=20] -->
+    <item>Koloro</item>
+  </string-array>
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-es-rCO/strings.xml b/packages/PrintSpooler/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-es-rCO/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-es-rMX/strings.xml b/packages/PrintSpooler/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-es-rMX/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-es-rUS/strings.xml b/packages/PrintSpooler/res/values-es-rUS/strings.xml
index cc275de..ef0dbb1 100644
--- a/packages/PrintSpooler/res/values-es-rUS/strings.xml
+++ b/packages/PrintSpooler/res/values-es-rUS/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Tamaño del papel"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Tamaño de papel:"</string>
     <string name="label_color" msgid="1108690305218188969">"Color"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Doble faz"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Ambos lados"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientación"</string>
     <string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Todas (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
diff --git a/packages/PrintSpooler/res/values-es/strings.xml b/packages/PrintSpooler/res/values-es/strings.xml
index 13417a4..067c134 100644
--- a/packages/PrintSpooler/res/values-es/strings.xml
+++ b/packages/PrintSpooler/res/values-es/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Tamaño del papel"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Tamaño del papel:"</string>
     <string name="label_color" msgid="1108690305218188969">"Color"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Doble cara"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dos caras"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientación"</string>
     <string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Todas (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
@@ -53,7 +53,7 @@
     <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"Cuadro de búsqueda oculto"</string>
     <string name="print_add_printer" msgid="1088656468360653455">"Añadir impresora"</string>
     <string name="print_select_printer" msgid="7388760939873368698">"Seleccionar impresora"</string>
-    <string name="print_forget_printer" msgid="5035287497291910766">"Borrar impresora"</string>
+    <string name="print_forget_printer" msgid="5035287497291910766">"Olvidar impresora"</string>
     <plurals name="print_search_result_count_utterance" formatted="false" msgid="6997663738361080868">
       <item quantity="other">Se han encontrado <xliff:g id="COUNT_1">%1$s</xliff:g> impresoras</item>
       <item quantity="one">Se ha encontrado <xliff:g id="COUNT_0">%1$s</xliff:g> impresora</item>
diff --git a/packages/PrintSpooler/res/values-et-rEE/strings.xml b/packages/PrintSpooler/res/values-et-rEE/strings.xml
index dde4f3b..0227131 100644
--- a/packages/PrintSpooler/res/values-et-rEE/strings.xml
+++ b/packages/PrintSpooler/res/values-et-rEE/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Paberi suurus"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Paberi suurus:"</string>
     <string name="label_color" msgid="1108690305218188969">"Värv"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dupleksrežiim"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Kahepoolne"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Suund"</string>
     <string name="label_pages" msgid="7768589729282182230">"Lehed"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Kõik <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-eu-rES/strings.xml b/packages/PrintSpooler/res/values-eu-rES/strings.xml
index 3cc1b64..461a92f 100644
--- a/packages/PrintSpooler/res/values-eu-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-eu-rES/strings.xml
@@ -24,13 +24,13 @@
     <string name="label_paper_size" msgid="908654383827777759">"Paperaren tamaina"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Paperaren tamaina:"</string>
     <string name="label_color" msgid="1108690305218188969">"Koloretan"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Bikoitza"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Bi aldekoa"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientazioa"</string>
     <string name="label_pages" msgid="7768589729282182230">"Orriak"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> orriak"</string>
     <string name="template_page_range" msgid="428638530038286328">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> orriko tartea"</string>
     <string name="pages_range_example" msgid="8558694453556945172">"adib., 1-5, 8,11-13"</string>
-    <string name="print_preview" msgid="8010217796057763343">"Inprimatzearen aurrebista"</string>
+    <string name="print_preview" msgid="8010217796057763343">"Inprimatze-aurrebista"</string>
     <string name="install_for_print_preview" msgid="6366303997385509332">"Aurrebista ikusteko, instalatu PDF ikustailea"</string>
     <string name="printing_app_crashed" msgid="854477616686566398">"Inprimatzeko aplikazioak matxura izan du"</string>
     <string name="generating_print_job" msgid="3119608742651698916">"Inprimatze-lana sortzen"</string>
diff --git a/packages/PrintSpooler/res/values-fa/strings.xml b/packages/PrintSpooler/res/values-fa/strings.xml
index c47a75a..0e1629f 100644
--- a/packages/PrintSpooler/res/values-fa/strings.xml
+++ b/packages/PrintSpooler/res/values-fa/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"اندازه کاغذ"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"اندازه کاغذ:"</string>
     <string name="label_color" msgid="1108690305218188969">"رنگی"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"دوبلکس"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"دوطرفه"</string>
     <string name="label_orientation" msgid="2853142581990496477">"جهت"</string>
     <string name="label_pages" msgid="7768589729282182230">"صفحه‌ها"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"همه <xliff:g id="PAGE_COUNT">%1$s</xliff:g> صفحه"</string>
@@ -59,7 +59,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$s</xliff:g> چاپگر یافت شد</item>
     </plurals>
     <string name="choose_print_service" msgid="3740309762324459694">"انتخاب سرویس چاپ"</string>
-    <string name="print_searching_for_printers" msgid="6550424555079932867">"در حال جستجو برای چاپگرها"</string>
+    <string name="print_searching_for_printers" msgid="6550424555079932867">"درحال جستجوی چاپگرها"</string>
     <string name="print_no_printers" msgid="4869403323900054866">"هیچ چاپگری یافت نشد"</string>
     <string name="printing_notification_title_template" msgid="295903957762447362">"در حال چاپ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="cancelling_notification_title_template" msgid="1821759594704703197">"در حال لغو <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-fi/strings.xml b/packages/PrintSpooler/res/values-fi/strings.xml
index 6c88534..faf40e2 100644
--- a/packages/PrintSpooler/res/values-fi/strings.xml
+++ b/packages/PrintSpooler/res/values-fi/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Paperikoko"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Paperikoko:"</string>
     <string name="label_color" msgid="1108690305218188969">"Väri"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Kaksipuolinen"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Suunta"</string>
     <string name="label_pages" msgid="7768589729282182230">"Sivut"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Kaikki <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-fr-rCA/strings.xml b/packages/PrintSpooler/res/values-fr-rCA/strings.xml
index dbc1ea3..f949bb7 100644
--- a/packages/PrintSpooler/res/values-fr-rCA/strings.xml
+++ b/packages/PrintSpooler/res/values-fr-rCA/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Taille du papier"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Taille du papier :"</string>
     <string name="label_color" msgid="1108690305218188969">"Couleur"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Recto verso"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pages"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Toutes (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
diff --git a/packages/PrintSpooler/res/values-fr/strings.xml b/packages/PrintSpooler/res/values-fr/strings.xml
index cc0c352..1f5c716 100644
--- a/packages/PrintSpooler/res/values-fr/strings.xml
+++ b/packages/PrintSpooler/res/values-fr/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Taille du papier"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Taille du papier :"</string>
     <string name="label_color" msgid="1108690305218188969">"Couleur"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Recto verso"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Recto verso"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pages"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Toutes (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
@@ -34,7 +34,7 @@
     <string name="install_for_print_preview" msgid="6366303997385509332">"Installer un lecteur PDF pour afficher l\'aperçu"</string>
     <string name="printing_app_crashed" msgid="854477616686566398">"L\'application à l\'origine de l\'impression a planté"</string>
     <string name="generating_print_job" msgid="3119608742651698916">"Génération tâche impression…"</string>
-    <string name="save_as_pdf" msgid="5718454119847596853">"Enregistrer au format .PDF"</string>
+    <string name="save_as_pdf" msgid="5718454119847596853">"Enregistrer au format PDF"</string>
     <string name="all_printers" msgid="5018829726861876202">"Toutes les imprim."</string>
     <string name="print_dialog" msgid="32628687461331979">"Boîte de dialogue d\'impression"</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>
diff --git a/packages/PrintSpooler/res/values-frp-rIT/strings.xml b/packages/PrintSpooler/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-frp-rIT/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-fy-rNL/strings.xml b/packages/PrintSpooler/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-fy-rNL/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-ga-rIE/strings.xml b/packages/PrintSpooler/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-ga-rIE/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-gd-rGB/strings.xml b/packages/PrintSpooler/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-gd-rGB/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-gl-rES/strings.xml b/packages/PrintSpooler/res/values-gl-rES/strings.xml
index 0e3d9f5..0d4b040 100644
--- a/packages/PrintSpooler/res/values-gl-rES/strings.xml
+++ b/packages/PrintSpooler/res/values-gl-rES/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Tamaño do papel"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Tamaño do papel:"</string>
     <string name="label_color" msgid="1108690305218188969">"Cor"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dobre cara"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dual"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientación"</string>
     <string name="label_pages" msgid="7768589729282182230">"Páxinas"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"As <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-gu-rIN/strings.xml b/packages/PrintSpooler/res/values-gu-rIN/strings.xml
index 8708ede..28ffc2a 100644
--- a/packages/PrintSpooler/res/values-gu-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-gu-rIN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"કાગળનું કદ"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"કાગળનું કદ:"</string>
     <string name="label_color" msgid="1108690305218188969">"રંગ"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"ડુપ્લેક્સ"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"દ્વિભુજ"</string>
     <string name="label_orientation" msgid="2853142581990496477">"ઓરિએન્ટેશન"</string>
     <string name="label_pages" msgid="7768589729282182230">"પૃષ્ઠો"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"તમામ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-hi/strings.xml b/packages/PrintSpooler/res/values-hi/strings.xml
index 13d5543..1a0f7d1 100644
--- a/packages/PrintSpooler/res/values-hi/strings.xml
+++ b/packages/PrintSpooler/res/values-hi/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"काग़ज़ का आकार"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"काग़ज़ का आकार:"</string>
     <string name="label_color" msgid="1108690305218188969">"रंग"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"डुप्‍लेक्‍स"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"दो-तरफ़ा"</string>
     <string name="label_orientation" msgid="2853142581990496477">"अभिविन्‍यास"</string>
     <string name="label_pages" msgid="7768589729282182230">"पृष्ठ"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"सभी <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-hr/strings.xml b/packages/PrintSpooler/res/values-hr/strings.xml
index 79eb2eb..3e38d65 100644
--- a/packages/PrintSpooler/res/values-hr/strings.xml
+++ b/packages/PrintSpooler/res/values-hr/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Veličina papira"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Veličina papira:"</string>
     <string name="label_color" msgid="1108690305218188969">"U boji"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Obostrano"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Obostrano"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orijentacija"</string>
     <string name="label_pages" msgid="7768589729282182230">"Stranice"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Sve stranice (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
diff --git a/packages/PrintSpooler/res/values-hu/strings.xml b/packages/PrintSpooler/res/values-hu/strings.xml
index 91182cf..2b24b1f 100644
--- a/packages/PrintSpooler/res/values-hu/strings.xml
+++ b/packages/PrintSpooler/res/values-hu/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Papírméret"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Papírméret:"</string>
     <string name="label_color" msgid="1108690305218188969">"Szín"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Kétoldalas"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Kétoldalas"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Tájolás"</string>
     <string name="label_pages" msgid="7768589729282182230">"Oldalak"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Összes (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
diff --git a/packages/PrintSpooler/res/values-hy-rAM/strings.xml b/packages/PrintSpooler/res/values-hy-rAM/strings.xml
index 5babfe1..56f94b4 100644
--- a/packages/PrintSpooler/res/values-hy-rAM/strings.xml
+++ b/packages/PrintSpooler/res/values-hy-rAM/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Թղթի չափը"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Թղթի չափը՝"</string>
     <string name="label_color" msgid="1108690305218188969">"Գույնը"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Երկակի"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Երկկողմանի"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Դիրքավորում"</string>
     <string name="label_pages" msgid="7768589729282182230">"Էջեր"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Բոլորը՝ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-in/strings.xml b/packages/PrintSpooler/res/values-in/strings.xml
index d6d505d..d09fcfe 100644
--- a/packages/PrintSpooler/res/values-in/strings.xml
+++ b/packages/PrintSpooler/res/values-in/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Ukuran kertas"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Ukuran kertas:"</string>
     <string name="label_color" msgid="1108690305218188969">"Warna"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dupleks"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Bersisi ganda"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientasi"</string>
     <string name="label_pages" msgid="7768589729282182230">"Halaman"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Semua dari <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-is-rIS/strings.xml b/packages/PrintSpooler/res/values-is-rIS/strings.xml
index dbe05bc..bf13ebf 100644
--- a/packages/PrintSpooler/res/values-is-rIS/strings.xml
+++ b/packages/PrintSpooler/res/values-is-rIS/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Pappírsstærð"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Pappírsstærð:"</string>
     <string name="label_color" msgid="1108690305218188969">"Litur"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Tvíhliða"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Tvíhliða"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Stefna"</string>
     <string name="label_pages" msgid="7768589729282182230">"Síður"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Allar <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-it/strings.xml b/packages/PrintSpooler/res/values-it/strings.xml
index ff388ca..b052341 100644
--- a/packages/PrintSpooler/res/values-it/strings.xml
+++ b/packages/PrintSpooler/res/values-it/strings.xml
@@ -21,10 +21,10 @@
     <string name="label_destination" msgid="9132510997381599275">"Destinazione"</string>
     <string name="label_copies" msgid="3634531042822968308">"Copie"</string>
     <string name="label_copies_summary" msgid="3861966063536529540">"Copie:"</string>
-    <string name="label_paper_size" msgid="908654383827777759">"Dimensioni carta"</string>
-    <string name="label_paper_size_summary" msgid="5668204981332138168">"Dimensioni carta:"</string>
+    <string name="label_paper_size" msgid="908654383827777759">"Formato carta"</string>
+    <string name="label_paper_size_summary" msgid="5668204981332138168">"Formato carta:"</string>
     <string name="label_color" msgid="1108690305218188969">"A colori"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Due tonalità (Duplex)"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Con doppia funzione"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientamento"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pagine"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Tutte e <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-iw/strings.xml b/packages/PrintSpooler/res/values-iw/strings.xml
index b103e2b..bb1967d 100644
--- a/packages/PrintSpooler/res/values-iw/strings.xml
+++ b/packages/PrintSpooler/res/values-iw/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"גודל נייר"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"גודל נייר:"</string>
     <string name="label_color" msgid="1108690305218188969">"צבע"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"דו-צדדי"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"דו-צדדי"</string>
     <string name="label_orientation" msgid="2853142581990496477">"כיוון"</string>
     <string name="label_pages" msgid="7768589729282182230">"עמודים"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"הכל <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ja/strings.xml b/packages/PrintSpooler/res/values-ja/strings.xml
index d782a16..8ef7517 100644
--- a/packages/PrintSpooler/res/values-ja/strings.xml
+++ b/packages/PrintSpooler/res/values-ja/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"用紙サイズ"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"用紙サイズ:"</string>
     <string name="label_color" msgid="1108690305218188969">"カラー選択"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"両面印刷"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"両面"</string>
     <string name="label_orientation" msgid="2853142581990496477">"方向"</string>
     <string name="label_pages" msgid="7768589729282182230">"ページ"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>ページすべて"</string>
@@ -53,7 +53,7 @@
     <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"検索ボックスは表示されていません"</string>
     <string name="print_add_printer" msgid="1088656468360653455">"プリンタを追加"</string>
     <string name="print_select_printer" msgid="7388760939873368698">"プリンタを選択"</string>
-    <string name="print_forget_printer" msgid="5035287497291910766">"プリンタを切断"</string>
+    <string name="print_forget_printer" msgid="5035287497291910766">"プリンタを削除"</string>
     <plurals name="print_search_result_count_utterance" formatted="false" msgid="6997663738361080868">
       <item quantity="other"><xliff:g id="COUNT_1">%1$s</xliff:g>台のプリンタが見つかりました</item>
       <item quantity="one"><xliff:g id="COUNT_0">%1$s</xliff:g>台のプリンタが見つかりました</item>
diff --git a/packages/PrintSpooler/res/values-ka-rGE/strings.xml b/packages/PrintSpooler/res/values-ka-rGE/strings.xml
index 928ab6f..b65d013 100644
--- a/packages/PrintSpooler/res/values-ka-rGE/strings.xml
+++ b/packages/PrintSpooler/res/values-ka-rGE/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"ფურცლის ზომა"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"ფურცლის ზომა:"</string>
     <string name="label_color" msgid="1108690305218188969">"ფერი"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"დუპლექსი"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"ორმხრივი"</string>
     <string name="label_orientation" msgid="2853142581990496477">"ორიენტაცია"</string>
     <string name="label_pages" msgid="7768589729282182230">"გვერდები"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"ყველა <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml b/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
index 8548048..ef914f0c 100644
--- a/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
+++ b/packages/PrintSpooler/res/values-kk-rKZ/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Қағаз өлшемі"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Қағаз өлшемі:"</string>
     <string name="label_color" msgid="1108690305218188969">"Түс"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Дуплексті"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Екі жақты"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Бағыты"</string>
     <string name="label_pages" msgid="7768589729282182230">"Беттер"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Барлық <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-km-rKH/strings.xml b/packages/PrintSpooler/res/values-km-rKH/strings.xml
index b600916..3aac97f 100644
--- a/packages/PrintSpooler/res/values-km-rKH/strings.xml
+++ b/packages/PrintSpooler/res/values-km-rKH/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"ទំហំ​​ក្រដាស"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"ទំហំ​ក្រដាស៖"</string>
     <string name="label_color" msgid="1108690305218188969">"ពណ៌"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"ឌុប"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"សងខាង"</string>
     <string name="label_orientation" msgid="2853142581990496477">"ទិស"</string>
     <string name="label_pages" msgid="7768589729282182230">"ទំព័រ"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> ទាំងអស់"</string>
diff --git a/packages/PrintSpooler/res/values-kn-rIN/strings.xml b/packages/PrintSpooler/res/values-kn-rIN/strings.xml
index 67b0e58..72e0bac 100644
--- a/packages/PrintSpooler/res/values-kn-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-kn-rIN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"ಪೇಪರ್ ಗಾತ್ರ"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"ಪೇಪರ್ ಗಾತ್ರ:"</string>
     <string name="label_color" msgid="1108690305218188969">"ಬಣ್ಣ"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"ಡ್ಯೂಪ್ಲೆಕ್ಸ್"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"ಎರಡು ಬದಿ"</string>
     <string name="label_orientation" msgid="2853142581990496477">"ಓರಿಯಂಟೇಶನ್"</string>
     <string name="label_pages" msgid="7768589729282182230">"ಪುಟಗಳು"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"ಎಲ್ಲಾ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
@@ -35,7 +35,7 @@
     <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="all_printers" msgid="5018829726861876202">"ಎಲ್ಲಾ ಮುದ್ರಕಗಳು…"</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>
     <string name="page_description_template" msgid="6831239682256197161">"ಪುಟ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> / <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
@@ -47,7 +47,7 @@
     <string name="print_options_expanded" msgid="6944679157471691859">"ಪ್ರಿಂಟ್ ಆಯ್ಕೆಗಳನ್ನು ವಿಸ್ತರಿಸಲಾಗಿದೆ"</string>
     <string name="print_options_collapsed" msgid="7455930445670414332">"ಪ್ರಿಂಟ್ ಆಯ್ಕೆಗಳನ್ನು ಮುಚ್ಚಲಾಗಿದೆ"</string>
     <string name="search" msgid="5421724265322228497">"ಹುಡುಕು"</string>
-    <string name="all_printers_label" msgid="3178848870161526399">"ಎಲ್ಲಾ ಮುದ್ರಕಗಳು"</string>
+    <string name="all_printers_label" msgid="3178848870161526399">"ಎಲ್ಲಾ ಪ್ರಿಂಟರ್‌ಗಳು"</string>
     <string name="add_print_service_label" msgid="5356702546188981940">"ಸೇವೆಯನ್ನು ಸೇರಿಸು"</string>
     <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"ಹುಡುಕಾಟ ಪೆಟ್ಟಿಗೆಯನ್ನು ತೋರಿಸಲಾಗಿದೆ"</string>
     <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"ಹುಡುಕಾಟ ಪೆಟ್ಟಿಗೆಯನ್ನು ಮರೆಮಾಡಲಾಗಿದೆ"</string>
@@ -59,7 +59,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$s</xliff:g> ಪ್ರಿಂಟರ್‌ಗಳು ಪತ್ತೆಯಾಗಿವೆ</item>
     </plurals>
     <string name="choose_print_service" msgid="3740309762324459694">"ಮುದ್ರಣ ಸೇವೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string>
-    <string name="print_searching_for_printers" msgid="6550424555079932867">"ಮುದ್ರಕಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
+    <string name="print_searching_for_printers" msgid="6550424555079932867">"ಪ್ರಿಂಟರ್‌‌ಗಳಿಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ"</string>
     <string name="print_no_printers" msgid="4869403323900054866">"ಯಾವುದೇ ಮುದ್ರಕಗಳು ಕಂಡುಬಂದಿಲ್ಲ"</string>
     <string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ಮುದ್ರಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> ರದ್ದು ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
diff --git a/packages/PrintSpooler/res/values-ko/strings.xml b/packages/PrintSpooler/res/values-ko/strings.xml
index 7d03c44..0d9a4dd 100644
--- a/packages/PrintSpooler/res/values-ko/strings.xml
+++ b/packages/PrintSpooler/res/values-ko/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"용지 크기"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"용지 크기:"</string>
     <string name="label_color" msgid="1108690305218188969">"색상"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"양면"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"양면"</string>
     <string name="label_orientation" msgid="2853142581990496477">"방향"</string>
     <string name="label_pages" msgid="7768589729282182230">"페이지"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g>페이지 모두"</string>
diff --git a/packages/PrintSpooler/res/values-ku/strings.xml b/packages/PrintSpooler/res/values-ku/strings.xml
index f2b5439..e3ca662 100644
--- a/packages/PrintSpooler/res/values-ku/strings.xml
+++ b/packages/PrintSpooler/res/values-ku/strings.xml
@@ -15,69 +15,156 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
   <string name="app_label">بەڕێوەبەری چاپکەر</string>
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
   <string name="more_options_button">بەربژاردەی زیاتر</string>
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
   <string name="label_destination">ئامانج</string>
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
   <string name="label_copies">لەبەرگرتنەوەکان</string>
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
   <string name="label_copies_summary">لەبەرگرتنەوەکان:</string>
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
   <string name="label_paper_size">قەبارەی کاغەز</string>
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
   <string name="label_paper_size_summary">قەبارەی کاغەز:</string>
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
   <string name="label_color">رەنگ</string>
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
   <string name="label_orientation">باری پیشاندان</string>
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
   <string name="label_pages">پەڕەکان</string>
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
   <string name="template_all_pages">هەموو <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
   <string name="template_page_range">ڕێژەی <xliff:g id="page_count" example="100">%1$s</xliff:g></string>
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
   <string name="pages_range_example">نموونە . 1—5,8,11—13</string>
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
   <string name="print_preview">بینینی پێش چاپ</string>
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
   <string name="install_for_print_preview">دامەزراندنی بینەری PDF بۆ پێشبینین</string>
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
   <string name="printing_app_crashed">بەرنامەی چاپکردن تێکشکا</string>
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
   <string name="generating_print_job">سازدانی ئەرکی چاپ</string>
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
   <string name="save_as_pdf">پاشەکەوت بە PDF</string>
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
   <string name="all_printers">هەموو چاپکەرەکان&#8230;</string>
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
   <string name="print_dialog">دیالۆگی چاپ</string>
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
   <string name="current_page_template"><xliff:g id="current_page">%1$d</xliff:g>
         /<xliff:g id="page_count">%2$d</xliff:g></string>
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
   <string name="page_description_template">پەڕە <xliff:g id="current_page" example="1">%1$d</xliff:g>
         لە <xliff:g id="page_count" example="100">%2$d</xliff:g></string>
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
   <string name="summary_template">کورتە, لەبەرگرتنەوە <xliff:g id="copies" example="1">%1$s</xliff:g>,
         قەبارەی پەڕە <xliff:g id="paper_size" example="A4">%2$s</xliff:g></string>
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
   <string name="expand_handle">بڵاوکردنەوەی دەست</string>
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
   <string name="collapse_handle">دەست دەکەوێت</string>
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_button">چاپکردن</string>
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="savetopdf_button">پاشەکەوتبکە بۆ PDF</string>
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_options_expanded">هەڵبژاردەی لەبەرگرتنەوە بڵاوکرایەوە</string>
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_options_collapsed">هەڵبژادەکانی لەبەرگرتنەوەی دەستکەوت</string>
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
   <string name="search">گەڕان</string>
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
   <string name="all_printers_label">هەموو چاپکەرەکان</string>
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
   <string name="add_print_service_label">زیادکردنی ڕاژە</string>
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_shown_utterance">سنووقی گەڕان پیشاندراوە</string>
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">سنووقی گەڕان شاراوەیە</string>
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
   <string name="print_add_printer">چاپکەر زیاد بکە</string>
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
   <string name="print_select_printer">چاپکەر دەستنیشان بکە</string>
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
   <string name="print_forget_printer">چاپکەر لەیادکە</string>
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <plurals name="print_search_result_count_utterance">
+    <item quantity="one"><xliff:g id="count" example="1">%1$s</xliff:g> چاپکەری دۆزراوە</item>
+    <item quantity="other"><xliff:g id="count" example="2">%1$s</xliff:g> چاپکەرەکانی دۆزراوە</item>
+  </plurals>
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
   <string name="choose_print_service">خزمەتگوزاریی چاپکردن هەڵبژێرە</string>
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
   <string name="print_searching_for_printers">گەڕان بەدوای چاپکەردا</string>
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
   <string name="print_no_printers">هیچ چاپکەرێک نەدۆزرایەوە</string>
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
   <string name="printing_notification_title_template">چاپکردن <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
   <string name="cancelling_notification_title_template">هەڵوەشاندنەوە <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
   <string name="failed_notification_title_template">هەڵەی چاپکەر <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
   <string name="blocked_notification_title_template">چاپکەر بەستراوە <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <plurals name="composite_notification_title_template">
+    <item quantity="one"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g>کاری چاپکردن</item>
+    <item quantity="other"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> کارەکانی چاپکردن</item>
+  </plurals>
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
   <string name="cancel">هەڵوەشانەوە</string>
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
   <string name="restart">دەستپێکردنەوە</string>
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
   <string name="no_connection_to_printer">پەیوەست نییە بە چاپکەرەوە</string>
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
   <string name="reason_unknown">نەناسراو</string>
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
   <string name="printer_unavailable"><xliff:g id="print_job_name" example="Canon-123GHT">%1$s</xliff:g> – بەردەست نییە</string>
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
   <string-array name="color_mode_labels">
+    <!-- Color mode label: Monochrome color scheme, e.g. one color is used. [CHAR LIMIT=20] -->
     <item>رەش وamp; سپی</item>
+    <!-- Color mode label: Color color scheme, e.g. many colors are used. [CHAR LIMIT=20] -->
     <item>ڕەنگ</item>
   </string-array>
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
   <string-array name="orientation_labels">
+    <!-- Orientation label: Portrait page orientation. [CHAR LIMIT=30] -->
     <item>وێنەی شێوە</item>
+    <!-- Orientation label: Landscape page orientation [CHAR LIMIT=30] -->
     <item>وێنەی سروشت</item>
   </string-array>
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
   <string name="print_write_error_message">ناتوانرێت فایلێک بنوسرێت</string>
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
   <string name="print_error_default_message">ببورە، ئەمە کاری نەکرد. دوبارە هەوڵبدەرەوە.</string>
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
   <string name="print_error_retry">هەوڵدانەوە</string>
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
   <string name="print_error_printer_unavailable">ئەم چاپکەرە لە کارانیە ئێستا.</string>
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
   <string name="print_preparing_preview">پیشاندانی ڕێکخستن\u2026</string>
 </resources>
diff --git a/packages/PrintSpooler/res/values-ky-rKG/strings.xml b/packages/PrintSpooler/res/values-ky-rKG/strings.xml
index 9053529..7f6eb10 100644
--- a/packages/PrintSpooler/res/values-ky-rKG/strings.xml
+++ b/packages/PrintSpooler/res/values-ky-rKG/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Барактын өлчөмү"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Барактын өлчөмү:"</string>
     <string name="label_color" msgid="1108690305218188969">"Түс"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Кош тараптуу"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Эки тараптуу"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Багыттоо"</string>
     <string name="label_pages" msgid="7768589729282182230">"Баракчалар"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Бардыгы <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-lb/strings.xml b/packages/PrintSpooler/res/values-lb/strings.xml
index 765c41f..47805f0 100644
--- a/packages/PrintSpooler/res/values-lb/strings.xml
+++ b/packages/PrintSpooler/res/values-lb/strings.xml
@@ -15,66 +15,153 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
   <string name="app_label">Drock-Tëschespäicher</string>
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
   <string name="more_options_button">Méi Optiounen</string>
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
   <string name="label_destination">Destinatioun</string>
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
   <string name="label_copies">Kopien</string>
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
   <string name="label_copies_summary">Kopien:</string>
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
   <string name="label_paper_size">Pabeiersgréisst</string>
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
   <string name="label_paper_size_summary">Pabeiersgréisst:</string>
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
   <string name="label_color">Faarf</string>
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
   <string name="label_orientation">Orientéierung</string>
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
   <string name="label_pages">Säiten</string>
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
   <string name="template_all_pages">All (<xliff:g id="page_count" example="100">%1$s</xliff:g>)</string>
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
   <string name="template_page_range">Rei (<xliff:g id="page_count" example="100">%1$s</xliff:g>)</string>
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
   <string name="pages_range_example">z. B. 1-5,8,11-13</string>
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
   <string name="print_preview">Drockvirschau</string>
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
   <string name="install_for_print_preview">Installéier e PDF-Programm fir eng Drockvirschau</string>
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
   <string name="printing_app_crashed">D\'Drockapp ass ofgestierzt</string>
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
   <string name="generating_print_job">Drockoptrag gëtt generéiert</string>
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
   <string name="save_as_pdf">Als PDF späicheren</string>
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
   <string name="all_printers">All d\'Drécker&#8230;</string>
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
   <string name="print_dialog">Drockdialogfënster</string>
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
   <string name="current_page_template"><xliff:g id="current_page">%1$d</xliff:g> / <xliff:g id="page_count">%2$d</xliff:g></string>
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
   <string name="page_description_template">Säit <xliff:g id="current_page" example="1">%1$d</xliff:g> / <xliff:g id="page_count" example="100">%2$d</xliff:g></string>
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
   <string name="summary_template">Resumé, <xliff:g id="copies" example="1">%1$s</xliff:g> Kopien, Pabeiersgréisst <xliff:g id="paper_size" example="A4">%2$s</xliff:g></string>
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
   <string name="expand_handle">Steierelement fir d\'Ausklappen</string>
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
   <string name="collapse_handle">Steierelement fir d\'Zesummeklappen</string>
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_button">Drécken</string>
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="savetopdf_button">Als PDF späicheren</string>
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_options_expanded">Drockoptiounen ausgeklappt</string>
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_options_collapsed">Drockoptiounen zesummegeklappt</string>
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
   <string name="search">Sichen</string>
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
   <string name="all_printers_label">All d\'Drécker</string>
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
   <string name="add_print_service_label">Service dobäisetzen</string>
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_shown_utterance">Sichkëscht ugewisen</string>
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">Sichkëscht verstoppt</string>
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
   <string name="print_add_printer">Drécker dobäisetzen</string>
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
   <string name="print_select_printer">Drécker auswielen</string>
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
   <string name="print_forget_printer">Drécker vergiessen</string>
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <plurals name="print_search_result_count_utterance">
+    <item quantity="one"><xliff:g id="count" example="1">%1$s</xliff:g> Drécker fonnt</item>
+    <item quantity="other"><xliff:g id="count" example="1">%1$s</xliff:g> Drécker fonnt</item>
+  </plurals>
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
   <string name="choose_print_service">Drockservice auswielen</string>
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
   <string name="print_searching_for_printers">Et gëtt no Drécker gesicht</string>
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
   <string name="print_no_printers">Keen Drécker fonnt</string>
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
   <string name="printing_notification_title_template"><xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g> gëtt gedréckt</string>
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
   <string name="cancelling_notification_title_template"><xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g> gëtt ofgebrach</string>
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
   <string name="failed_notification_title_template">Dréckerfeeler <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
   <string name="blocked_notification_title_template">Drécker blockéiert <xliff:g id="print_job_name" example="foo.jpg">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <plurals name="composite_notification_title_template">
+    <item quantity="one"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> Drockoptrag</item>
+    <item quantity="other"><xliff:g id="print_job_name" example="foo.jpg">%1$d</xliff:g> Drockopträg</item>
+  </plurals>
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
   <string name="cancel">Ofbriechen</string>
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
   <string name="restart">Nei starten</string>
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
   <string name="no_connection_to_printer">Keng Connectioun mam Drécker</string>
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
   <string name="reason_unknown">onbekannt</string>
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
   <string name="printer_unavailable"><xliff:g id="print_job_name" example="Canon-123GHT">%1$s</xliff:g> – net verfügbar</string>
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
   <string-array name="color_mode_labels">
+    <!-- Color mode label: Monochrome color scheme, e.g. one color is used. [CHAR LIMIT=20] -->
     <item>Schwaarz &amp; Wäiss</item>
+    <!-- Color mode label: Color color scheme, e.g. many colors are used. [CHAR LIMIT=20] -->
     <item>Faarf</item>
   </string-array>
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
   <string-array name="orientation_labels">
+    <!-- Orientation label: Portrait page orientation. [CHAR LIMIT=30] -->
     <item>Héichformat</item>
+    <!-- Orientation label: Landscape page orientation [CHAR LIMIT=30] -->
     <item>Breetformat</item>
   </string-array>
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
   <string name="print_write_error_message">Feeler beim Schreiwen an de Fichier</string>
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
   <string name="print_error_default_message">Dat ass leider net gaangen. Probéier nees.</string>
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
   <string name="print_error_retry">Nees probéieren</string>
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
   <string name="print_error_printer_unavailable">Den Drécker ass momentan net disponibel.</string>
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
   <string name="print_preparing_preview">Virschau gëtt preparéiert\u2026</string>
 </resources>
diff --git a/packages/PrintSpooler/res/values-lo-rLA/strings.xml b/packages/PrintSpooler/res/values-lo-rLA/strings.xml
index c8aed29..7e65b72 100644
--- a/packages/PrintSpooler/res/values-lo-rLA/strings.xml
+++ b/packages/PrintSpooler/res/values-lo-rLA/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"​ຂະ​ໜາດ​ເຈ້ຍ"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"​ຂະ​ໜາດ​ເຈ້ຍ:"</string>
     <string name="label_color" msgid="1108690305218188969">"ສີ"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"ສອງ​ໜ້າ"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"ສອງ​ດ້ານ"</string>
     <string name="label_orientation" msgid="2853142581990496477">"ລວງ"</string>
     <string name="label_pages" msgid="7768589729282182230">"ໜ້າ"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"ທັງ​ໝົດ <xliff:g id="PAGE_COUNT">%1$s</xliff:g> ໜ້າ"</string>
diff --git a/packages/PrintSpooler/res/values-lt/strings.xml b/packages/PrintSpooler/res/values-lt/strings.xml
index f2ca5b7..a3129cc 100644
--- a/packages/PrintSpooler/res/values-lt/strings.xml
+++ b/packages/PrintSpooler/res/values-lt/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Popieriaus dydis"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Popieriaus dydis:"</string>
     <string name="label_color" msgid="1108690305218188969">"Spalva"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dvipusis"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dvipusis"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientacija"</string>
     <string name="label_pages" msgid="7768589729282182230">"Puslapiai"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Visi <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-lv/strings.xml b/packages/PrintSpooler/res/values-lv/strings.xml
index cc49244..daadf99 100644
--- a/packages/PrintSpooler/res/values-lv/strings.xml
+++ b/packages/PrintSpooler/res/values-lv/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Papīra izmērs"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Papīra izmērs:"</string>
     <string name="label_color" msgid="1108690305218188969">"Krāsa"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dubults"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Divpusējs"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Virziens"</string>
     <string name="label_pages" msgid="7768589729282182230">"Lapas"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Visas <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-mk-rMK/strings.xml b/packages/PrintSpooler/res/values-mk-rMK/strings.xml
index 43c7c56..3ebc1c9 100644
--- a/packages/PrintSpooler/res/values-mk-rMK/strings.xml
+++ b/packages/PrintSpooler/res/values-mk-rMK/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Големина на хартија"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Големина на хартија:"</string>
     <string name="label_color" msgid="1108690305218188969">"Боја"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Двострано"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Двостран"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Ориентација"</string>
     <string name="label_pages" msgid="7768589729282182230">"Страници"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Сите <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ml-rIN/strings.xml b/packages/PrintSpooler/res/values-ml-rIN/strings.xml
index 9b577a0..63b4060 100644
--- a/packages/PrintSpooler/res/values-ml-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-ml-rIN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"പേപ്പർ വലുപ്പം"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"പേപ്പർ വലുപ്പം:"</string>
     <string name="label_color" msgid="1108690305218188969">"നിറം"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"രണ്ടുഭാഗങ്ങളുള്ളത്"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"രണ്ട് വശങ്ങളുള്ളത്"</string>
     <string name="label_orientation" msgid="2853142581990496477">"ഓറിയന്‍റേഷന്‍‌"</string>
     <string name="label_pages" msgid="7768589729282182230">"പേജുകൾ"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"എല്ലാ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-mn-rMN/strings.xml b/packages/PrintSpooler/res/values-mn-rMN/strings.xml
index c36eacc..a8628c9 100644
--- a/packages/PrintSpooler/res/values-mn-rMN/strings.xml
+++ b/packages/PrintSpooler/res/values-mn-rMN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Цаасны хэмжээ"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Цаасны хэмжээ:"</string>
     <string name="label_color" msgid="1108690305218188969">"Өнгө"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Хоёр талд нь хэвлэх"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Хоёр талт"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Чиглэл"</string>
     <string name="label_pages" msgid="7768589729282182230">"Хуудас"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Нийт <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-mr-rIN/strings.xml b/packages/PrintSpooler/res/values-mr-rIN/strings.xml
index c79b5d3..c08e440 100644
--- a/packages/PrintSpooler/res/values-mr-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-mr-rIN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"कागद आकार"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"कागद आकार:"</string>
     <string name="label_color" msgid="1108690305218188969">"रंग"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"डुप्लेक्स"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"दोन्ही बाजूंनी"</string>
     <string name="label_orientation" msgid="2853142581990496477">"अभिमुखता"</string>
     <string name="label_pages" msgid="7768589729282182230">"पृष्ठे"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"सर्व <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ms-rMY/strings.xml b/packages/PrintSpooler/res/values-ms-rMY/strings.xml
index 5111beb..4ed1019 100644
--- a/packages/PrintSpooler/res/values-ms-rMY/strings.xml
+++ b/packages/PrintSpooler/res/values-ms-rMY/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Saiz kertas"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Saiz kertas:"</string>
     <string name="label_color" msgid="1108690305218188969">"Warna"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dupleks"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dua sisi"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientasi"</string>
     <string name="label_pages" msgid="7768589729282182230">"Halaman"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Semua <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-my-rMM/strings.xml b/packages/PrintSpooler/res/values-my-rMM/strings.xml
index fc0c28e..0a65a11 100644
--- a/packages/PrintSpooler/res/values-my-rMM/strings.xml
+++ b/packages/PrintSpooler/res/values-my-rMM/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"စက္ကူ  ဆိုက်"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"စက္ကူ  ဆိုက်:"</string>
     <string name="label_color" msgid="1108690305218188969">"ရောင်စုံ"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"ဂျူးပလက်စ်"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"နှစ်ဖက်လှ"</string>
     <string name="label_orientation" msgid="2853142581990496477">"အနေအထား"</string>
     <string name="label_pages" msgid="7768589729282182230">"စာမျက်နှာများ"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"အားလုံး <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-nb/strings.xml b/packages/PrintSpooler/res/values-nb/strings.xml
index 390a3d7..7c74b39 100644
--- a/packages/PrintSpooler/res/values-nb/strings.xml
+++ b/packages/PrintSpooler/res/values-nb/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Papirstørrelse"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Papirstørrelse:"</string>
     <string name="label_color" msgid="1108690305218188969">"Farge"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Tosidig"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Retning"</string>
     <string name="label_pages" msgid="7768589729282182230">"Sider"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Alle <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ne-rNP/strings.xml b/packages/PrintSpooler/res/values-ne-rNP/strings.xml
index 7c4ecb0..42cd98b 100644
--- a/packages/PrintSpooler/res/values-ne-rNP/strings.xml
+++ b/packages/PrintSpooler/res/values-ne-rNP/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"कागजको आकार"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"कागजको आकार:"</string>
     <string name="label_color" msgid="1108690305218188969">"रङ्ग"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"डुप्लेक्स"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"दुई-पक्षीय"</string>
     <string name="label_orientation" msgid="2853142581990496477">"अभिमुखिकरण"</string>
     <string name="label_pages" msgid="7768589729282182230">"पृष्ठहरू"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"सबै <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-nl/strings.xml b/packages/PrintSpooler/res/values-nl/strings.xml
index 44ec72c..4855e31 100644
--- a/packages/PrintSpooler/res/values-nl/strings.xml
+++ b/packages/PrintSpooler/res/values-nl/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Papierformaat"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Papierformaat:"</string>
     <string name="label_color" msgid="1108690305218188969">"Kleur"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dubbelzijdig"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Stand"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pagina\'s"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Alle <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-oc-rFR/strings.xml b/packages/PrintSpooler/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-oc-rFR/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-or-rIN/strings.xml b/packages/PrintSpooler/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..52d0bc0
--- /dev/null
+++ b/packages/PrintSpooler/res/values-or-rIN/strings.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
+</resources>
diff --git a/packages/PrintSpooler/res/values-pa-rIN/strings.xml b/packages/PrintSpooler/res/values-pa-rIN/strings.xml
index e8296e8..912cf4a 100644
--- a/packages/PrintSpooler/res/values-pa-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-pa-rIN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"ਪੇਪਰ ਦਾ ਆਕਾਰ"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"ਪੇਪਰ ਦਾ ਆਕਾਰ:"</string>
     <string name="label_color" msgid="1108690305218188969">"ਰੰਗ"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"ਦੋ-ਪਾਸੇ ਦਾ"</string>
     <string name="label_orientation" msgid="2853142581990496477">"ਅਨੁਕੂਲਨ"</string>
     <string name="label_pages" msgid="7768589729282182230">"ਸਫ਼ੇ"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"ਸਾਰੇ <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-pl/strings.xml b/packages/PrintSpooler/res/values-pl/strings.xml
index 0365e1d..055fb5f 100644
--- a/packages/PrintSpooler/res/values-pl/strings.xml
+++ b/packages/PrintSpooler/res/values-pl/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Rozmiar papieru"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Rozmiar papieru:"</string>
     <string name="label_color" msgid="1108690305218188969">"Kolor"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dupleks"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dwustronny"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientacja"</string>
     <string name="label_pages" msgid="7768589729282182230">"Strony"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Wszystkie <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-pt-rBR/strings.xml b/packages/PrintSpooler/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..9e38506
--- /dev/null
+++ b/packages/PrintSpooler/res/values-pt-rBR/strings.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<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">"Sp. de impressão"</string>
+    <string name="more_options_button" msgid="2243228396432556771">"Mais opções"</string>
+    <string name="label_destination" msgid="9132510997381599275">"Destino"</string>
+    <string name="label_copies" msgid="3634531042822968308">"Cópias"</string>
+    <string name="label_copies_summary" msgid="3861966063536529540">"Cópias:"</string>
+    <string name="label_paper_size" msgid="908654383827777759">"Tamanho do papel"</string>
+    <string name="label_paper_size_summary" msgid="5668204981332138168">"Tamanho do papel:"</string>
+    <string name="label_color" msgid="1108690305218188969">"Cor"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dois lados"</string>
+    <string name="label_orientation" msgid="2853142581990496477">"Orientação"</string>
+    <string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
+    <string name="template_all_pages" msgid="3322235982020148762">"Todas as <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
+    <string name="template_page_range" msgid="428638530038286328">"Intervalo de <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
+    <string name="pages_range_example" msgid="8558694453556945172">"Ex.: 1–5, 8, 11–13"</string>
+    <string name="print_preview" msgid="8010217796057763343">"Visualização de impressão"</string>
+    <string name="install_for_print_preview" msgid="6366303997385509332">"Instalar o visualizador de PDF"</string>
+    <string name="printing_app_crashed" msgid="854477616686566398">"O app de impressão falhou"</string>
+    <string name="generating_print_job" msgid="3119608742651698916">"Gerando trabalho de impressão"</string>
+    <string name="save_as_pdf" msgid="5718454119847596853">"Salvar como PDF"</string>
+    <string name="all_printers" msgid="5018829726861876202">"Todas as impressoras…"</string>
+    <string name="print_dialog" msgid="32628687461331979">"Diálogo de impressão"</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>
+    <string name="page_description_template" msgid="6831239682256197161">"Página <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> de <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
+    <string name="summary_template" msgid="8899734908625669193">"Resumo, cópias <xliff:g id="COPIES">%1$s</xliff:g>, tamanho do papel <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
+    <string name="expand_handle" msgid="7282974448109280522">"Expandir alça"</string>
+    <string name="collapse_handle" msgid="6886637989442507451">"Recolher alça"</string>
+    <string name="print_button" msgid="645164566271246268">"Imprimir"</string>
+    <string name="savetopdf_button" msgid="2976186791686924743">"Salvar como PDF"</string>
+    <string name="print_options_expanded" msgid="6944679157471691859">"Opções de impressão expandidas"</string>
+    <string name="print_options_collapsed" msgid="7455930445670414332">"Opções de impressão recolhidas"</string>
+    <string name="search" msgid="5421724265322228497">"Pesquisar"</string>
+    <string name="all_printers_label" msgid="3178848870161526399">"Todas as impressoras"</string>
+    <string name="add_print_service_label" msgid="5356702546188981940">"Adicionar serviço"</string>
+    <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"Caixa de pesquisa exibida"</string>
+    <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"Caixa de pesquisa oculta"</string>
+    <string name="print_add_printer" msgid="1088656468360653455">"Adicionar impressora"</string>
+    <string name="print_select_printer" msgid="7388760939873368698">"Selecionar impressora"</string>
+    <string name="print_forget_printer" msgid="5035287497291910766">"Esquecer impressora"</string>
+    <plurals name="print_search_result_count_utterance" formatted="false" msgid="6997663738361080868">
+      <item quantity="one"><xliff:g id="COUNT_1">%1$s</xliff:g> impressoras encontradas</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%1$s</xliff:g> impressoras encontradas</item>
+    </plurals>
+    <string name="choose_print_service" msgid="3740309762324459694">"Selecione o serviço de impressão"</string>
+    <string name="print_searching_for_printers" msgid="6550424555079932867">"Procurando impressoras"</string>
+    <string name="print_no_printers" msgid="4869403323900054866">"Nenhuma impressora encontrada"</string>
+    <string name="printing_notification_title_template" msgid="295903957762447362">"Imprimindo <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelando <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="failed_notification_title_template" msgid="2256217208186530973">"Erro ao imprimir <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <string name="blocked_notification_title_template" msgid="1175435827331588646">"A impressora bloqueou <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+    <plurals name="composite_notification_title_template" formatted="false" msgid="6940956968211733780">
+      <item quantity="one">Tarefas de impressão <xliff:g id="PRINT_JOB_NAME_1">%1$d</xliff:g></item>
+      <item quantity="other">Tarefas de impressão <xliff:g id="PRINT_JOB_NAME_1">%1$d</xliff:g></item>
+    </plurals>
+    <string name="cancel" msgid="4373674107267141885">"Cancelar"</string>
+    <string name="restart" msgid="2472034227037808749">"Reiniciar"</string>
+    <string name="no_connection_to_printer" msgid="2159246915977282728">"Sem conexão com a impressora"</string>
+    <string name="reason_unknown" msgid="5507940196503246139">"desconhecido"</string>
+    <string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – não disponível"</string>
+  <string-array name="color_mode_labels">
+    <item msgid="7602948745415174937">"Preto e branco"</item>
+    <item msgid="2762241247228983754">"Cor"</item>
+  </string-array>
+  <string-array name="duplex_mode_labels">
+    <item msgid="3882302912790928315">"Nenhum"</item>
+    <item msgid="7296563835355641719">"Borda longa"</item>
+    <item msgid="79513688117503758">"Borda curta"</item>
+  </string-array>
+  <string-array name="orientation_labels">
+    <item msgid="4061931020926489228">"Retrato"</item>
+    <item msgid="3199660090246166812">"Paisagem"</item>
+  </string-array>
+    <string name="print_write_error_message" msgid="5787642615179572543">"Não foi possível gravar no arquivo"</string>
+    <string name="print_error_default_message" msgid="8602678405502922346">"Falhou. Tente novamente."</string>
+    <string name="print_error_retry" msgid="1426421728784259538">"Tentar novamente"</string>
+    <string name="print_error_printer_unavailable" msgid="8985614415253203381">"Esta impressora não está disponível no momento."</string>
+    <string name="print_preparing_preview" msgid="3939930735671364712">"Preparando visualização…"</string>
+</resources>
diff --git a/packages/PrintSpooler/res/values-pt-rPT/strings.xml b/packages/PrintSpooler/res/values-pt-rPT/strings.xml
index 9f6ccdb..73fabab 100644
--- a/packages/PrintSpooler/res/values-pt-rPT/strings.xml
+++ b/packages/PrintSpooler/res/values-pt-rPT/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Tamanho do papel"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Tamanho do papel:"</string>
     <string name="label_color" msgid="1108690305218188969">"Cor"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Frente e verso"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dois lados"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientação"</string>
     <string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Todas as <xliff:g id="PAGE_COUNT">%1$s</xliff:g> páginas"</string>
diff --git a/packages/PrintSpooler/res/values-pt/strings.xml b/packages/PrintSpooler/res/values-pt/strings.xml
index 31a24ea..9e38506 100644
--- a/packages/PrintSpooler/res/values-pt/strings.xml
+++ b/packages/PrintSpooler/res/values-pt/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Tamanho do papel"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Tamanho do papel:"</string>
     <string name="label_color" msgid="1108690305218188969">"Cor"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dois lados"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientação"</string>
     <string name="label_pages" msgid="7768589729282182230">"Páginas"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Todas as <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ro/strings.xml b/packages/PrintSpooler/res/values-ro/strings.xml
index efcfc75..3ff1045 100644
--- a/packages/PrintSpooler/res/values-ro/strings.xml
+++ b/packages/PrintSpooler/res/values-ro/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Formatul hârtiei"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Formatul hârtiei:"</string>
     <string name="label_color" msgid="1108690305218188969">"Color"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Față-verso"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientare"</string>
     <string name="label_pages" msgid="7768589729282182230">"Pagini"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Toate cele <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ru/strings.xml b/packages/PrintSpooler/res/values-ru/strings.xml
index 4c8dfdc..a4e12fe 100644
--- a/packages/PrintSpooler/res/values-ru/strings.xml
+++ b/packages/PrintSpooler/res/values-ru/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Размер бумаги"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Размер бумаги:"</string>
     <string name="label_color" msgid="1108690305218188969">"Печать"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Двусторонняя печать"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Двусторонний"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Ориентация"</string>
     <string name="label_pages" msgid="7768589729282182230">"Страницы"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Все <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-si-rLK/strings.xml b/packages/PrintSpooler/res/values-si-rLK/strings.xml
index 855dcd1..e8052d6 100644
--- a/packages/PrintSpooler/res/values-si-rLK/strings.xml
+++ b/packages/PrintSpooler/res/values-si-rLK/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"කඩදාසියේ ප්‍රමාණය"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"කඩදාසියේ ප්‍රමාණය:"</string>
     <string name="label_color" msgid="1108690305218188969">"වර්ණය"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"ඩුප්ලෙක්ස්"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"පැති-දෙකක"</string>
     <string name="label_orientation" msgid="2853142581990496477">"දිශානතිය"</string>
     <string name="label_pages" msgid="7768589729282182230">"පිටු"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"සියලුම <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sk/strings.xml b/packages/PrintSpooler/res/values-sk/strings.xml
index a5ff4a9..3e82076 100644
--- a/packages/PrintSpooler/res/values-sk/strings.xml
+++ b/packages/PrintSpooler/res/values-sk/strings.xml
@@ -20,11 +20,11 @@
     <string name="more_options_button" msgid="2243228396432556771">"Ďalšie možnosti"</string>
     <string name="label_destination" msgid="9132510997381599275">"Cieľ"</string>
     <string name="label_copies" msgid="3634531042822968308">"Kópie"</string>
-    <string name="label_copies_summary" msgid="3861966063536529540">"Počet kópií:"</string>
+    <string name="label_copies_summary" msgid="3861966063536529540">"Kópie:"</string>
     <string name="label_paper_size" msgid="908654383827777759">"Veľkosť papiera"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Veľkosť papiera:"</string>
     <string name="label_color" msgid="1108690305218188969">"Farba"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Obojstranné"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientácia"</string>
     <string name="label_pages" msgid="7768589729282182230">"Strany"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Všetky: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
@@ -46,7 +46,7 @@
     <string name="savetopdf_button" msgid="2976186791686924743">"Uložiť do súboru PDF"</string>
     <string name="print_options_expanded" msgid="6944679157471691859">"Možnosti tlače sú rozbalené"</string>
     <string name="print_options_collapsed" msgid="7455930445670414332">"Možnosti tlače sú zbalené"</string>
-    <string name="search" msgid="5421724265322228497">"VYHĽADÁVANIE"</string>
+    <string name="search" msgid="5421724265322228497">"Hľadať"</string>
     <string name="all_printers_label" msgid="3178848870161526399">"Všetky tlačiarne"</string>
     <string name="add_print_service_label" msgid="5356702546188981940">"Pridať službu"</string>
     <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"Vyhľadávacie pole sa zobrazuje"</string>
diff --git a/packages/PrintSpooler/res/values-sl/strings.xml b/packages/PrintSpooler/res/values-sl/strings.xml
index e6d7358..75c2abe 100644
--- a/packages/PrintSpooler/res/values-sl/strings.xml
+++ b/packages/PrintSpooler/res/values-sl/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Velikost papirja"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Velikost papirja:"</string>
     <string name="label_color" msgid="1108690305218188969">"Barvno"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Obojestransko"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dvostransko"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Postavitev"</string>
     <string name="label_pages" msgid="7768589729282182230">"Strani"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Vse (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
diff --git a/packages/PrintSpooler/res/values-sq-rAL/strings.xml b/packages/PrintSpooler/res/values-sq-rAL/strings.xml
index 0fbde0e..adbf700 100644
--- a/packages/PrintSpooler/res/values-sq-rAL/strings.xml
+++ b/packages/PrintSpooler/res/values-sq-rAL/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Madhësia e letrës"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Madhësia e letrës:"</string>
     <string name="label_color" msgid="1108690305218188969">"Ngjyra"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Në dy anë"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Në dy anë"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientimi"</string>
     <string name="label_pages" msgid="7768589729282182230">"Faqe"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Të <xliff:g id="PAGE_COUNT">%1$s</xliff:g> faqet"</string>
diff --git a/packages/PrintSpooler/res/values-sr/strings.xml b/packages/PrintSpooler/res/values-sr/strings.xml
index 677d5e1..58e9622 100644
--- a/packages/PrintSpooler/res/values-sr/strings.xml
+++ b/packages/PrintSpooler/res/values-sr/strings.xml
@@ -20,11 +20,11 @@
     <string name="more_options_button" msgid="2243228396432556771">"Још опција"</string>
     <string name="label_destination" msgid="9132510997381599275">"Одредиште"</string>
     <string name="label_copies" msgid="3634531042822968308">"Копије"</string>
-    <string name="label_copies_summary" msgid="3861966063536529540">"Копије:"</string>
+    <string name="label_copies_summary" msgid="3861966063536529540">"Копија:"</string>
     <string name="label_paper_size" msgid="908654383827777759">"Величина папира"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Величина папира:"</string>
     <string name="label_color" msgid="1108690305218188969">"Боја"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Обострани режим"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Двострано"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Положај"</string>
     <string name="label_pages" msgid="7768589729282182230">"Странице"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Све странице (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
diff --git a/packages/PrintSpooler/res/values-sv/strings.xml b/packages/PrintSpooler/res/values-sv/strings.xml
index cda72e2..0434903 100644
--- a/packages/PrintSpooler/res/values-sv/strings.xml
+++ b/packages/PrintSpooler/res/values-sv/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Pappersstorlek"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Pappersstorlek:"</string>
     <string name="label_color" msgid="1108690305218188969">"Färg"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dubbelsidigt"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Dubbelsidig"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Orientering"</string>
     <string name="label_pages" msgid="7768589729282182230">"Sidor"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Alla <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sw/strings.xml b/packages/PrintSpooler/res/values-sw/strings.xml
index d784ab6..7c08316 100644
--- a/packages/PrintSpooler/res/values-sw/strings.xml
+++ b/packages/PrintSpooler/res/values-sw/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Ukubwa wa karatasi"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Ukubwa wa karatasi:"</string>
     <string name="label_color" msgid="1108690305218188969">"Rangi"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Maradufu"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Yenye pande mbili"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Mkao"</string>
     <string name="label_pages" msgid="7768589729282182230">"Kurasa"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Kurasa zote <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ta-rIN/strings.xml b/packages/PrintSpooler/res/values-ta-rIN/strings.xml
index 6f29851..4c9f135 100644
--- a/packages/PrintSpooler/res/values-ta-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-ta-rIN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"காகித அளவு"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"காகித அளவு:"</string>
     <string name="label_color" msgid="1108690305218188969">"வண்ணம்"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"டியூப்ளெக்ஸ்"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"இரு பக்க முறை"</string>
     <string name="label_orientation" msgid="2853142581990496477">"திசையமைப்பு"</string>
     <string name="label_pages" msgid="7768589729282182230">"பக்கங்கள்"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"எல்லாம்: <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-te-rIN/strings.xml b/packages/PrintSpooler/res/values-te-rIN/strings.xml
index 88c83da..ffa994b 100644
--- a/packages/PrintSpooler/res/values-te-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-te-rIN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"కాగితపు పరిమాణం"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"కాగితపు పరిమాణం:"</string>
     <string name="label_color" msgid="1108690305218188969">"రంగు"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"డూప్లెక్స్"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"రెండు వైపుల"</string>
     <string name="label_orientation" msgid="2853142581990496477">"దృగ్విన్యాసం"</string>
     <string name="label_pages" msgid="7768589729282182230">"పేజీలు"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"మొత్తం <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-th/strings.xml b/packages/PrintSpooler/res/values-th/strings.xml
index 7731a7d..89e3082 100644
--- a/packages/PrintSpooler/res/values-th/strings.xml
+++ b/packages/PrintSpooler/res/values-th/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"ขนาดของกระดาษ"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"ขนาดของกระดาษ:"</string>
     <string name="label_color" msgid="1108690305218188969">"สี"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"ดูเพล็กซ์"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"2 ด้าน"</string>
     <string name="label_orientation" msgid="2853142581990496477">"การวางแนว"</string>
     <string name="label_pages" msgid="7768589729282182230">"หน้า"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"ทั้ง <xliff:g id="PAGE_COUNT">%1$s</xliff:g> หน้า"</string>
diff --git a/packages/PrintSpooler/res/values-tl/strings.xml b/packages/PrintSpooler/res/values-tl/strings.xml
index b4bda0c..445d8b0 100644
--- a/packages/PrintSpooler/res/values-tl/strings.xml
+++ b/packages/PrintSpooler/res/values-tl/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Laki ng papel"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Laki ng papel:"</string>
     <string name="label_color" msgid="1108690305218188969">"Kulay"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Oryentasyon"</string>
     <string name="label_pages" msgid="7768589729282182230">"Mga Page"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Lahat ng <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-tr/strings.xml b/packages/PrintSpooler/res/values-tr/strings.xml
index 9fa7d8e..66d1e99 100644
--- a/packages/PrintSpooler/res/values-tr/strings.xml
+++ b/packages/PrintSpooler/res/values-tr/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Kağıt boyutu"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Kağıt boyutu:"</string>
     <string name="label_color" msgid="1108690305218188969">"Renkli"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Dubleks"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Çift taraflı"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Sayfa yönü"</string>
     <string name="label_pages" msgid="7768589729282182230">"Sayfa"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"<xliff:g id="PAGE_COUNT">%1$s</xliff:g> sayfanın tamamı"</string>
diff --git a/packages/PrintSpooler/res/values-ug/strings.xml b/packages/PrintSpooler/res/values-ug/strings.xml
index 0097d00..05c60a6 100644
--- a/packages/PrintSpooler/res/values-ug/strings.xml
+++ b/packages/PrintSpooler/res/values-ug/strings.xml
@@ -15,46 +15,125 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Title of the PrintSpooler application. [CHAR LIMIT=50] -->
   <string name="app_label">بېسىشنى بىر تەرەپ قىلىش مۇلازىمىتى</string>
+  <!-- Label of the print dialog's button for more print options. [CHAR LIMIT=25] -->
+  <!-- Label of the destination widget. [CHAR LIMIT=20] -->
   <string name="label_destination">نىشان</string>
+  <!-- Label of the copies count widget. [CHAR LIMIT=20] -->
   <string name="label_copies">نۇسخا</string>
+  <!-- Label of the copies count for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size widget. [CHAR LIMIT=20] -->
+  <!-- Label of the paper size for the print options summary. [CHAR LIMIT=20] -->
+  <!-- Label of the color mode widget. [CHAR LIMIT=20] -->
   <string name="label_color">رەڭ</string>
+  <!-- Label of the printer mode to print on both sides of paper. [CHAR LIMIT=20] -->
+  <!-- Label of the orientation widget. [CHAR LIMIT=20] -->
   <string name="label_orientation">يۆنىلىش</string>
+  <!-- Label of the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the all pages option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Template for the page range option in the page selection widget. [CHAR LIMIT=20] -->
+  <!-- Page range exmple used as a hint of how to specify such. [CHAR LIMIT=20] -->
   <string name="pages_range_example">مەسىلەن: 1–5,8,11–13</string>
+  <!-- Title for the pring preview button .[CHAR LIMIT=30] -->
   <string name="print_preview">بېسىشنى ئالدىن كۆزەت</string>
+  <!-- Title for the pring preview button if there is no PDF viewer isntalled. [CHAR LIMIT=50] -->
   <string name="install_for_print_preview">ئالدىن كۆزىتىش ئۈچۈن PDF كۆرگۈچ ئورنىتىدۇ</string>
+  <!-- Title of the message that the printing application crashed. [CHAR LIMIT=50] -->
   <string name="printing_app_crashed">باسىدىغان ئەپ يىمىرىلدى</string>
+  <!-- Title for the temporary dialog show while an app is generating a print job. [CHAR LIMIT=30] -->
   <string name="generating_print_job">بېسىش ۋەزىپىسى قۇرۇۋاتىدۇ</string>
+  <!-- Title for the save as PDF option in the printer list. [CHAR LIMIT=30] -->
   <string name="save_as_pdf">PDF سۈپىتىدە ساقلا</string>
+  <!-- Title for the open all printers UI option in the printer list. [CHAR LIMIT=30] -->
   <string name="all_printers">بارلىق پرىنتېرلار&#8230;</string>
+  <!-- Title for the print dialog announced to the user for accessibility. Not shown in the UI. [CHAR LIMIT=none] -->
   <string name="print_dialog">بېسىش سۆزلەشكۈ</string>
+  <!-- Template for the message that shows the current page out of the total number of pages [CHAR LIMIT=none] -->
+  <!-- Description of the current page - spoken to the user [CHAR LIMIT=none] -->
+  <!-- Template for the message to announce the print options summary - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to expand all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the handle to collapse all print options - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Description for the print button - spoken to the user. [CHAR LIMIT=none] -->
   <string name="print_button">باس</string>
+  <!-- Description for the save to PDF button - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are expanded - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Message to announce print options are collapsed - spoken to the user. [CHAR LIMIT=none] -->
+  <!-- Select printer activity -->
+  <!-- Title for the share action bar menu item. [CHAR LIMIT=20] -->
   <string name="search">ئىزدە</string>
+  <!-- Title for the select printer activity. [CHAR LIMIT=30] -->
   <string name="all_printers_label">بارلىق پرىنتېرلار</string>
+  <!-- Title of the button to install a print service. [CHAR LIMIT=25] -->
   <string name="add_print_service_label">مۇلازىمەت قوش</string>
+  <!-- Utterance to announce that the search box is shown. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_shown_utterance">ئىزدەش قۇتىسى كۆرۈندى</string>
+  <!-- Utterance to announce that the search box is hidden. This is spoken to a blind user. [CHAR LIMIT=none] -->
   <string name="print_search_box_hidden_utterance">ئىزدەش قۇتىسى يوشۇرۇلدى</string>
+  <!-- Title of the action bar button to got to add a printer. [CHAR LIMIT=25] -->
   <string name="print_add_printer">پرىنتېر قوش</string>
+  <!-- Title of the menu item to select a printer. [CHAR LIMIT=25] -->
   <string name="print_select_printer">پىرىنتېرنى تاللاڭ</string>
+  <!-- Title of the menu item to forget a printer. [CHAR LIMIT=25] -->
   <string name="print_forget_printer">پىرىنتېرنى ئەستە تۇتما</string>
+  <!-- Utterance to announce a change in the number of matches during a search. This is spoken to a blind user. [CHAR LIMIT=none] -->
+  <!-- Add printer dialog  -->
+  <!-- Title for the alert dialog for selecting a print service. [CHAR LIMIT=50] -->
   <string name="choose_print_service">بېسىش مۇلازىمىتىنى تاللاڭ</string>
+  <!-- Title for the prompt shown as a placeholder if no printers are found while not searching. [CHAR LIMIT=50] -->
   <string name="print_searching_for_printers">پرىنتېرلارنى ئىزدەۋاتىدۇ</string>
+  <!-- Title for the prompt shown as a placeholder if there are no printers while searching. [CHAR LIMIT=50] -->
   <string name="print_no_printers">پرىنتېر تېپىلمىدى</string>
+  <!-- Notifications -->
+  <!-- Template for the notification label for a printing print job. [CHAR LIMIT=25] -->
   <string name="printing_notification_title_template">بېسىۋاتقىنى <xliff:g id="PRINT_JOB_NAME">%s</xliff:g></string>
+  <!-- Template for the notification label for a cancelling print job. [CHAR LIMIT=25] -->
   <string name="cancelling_notification_title_template">بىكار قىلىۋاتقىنى <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g></string>
+  <!-- Template for the notification label for a failed print job. [CHAR LIMIT=25] -->
   <string name="failed_notification_title_template">پىرىنتېر <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> نى بېسىۋاتقاندا خاتالىق كۆرۈلدى</string>
+  <!-- Template for the notification label for a blocked print job. [CHAR LIMIT=25] -->
   <string name="blocked_notification_title_template">پىرىنتېر <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> نى بېسىشنى توستى</string>
+  <!-- Template for the notification label for a composite (multiple items) print jobs notification. [CHAR LIMIT=25] -->
+  <!-- Label for the notification button for cancelling a print job. [CHAR LIMIT=25] -->
   <string name="cancel">ۋاز كەچ</string>
+  <!-- Label for the notification button for restarting a filed print job. [CHAR LIMIT=25] -->
   <string name="restart">قايتا قوزغات</string>
+  <!-- Message that there is no connection to a printer. [CHAR LIMIT=40] -->
   <string name="no_connection_to_printer">پرىنتېر بىلەن باغلانمىدى</string>
+  <!-- Label for an unknown reason for failed or blocked print job. [CHAR LIMIT=25] -->
   <string name="reason_unknown">يوچۇن</string>
+  <!-- Label for a printer that is not available. [CHAR LIMIT=25] -->
   <string name="printer_unavailable"><xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – ئىشلەتكىلى بولمايدۇ</string>
+  <!-- Arrays -->
+  <!-- Color mode labels. -->
   <string-array name="color_mode_labels">
+    <!-- Color mode label: Monochrome color scheme, e.g. one color is used. [CHAR LIMIT=20] -->
     <item>ئاق&amp;قارا</item>
+    <!-- Color mode label: Color color scheme, e.g. many colors are used. [CHAR LIMIT=20] -->
     <item>رەڭ</item>
   </string-array>
+  <!-- Duplex mode labels. -->
+  <!-- Orientation labels. -->
   <string-array name="orientation_labels">
+    <!-- Orientation label: Portrait page orientation. [CHAR LIMIT=30] -->
     <item>بويىغا</item>
+    <!-- Orientation label: Landscape page orientation [CHAR LIMIT=30] -->
     <item>توغرىسىغا</item>
   </string-array>
+  <!-- Permissions -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether
+         they want to allow the application to do this. -->
+  <!-- Title of an application permission, listed so the user can choose whether they want
+         to allow the application to do this. -->
+  <!-- Description of an application permission, listed so the user can choose whether they
+         want to allow the application to do this. -->
+  <!-- Error messages -->
+  <!-- Message for an error when trying to print to a PDF file. [CHAR LIMIT=50] -->
+  <!-- Default message for an error while generating a print job. [CHAR LIMIT=50] -->
+  <!-- Label for the retry button in the error message. [CHAR LIMIT=50] -->
+  <!-- Message for the currently selected printer being unavailable. [CHAR LIMIT=100] -->
+  <!-- Long running operations -->
+  <!-- Message long running operation when preparing print preview. [CHAR LIMIT=50] -->
 </resources>
diff --git a/packages/PrintSpooler/res/values-uk/strings.xml b/packages/PrintSpooler/res/values-uk/strings.xml
index 0b283b9..fcd3fa6 100644
--- a/packages/PrintSpooler/res/values-uk/strings.xml
+++ b/packages/PrintSpooler/res/values-uk/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Розмір паперу"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Розмір паперу:"</string>
     <string name="label_color" msgid="1108690305218188969">"Колір"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Двосторонній друк"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Двосторонній друк"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Орієнтація"</string>
     <string name="label_pages" msgid="7768589729282182230">"Сторінки"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Усі <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-ur-rPK/strings.xml b/packages/PrintSpooler/res/values-ur-rPK/strings.xml
index 2b138c1..2c2c460 100644
--- a/packages/PrintSpooler/res/values-ur-rPK/strings.xml
+++ b/packages/PrintSpooler/res/values-ur-rPK/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"کاغذ کا سائز"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"کاغذ کا سائز:"</string>
     <string name="label_color" msgid="1108690305218188969">"رنگ"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"ڈوپلیکس"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"دو طرف"</string>
     <string name="label_orientation" msgid="2853142581990496477">"سمت بندی"</string>
     <string name="label_pages" msgid="7768589729282182230">"صفحات"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"سبھی <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-uz-rUZ/strings.xml b/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
index 26b5c9f..f88eca5 100644
--- a/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
+++ b/packages/PrintSpooler/res/values-uz-rUZ/strings.xml
@@ -17,14 +17,14 @@
 <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">"Chop qilishni nazorat qilish"</string>
-    <string name="more_options_button" msgid="2243228396432556771">"Yana"</string>
+    <string name="more_options_button" msgid="2243228396432556771">"Ko‘proq"</string>
     <string name="label_destination" msgid="9132510997381599275">"Mo‘ljal"</string>
     <string name="label_copies" msgid="3634531042822968308">"Nusxalar"</string>
     <string name="label_copies_summary" msgid="3861966063536529540">"Nusxalari soni:"</string>
     <string name="label_paper_size" msgid="908654383827777759">"Qog‘oz o‘lchami"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Qog‘oz o‘lchami:"</string>
     <string name="label_color" msgid="1108690305218188969">"Rang"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Ikki tomonlama"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Ikki tomonlama"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Joylashuv"</string>
     <string name="label_pages" msgid="7768589729282182230">"Sahifalar"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Barchasi (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
@@ -34,8 +34,8 @@
     <string name="install_for_print_preview" msgid="6366303997385509332">"PDF ko‘rsatuvchi dasturni o‘rnatish"</string>
     <string name="printing_app_crashed" msgid="854477616686566398">"Chop etish dasturi buzildi"</string>
     <string name="generating_print_job" msgid="3119608742651698916">"Chop etish buyrug‘i yaratilyapti"</string>
-    <string name="save_as_pdf" msgid="5718454119847596853">"PDF formatda saqlash"</string>
-    <string name="all_printers" msgid="5018829726861876202">"Barcha printerlar…"</string>
+    <string name="save_as_pdf" msgid="5718454119847596853">"PDF formatida saqlash"</string>
+    <string name="all_printers" msgid="5018829726861876202">"Barcha printerlar"</string>
     <string name="print_dialog" msgid="32628687461331979">"Chop etish oynasi"</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>
     <string name="page_description_template" msgid="6831239682256197161">"Sahifa: <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
@@ -46,7 +46,7 @@
     <string name="savetopdf_button" msgid="2976186791686924743">"PDF sifatida saqlash"</string>
     <string name="print_options_expanded" msgid="6944679157471691859">"Chop qilish tanlamalari yoyildi"</string>
     <string name="print_options_collapsed" msgid="7455930445670414332">"Chop qilish tanlamalari yig‘ildi"</string>
-    <string name="search" msgid="5421724265322228497">"Izlash"</string>
+    <string name="search" msgid="5421724265322228497">"Qidirish"</string>
     <string name="all_printers_label" msgid="3178848870161526399">"Barcha printerlar"</string>
     <string name="add_print_service_label" msgid="5356702546188981940">"Xizmat qo‘shish"</string>
     <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"Izlash oynasi ko‘rsatildi"</string>
@@ -59,9 +59,9 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$s</xliff:g> ta printer topildi</item>
     </plurals>
     <string name="choose_print_service" msgid="3740309762324459694">"Chop etish xizmatini tanlang"</string>
-    <string name="print_searching_for_printers" msgid="6550424555079932867">"Printerlarni izlash"</string>
+    <string name="print_searching_for_printers" msgid="6550424555079932867">"Printerlar qidirilmoqda"</string>
     <string name="print_no_printers" msgid="4869403323900054866">"Printerlar topilmadi"</string>
-    <string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> chop etilmoqda"</string>
+    <string name="printing_notification_title_template" msgid="295903957762447362">"Chop etilmoqda: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> bekor qilinmoqda"</string>
     <string name="failed_notification_title_template" msgid="2256217208186530973">"Printerda xatolik: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="blocked_notification_title_template" msgid="1175435827331588646">"Printer <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ni taqiqladi"</string>
@@ -79,7 +79,7 @@
     <item msgid="2762241247228983754">"Rang"</item>
   </string-array>
   <string-array name="duplex_mode_labels">
-    <item msgid="3882302912790928315">"Hech biri"</item>
+    <item msgid="3882302912790928315">"Yo‘q"</item>
     <item msgid="7296563835355641719">"Uzun tomoni"</item>
     <item msgid="79513688117503758">"Qisqa tomoni"</item>
   </string-array>
diff --git a/packages/PrintSpooler/res/values-vi/strings.xml b/packages/PrintSpooler/res/values-vi/strings.xml
index d6ef07c..2d1e8fa 100644
--- a/packages/PrintSpooler/res/values-vi/strings.xml
+++ b/packages/PrintSpooler/res/values-vi/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Khổ giấy"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Khổ giấy:"</string>
     <string name="label_color" msgid="1108690305218188969">"Màu"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Hai mặt"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Hai mặt"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Hướng"</string>
     <string name="label_pages" msgid="7768589729282182230">"Trang"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Tất cả <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rCN/strings.xml b/packages/PrintSpooler/res/values-zh-rCN/strings.xml
index b6ab6b5..553bc89 100644
--- a/packages/PrintSpooler/res/values-zh-rCN/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rCN/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"纸张尺寸"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"纸张尺寸："</string>
     <string name="label_color" msgid="1108690305218188969">"颜色"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"双面模式"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"双面"</string>
     <string name="label_orientation" msgid="2853142581990496477">"方向"</string>
     <string name="label_pages" msgid="7768589729282182230">"页数"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"全部<xliff:g id="PAGE_COUNT">%1$s</xliff:g>页"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rHK/strings.xml b/packages/PrintSpooler/res/values-zh-rHK/strings.xml
index 8f8bf13..74b301f 100644
--- a/packages/PrintSpooler/res/values-zh-rHK/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rHK/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"紙張大小"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"紙張大小："</string>
     <string name="label_color" msgid="1108690305218188969">"顏色"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"雙面列印"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"雙面"</string>
     <string name="label_orientation" msgid="2853142581990496477">"方向"</string>
     <string name="label_pages" msgid="7768589729282182230">"頁數"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"全部 <xliff:g id="PAGE_COUNT">%1$s</xliff:g> 頁"</string>
diff --git a/packages/PrintSpooler/res/values-zh-rTW/strings.xml b/packages/PrintSpooler/res/values-zh-rTW/strings.xml
index 7872d24..d91fe52 100644
--- a/packages/PrintSpooler/res/values-zh-rTW/strings.xml
+++ b/packages/PrintSpooler/res/values-zh-rTW/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"紙張大小"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"紙張大小："</string>
     <string name="label_color" msgid="1108690305218188969">"色彩"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"雙面"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"雙面"</string>
     <string name="label_orientation" msgid="2853142581990496477">"方向"</string>
     <string name="label_pages" msgid="7768589729282182230">"頁面"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"全部 <xliff:g id="PAGE_COUNT">%1$s</xliff:g> 頁"</string>
diff --git a/packages/PrintSpooler/res/values-zu/strings.xml b/packages/PrintSpooler/res/values-zu/strings.xml
index ddb953b..6ef2499 100644
--- a/packages/PrintSpooler/res/values-zu/strings.xml
+++ b/packages/PrintSpooler/res/values-zu/strings.xml
@@ -24,7 +24,7 @@
     <string name="label_paper_size" msgid="908654383827777759">"Usayizi wekhasi"</string>
     <string name="label_paper_size_summary" msgid="5668204981332138168">"Usayizi wekhasi"</string>
     <string name="label_color" msgid="1108690305218188969">"Umbala"</string>
-    <string name="label_duplex" msgid="1263181386446435253">"Duplex"</string>
+    <string name="label_duplex" msgid="5370037254347072243">"Inezinhlangothi ezimbili"</string>
     <string name="label_orientation" msgid="2853142581990496477">"Umumo"</string>
     <string name="label_pages" msgid="7768589729282182230">"Amakhasi"</string>
     <string name="template_all_pages" msgid="3322235982020148762">"Konke <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
index 1fb84b4..8f680d7 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java
@@ -671,9 +671,11 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat
             }
         }
 
-        PrinterId printerId = mCurrentPrinter.getId();
-        final int index = mDestinationSpinnerAdapter.getPrinterIndex(printerId);
-        mDestinationSpinner.setSelection(index);
+        if (mCurrentPrinter != null) {
+            PrinterId printerId = mCurrentPrinter.getId();
+            final int index = mDestinationSpinnerAdapter.getPrinterIndex(printerId);
+            mDestinationSpinner.setSelection(index);
+        }
     }
 
     private void startAdvancedPrintOptionsActivity(PrinterInfo printer) {
diff --git a/packages/SettingsLib/res/values-af/arrays.xml b/packages/SettingsLib/res/values-af/arrays.xml
new file mode 100644
index 0000000..6693997
--- /dev/null
+++ b/packages/SettingsLib/res/values-af/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Skandeer tans…"</item>
+    <item msgid="8513729475867537913">"Koppel tans…"</item>
+    <item msgid="515055375277271756">"Staaf tans…"</item>
+    <item msgid="1943354004029184381">"Bekom tans IP-adres…"</item>
+    <item msgid="4221763391123233270">"Gekoppel"</item>
+    <item msgid="624838831631122137">"Opgeskort"</item>
+    <item msgid="7979680559596111948">"Ontkoppel tans…"</item>
+    <item msgid="1634960474403853625">"Ontkoppel"</item>
+    <item msgid="746097431216080650">"Onsuksesvol"</item>
+    <item msgid="6367044185730295334">"Geblokkeer"</item>
+    <item msgid="503942654197908005">"Vermy tydelik swak verbinding"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Skandeer tans…"</item>
+    <item msgid="355508996603873860">"Koppel tans aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Staaf tans met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Verkry tans IP-adres van <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Gekoppel aan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Opgeskort"</item>
+    <item msgid="7698638434317271902">"Ontkoppel tans van <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Ontkoppel"</item>
+    <item msgid="8578370891960825148">"Onsuksesvol"</item>
+    <item msgid="5660739516542454527">"Geblokkeer"</item>
+    <item msgid="1805837518286731242">"Vermy tydelik swak verbinding"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml
new file mode 100644
index 0000000..a4cbcd2
--- /dev/null
+++ b/packages/SettingsLib/res/values-af/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan nie skandeer vir netwerke nie"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gestoor"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Gedeaktiveer"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-opstelling het misluk"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-verbinding het misluk"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Stawingsprobleem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nie binne ontvangs nie"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Geen internettoegang bespeur nie, sal nie outomaties herkoppel nie."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Gestoor deur <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Gekoppel via Wi-Fi-assistent"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Gekoppel via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Beskikbaar via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Gekoppel, geen internet nie"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ontkoppel"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ontkoppel tans…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbind tans…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Gekoppel"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Verbind tans…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Gekoppel (geen foon nie)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Gekoppel (geen media nie)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Gekoppel (geen boodskaptoegang nie)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Gekoppel (geen foon of media nie)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-oudio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Foonoudio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Lêeroordrag"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Invoertoestel"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internettoegang"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontakdeling"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gebruik vir kontakdeling"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling van internetverbinding"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Boodskaptoegang"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-toegang"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Gekoppel aan media-oudio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Gekoppel aan foonoudio"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Gekoppel aan lêeroordragbediener"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Gekoppel aan kaart"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Aan SAP gekoppel"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nie gekoppel aan lêeroordragbediener nie"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Gekoppel aan invoertoestel"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Aan toestel gekoppel vir internettoegang"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Deel plaaslike internetverbinding met toestel"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gebruik vir internettoegang"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gebruik vir kaart"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Gebruik vir SIM-toegang"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gebruik vir media-oudio"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gebruik vir foonoudio"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruik vir lêeroordrag"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gebruik vir invoer"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Bind saam"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"BIND SAAM"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Kanselleer"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Saambinding bied toegang tot jou kontakte en oproepgeskiedenis wanneer dit gekoppel is."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Kon nie saambind met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nie."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kon nie met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> saambind nie weens \'n verkeerde PIN of wagwoordsleutel."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan nie met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kommunikeer nie."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Saambinding verwerp deur <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi af."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi is ontkoppel."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi een staaf."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi twee stawe."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi drie stawe."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi-sein vol."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-am/arrays.xml b/packages/SettingsLib/res/values-am/arrays.xml
new file mode 100644
index 0000000..46790d6
--- /dev/null
+++ b/packages/SettingsLib/res/values-am/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"በመቃኘት ላይ....."</item>
+    <item msgid="8513729475867537913">"በማገናኘት ላይ…"</item>
+    <item msgid="515055375277271756">"በማረጋገጥ ላይ...."</item>
+    <item msgid="1943354004029184381">"የIP አድራሻ በማግኘት ላይ..."</item>
+    <item msgid="4221763391123233270">"ተገናኝቷል"</item>
+    <item msgid="624838831631122137">"ታግዷል"</item>
+    <item msgid="7979680559596111948">"በማለያየት ላይ...."</item>
+    <item msgid="1634960474403853625">"ተለያየ"</item>
+    <item msgid="746097431216080650">"አልተሳካም"</item>
+    <item msgid="6367044185730295334">"ታግዷል"</item>
+    <item msgid="503942654197908005">"ለጊዜያዊነት ከደካማ ግኑኝነት በመታቀብ ላይ"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">" ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> የIP አድራሻ በማግኘት ላይ..."</item>
+    <item msgid="8937994881315223448">"ለ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> የተገናኘ"</item>
+    <item msgid="1330262655415760617">"ታግዷል"</item>
+    <item msgid="7698638434317271902">"ከ<xliff:g id="NETWORK_NAME">%1$s</xliff:g> በማለያየት ላይ...."</item>
+    <item msgid="197508606402264311">"ተለያየ"</item>
+    <item msgid="8578370891960825148">"አልተሳካም"</item>
+    <item msgid="5660739516542454527">"ታግዷል"</item>
+    <item msgid="1805837518286731242">"ለጊዜያዊነት ከደካማ ግኑኝነት በመታቀብ ላይ"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml
new file mode 100644
index 0000000..67ab51d
--- /dev/null
+++ b/packages/SettingsLib/res/values-am/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ለአውታረመረቦች መቃኘት አይቻልም"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"የለም"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"ተቀምጧል"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ተሰነክሏል"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"የአይ.ፒ. ውቅረት መሰናከል"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"የWiFi ግንኙነት መሰናከል"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"የማረጋገጫ ችግር"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"በክልል ውስጥ የለም"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ምንም የበይነ መረብ መዳረሻ ተፈልጎ አልተገኘም፣ በራስ-ሰር እንደገና እንዲገናኝ አይደረግም።"</string>
+    <string name="saved_network" msgid="4352716707126620811">"የተቀመጠው በ<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"በWi‑Fi ረዳት አማካኝነት ተገናኝቷል"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"በ%1$s በኩል መገናኘት"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"በ%1$s በኩል የሚገኝ"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"ተገናኝቷል፣ ምንም በይነመረብ የለም"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ተለያይቷል"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"በመለያየት ላይ..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"በማገናኘት ላይ…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"ተገናኝቷል"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"በማገናኘት ላይ..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ተያይዟል (ምንም ስልክ የለም)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ተያይዟል (ምንም ማህደረ መረጃ የለም)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ተገናኝቷል (ምንም የመልዕክት መዳረሻ የለም)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ተያይዟል (ምንም ስልክ ወይም ማህደረ መረጃ የለም)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"የማህደረ መረጃ ኦዲዮ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"የስልክ ኦዲዮ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ፋይል ማስተላለፍ"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ግቤት መሣሪያ"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"የበይነመረብ ድረስ"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"እውቂያ ማጋራት"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"እውቂያን ለማጋራት ተጠቀም"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"የበይነ መረብ ተያያዥ ማጋሪያ"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"የመልዕክት መዳረሻ"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"የሲም መዳረሻ"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ወደ ማህደረ  መረጃ  አውዲዮ ተያይዟል"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ወደ ስልክ አውዲዮ ተያይዟል"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ወደ ፋይል ዝውውር አገልጋይ ተያይዟል"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ከካርታ ጋር ተገናኝቷል"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"ከSAP ጋር ተገናኝቷል"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ከፋይል ዝውውር አገልጋይ ጋር አልተያያዘም"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ወደ ግቤት መሣሪያ ተያይዟል"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ለበይነመረብ ድረስ ወደ መሣሪያ ተያይዟል"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"የአካባቢያዊ በይነመረብ ተያያዥ ከመሣሪያ ጋር በማጋራት ላይ"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ለበይነ መረብ ድረስ ተጠቀም"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ለካርታ ይጠቀሙ"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"ለሲም መዳረሻ መጠቀም"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ለማህደረመረጃ ድምፅተጠቀም"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ለስልክ ድምፅ ተጠቀም"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ለፋይል ዝውውር ተጠቀም"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ከ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ጋር ግንኙነት መመስረት አልተቻለም።"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ማጣመር በ<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ተገፍቷል።"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi ጠፍቷል።"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"የWifi ግንኙነት ተቋርጧል።"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"አንድ የWiFi አሞሌ።"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"ሁለት የWiFi አሞሌዎች።"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"ሦስት የWiFi አሞሌዎች።"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"የWiFi ምልክት ሙሉ ነው።"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ar/arrays.xml b/packages/SettingsLib/res/values-ar/arrays.xml
new file mode 100644
index 0000000..866959f
--- /dev/null
+++ b/packages/SettingsLib/res/values-ar/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"جارٍ الفحص..."</item>
+    <item msgid="8513729475867537913">"جارٍ الاتصال…"</item>
+    <item msgid="515055375277271756">"جارٍ المصادقة…"</item>
+    <item msgid="1943354004029184381">"‏جارٍ الحصول على عنوان IP…"</item>
+    <item msgid="4221763391123233270">"متصل"</item>
+    <item msgid="624838831631122137">"معلق"</item>
+    <item msgid="7979680559596111948">"جارٍ فصل الاتصال..."</item>
+    <item msgid="1634960474403853625">"غير متصل"</item>
+    <item msgid="746097431216080650">"غير ناجح"</item>
+    <item msgid="6367044185730295334">"تم حظرها"</item>
+    <item msgid="503942654197908005">"يتم تجنب الاتصال الضعيف مؤقتًا"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"جارٍ قطع الاتصال بـ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"غير متصل"</item>
+    <item msgid="8578370891960825148">"غير ناجح"</item>
+    <item msgid="5660739516542454527">"تم حظرها"</item>
+    <item msgid="1805837518286731242">"يتم تجنب الاتصال الضعيف مؤقتًا"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ar/cm_strings.xml b/packages/SettingsLib/res/values-ar/cm_strings.xml
new file mode 100644
index 0000000..883f544
--- /dev/null
+++ b/packages/SettingsLib/res/values-ar/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">التطبيقات</string>
+  <string name="picker_activities">النشاطات</string>
+  <string name="select_custom_app_title">تحديد تطبيق مخصص</string>
+  <string name="select_custom_activity_title">تحديد نشاط مخصص</string>
+  <string name="lockscreen_targets_message">اختصارات شاشة التأمين</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml
new file mode 100644
index 0000000..ce7c26b
--- /dev/null
+++ b/packages/SettingsLib/res/values-ar/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"لا يمكن فحص الشبكات"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"لا شيء"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"تم الحفظ"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"معطلة"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏أخفقت تهيئة عنوان IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏أخفق اتصال WiFi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"حدثت مشكلة في المصادقة"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"ليست في النطاق"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"لم يتم اكتشاف اتصال بالإنترنت."</string>
+    <string name="saved_network" msgid="4352716707126620811">"تم الحفظ بواسطة <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏تم التوصيل عبر مساعد Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"‏تم الاتصال عبر %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"‏متوفرة عبر %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"متصلة، ولا يتوفر إنترنت"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"غير متصل"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"جارٍ قطع الاتصال..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"جارٍ الاتصال…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"جارٍ الاقتران..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل (بجهاز غير الهاتف)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل (بجهاز غير الوسائط)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"تم الاتصال (يتعذر الدخول إلى الرسائل)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل (بجهاز غير الهاتف أو الوسائط)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"الإعدادات الصوتية للوسائط"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"الإعدادات الصوتية للهاتف"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"نقل الملف"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"جهاز الإرسال"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"الدخول إلى الإنترنت"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"مشاركة جهة الاتصال"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"استخدام مع مشاركة جهة الاتصال"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"مشاركة اتصال الإنترنت"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"الدخول إلى الرسائل"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"‏الوصول إلى شريحة SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"متصل بالإعدادات الصوتية للوسائط"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"متصل بالإعدادات الصوتية للهاتف"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"متصل بخادم نقل الملف"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"تم الاتصال بملف تعريف الدخول إلى الرسائل"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"‏تم الاتصال بـ SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"غير متصل بخادم نقل الملفات"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"متصل بجهاز الإدخال"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"متصل بالجهاز لدخول الإنترنت"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"مشاركة الاتصال المحلي بالإنترنت مع الجهاز"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"الاستخدام للدخول على الإنترنت"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"استخدام لملف تعريف الدخول إلى الرسائل"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"‏الاستخدام للوصول إلى شريحة SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"الاستخدام للإعدادات الصوتية للوسائط"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"الاستخدام لإعدادات الهاتف الصوتية"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"استخدامه لنقل الملفات"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"لا يمكن الاتصال بـ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"تم رفض الاقتران بواسطة <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"‏تم إيقاف Wi-Fi."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"‏تم قطع اتصال Wi-Fi."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"‏إشارة Wi-Fi تتكون من شريط واحد."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"‏إشارة Wi-Fi تتكون من شريطين."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"‏إشارة Wi-Fi تتكون من ثلاثة أشرطة."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"‏إشارة Wi-Fi كاملة."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-as-rIN/arrays.xml b/packages/SettingsLib/res/values-as-rIN/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-as-rIN/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-as-rIN/cm_strings.xml b/packages/SettingsLib/res/values-as-rIN/cm_strings.xml
new file mode 100644
index 0000000..a4161d0
--- /dev/null
+++ b/packages/SettingsLib/res/values-as-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">এপ্পসমূহ</string>
+  <string name="picker_activities">কাৰ্যাৱলীসমূহ</string>
+  <string name="select_custom_app_title">কাষ্টম এপ্প চয়ন কৰক</string>
+  <string name="select_custom_activity_title">কাষ্টম কাৰ্যকলাপ চয়ন কৰক</string>
+  <string name="lockscreen_targets_message">লক স্ক্ৰীণ চমুপথ</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-as-rIN/strings.xml b/packages/SettingsLib/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-as-rIN/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/arrays.xml b/packages/SettingsLib/res/values-ast-rES/arrays.xml
new file mode 100644
index 0000000..6e3c7ef
--- /dev/null
+++ b/packages/SettingsLib/res/values-ast-rES/arrays.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <string-array name="wifi_status">
+    <!-- Status message of Wi-Fi when it is idle. -->
+    <item/>
+    <!-- Status message of Wi-Fi when it is scanning. -->
+    <item>Esplorando\u2026</item>
+    <!-- Status message of Wi-Fi when it is connecting. -->
+    <item>Coneutando\u2026</item>
+    <!-- Status message of Wi-Fi when it is authenticating. -->
+    <item>Autenticando\u2026</item>
+    <!-- Status message of Wi-Fi when it is obtaining IP address. -->
+    <item>Obteniendo la direición IP\u2026</item>
+    <!-- Status message of Wi-Fi when it is connected. -->
+    <item>Coneutáu</item>
+    <!-- Status message of Wi-Fi when it is suspended. -->
+    <item>Suspendíu</item>
+    <!-- Status message of Wi-Fi when it is disconnecting. -->
+    <item>Desconeutando\u2026</item>
+    <!-- Status message of Wi-Fi when it is disconnected. -->
+    <item>Desconeutáu</item>
+    <!-- Status message of Wi-Fi when it is a failure. -->
+    <item>Incorreutu</item>
+    <!-- Status message of Wi-Fi when it is blocked. -->
+    <item>Bloquiada</item>
+    <!-- Status message of Wi-Fi when connectiong is being verified. -->
+    <item>Desactivando mala conexón temporalmente</item>
+  </string-array>
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+  <string-array name="wifi_status_with_ssid">
+    <!-- Status message of Wi-Fi when it is idle. -->
+    <item/>
+    <!-- Status message of Wi-Fi when it is scanning. -->
+    <item>Esplorando\u2026</item>
+    <!-- Status message of Wi-Fi when it is connecting to a network. -->
+    <item>Coneutando a <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <!-- Status message of Wi-Fi when it is authenticating with a network. -->
+    <item>Autenticando con <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <!-- Status message of Wi-Fi when it is obtaining IP address from a network. -->
+    <item>Obteniendo direición IP de <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <!-- Status message of Wi-Fi when it is connected to a network. -->
+    <item>Coneutáu a <xliff:g id="network_name">%1$s</xliff:g></item>
+    <!-- Status message of Wi-Fi when it is suspended. -->
+    <item>Suspendíu</item>
+    <!-- Status message of Wi-Fi when it is disconnecting from a network. -->
+    <item>Desconeutando de <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <!-- Status message of Wi-Fi when it is disconnected. -->
+    <item>Desconeutáu</item>
+    <!-- Status message of Wi-Fi when it is a failure. -->
+    <item>Incorreutu</item>
+    <!-- Status message of Wi-Fi when it is blocked. -->
+    <item>Bloquiada</item>
+    <!-- Status message of Wi-Fi when connectiong is being verified. -->
+    <item>Desactivando mala conexón  temporalmente</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/cm_strings.xml b/packages/SettingsLib/res/values-ast-rES/cm_strings.xml
new file mode 100644
index 0000000..a91e12f
--- /dev/null
+++ b/packages/SettingsLib/res/values-ast-rES/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplicaciones</string>
+  <string name="picker_activities">Actividaes</string>
+  <string name="select_custom_app_title">Esbilla d\'app personalizada</string>
+  <string name="select_custom_activity_title">Esbilla d\'app personalizada</string>
+  <string name="lockscreen_targets_message">Atayos de pantalla de bloquéu</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ast-rES/strings.xml b/packages/SettingsLib/res/values-ast-rES/strings.xml
new file mode 100644
index 0000000..f1a1f88
--- /dev/null
+++ b/packages/SettingsLib/res/values-ast-rES/strings.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <string name="wifi_fail_to_scan">Nun puen buscase redes</string>
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <string name="wifi_security_short_wep">WEP</string>
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <string name="wifi_security_short_wpa">WPA</string>
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <string name="wifi_security_short_wpa2">WPA2</string>
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <string name="wifi_security_short_psk_generic">@string/wifi_security_short_wpa_wpa2</string>
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <string name="wifi_security_short_eap">802.1x</string>
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <string name="wifi_security_none">Nenguna</string>
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <string name="wifi_security_wep">WEP</string>
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <string name="wifi_security_wpa">WPA PSK</string>
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <string name="wifi_security_wpa2">WPA2 PSK</string>
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <string name="wifi_security_wpa_wpa2">WPA/WPA2 PSK</string>
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <string name="wifi_security_psk_generic">@string/wifi_security_wpa_wpa2</string>
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <string name="wifi_security_eap">802.1x EAP</string>
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <string name="wifi_security_passpoint">Passpoint</string>
+  <!-- Summary for the remembered network. -->
+  <string name="wifi_remembered">Guardada</string>
+  <!-- Status for networks disabled for unknown reason -->
+  <string name="wifi_disabled_generic">Deshabilitada</string>
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <string name="wifi_disabled_network_failure">Fallu de configuración IP</string>
+  <!-- Status for networked disabled from a wifi association failure -->
+  <string name="wifi_disabled_wifi_failure">Fallu de conexón Wi-Fi</string>
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <string name="wifi_disabled_password_failure">Problema d\'autenticación</string>
+  <!-- Summary for the remembered network but currently not in range. -->
+  <string name="wifi_not_in_range">Fuera d\'algame</string>
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <string name="wifi_no_internet">Nun se deteutó l\'accesu a Internet. Nun va volver a coneutase de mou automáticu.</string>
+  <!-- Summary for saved networks -->
+  <string name="saved_network">Guardada por <xliff:g id="name">%1$s</xliff:g></string>
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <string name="connected_via_wfa">Coneutáu por asistente de Wi-Fi</string>
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <string name="connected_via_passpoint">Conexón al traviés de %1$s</string>
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <string name="available_via_passpoint">Disponible al traviés de %1$s</string>
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <string name="wifi_connected_no_internet">Conectáu, ensin Internet</string>
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <string name="bluetooth_disconnected">Desconeutáu</string>
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <string name="bluetooth_disconnecting">Desconeutando\u2026</string>
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <string name="bluetooth_connecting">Coneutando\u2026</string>
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <string name="bluetooth_connected">Coneutáu</string>
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <string name="bluetooth_pairing">Enllazando\u2026</string>
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <string name="bluetooth_connected_no_headset">Coneutáu (ensin tfnu)</string>
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <string name="bluetooth_connected_no_a2dp">Coneutáu (ensin multimedia)</string>
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <string name="bluetooth_connected_no_map">Coneutáu (ensin accesu a mensaxes)</string>
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <string name="bluetooth_connected_no_headset_no_a2dp">Coneutáu (ensin tel. nin multimedia)</string>
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <string name="bluetooth_profile_a2dp">Audiu multimedia</string>
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <string name="bluetooth_profile_headset">Audiu del preséu</string>
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <string name="bluetooth_profile_opp">Tresferencia de ficheros</string>
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <string name="bluetooth_profile_hid">Preséu d\'entrada</string>
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <string name="bluetooth_profile_pan">Accesu a Internet</string>
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <string name="bluetooth_profile_pbap">Compartir contautos</string>
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <string name="bluetooth_profile_pbap_summary">Usar pa compartir contautos</string>
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <string name="bluetooth_profile_pan_nap">Compartir conexón d\'internet</string>
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <string name="bluetooth_profile_map">Accesu a mensaxes</string>
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <string name="bluetooth_profile_sap">Accesu SIM</string>
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <string name="bluetooth_profile_dun">Accesu telefónicu a redes</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <string name="bluetooth_a2dp_profile_summary_connected">Conectáu al audiu multimedia</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <string name="bluetooth_headset_profile_summary_connected">Conectáu al audiu del preséu</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <string name="bluetooth_opp_profile_summary_connected">Coneutáu al sirvidor de tresferencia de ficheros</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <string name="bluetooth_map_profile_summary_connected">Coneutáu a mapa</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <string name="bluetooth_sap_profile_summary_connected">Coneutáu a SAP</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <string name="bluetooth_opp_profile_summary_not_connected">Ensin conexón col sirvidor de tresferencia de ficheros</string>
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <string name="bluetooth_hid_profile_summary_connected">Coneutáu a preséu d\'entrada</string>
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <string name="bluetooth_pan_user_profile_summary_connected">Coneutáu a preséu p\'accesu a Internet</string>
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <string name="bluetooth_pan_nap_profile_summary_connected">Compartiendo conexón a Internet col preséu</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <string name="bluetooth_dun_profile_summary_connected">Coneutáu al sirvidor DUN</string>
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <string name="bluetooth_pan_profile_summary_use_for">Usar p\'acceder a Internet</string>
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <string name="bluetooth_map_profile_summary_use_for">Usar pa mapa</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <string name="bluetooth_sap_profile_summary_use_for">Usar p\'accesu a SIM</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <string name="bluetooth_a2dp_profile_summary_use_for">Usar p\'audiu de mediu</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <string name="bluetooth_headset_profile_summary_use_for">Usar p\'audiu del teléfonu</string>
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <string name="bluetooth_opp_profile_summary_use_for">Usu de la tresferencia de ficheros</string>
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <string name="bluetooth_hid_profile_summary_use_for">Usar pa entrada</string>
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <string name="bluetooth_dun_profile_summary_use_for">Usáu pal accesu telefónicu a redes</string>
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <string name="bluetooth_pairing_accept">Enllazar</string>
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <string name="bluetooth_pairing_accept_all_caps">ENLLAZAR</string>
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <string name="bluetooth_pairing_decline">Encaboxar</string>
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <string name="bluetooth_pairing_will_share_phonebook">La vinculación permite acceder a los contautos y al historial de llamaes cuando\'l preséu ta coneutáu.</string>
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <string name="bluetooth_pairing_error_message">Nun pudo enllazase con <xliff:g id="device_name">%1$s</xliff:g>.</string>
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <string name="bluetooth_pairing_pin_error_message">Nun pudo enllazase con <xliff:g id="device_name">%1$s</xliff:g> porque la clave d\'accesu o el PIN son incorreutos.</string>
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <string name="bluetooth_pairing_device_down_error_message">Nun pue afitase comunicación con <xliff:g id="device_name">%1$s</xliff:g>.</string>
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <string name="bluetooth_pairing_rejected_error_message">Enllaz refugáu por <xliff:g id="device_name">%1$s</xliff:g></string>
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_wifi_off">Wi-Fi desactiváu</string>
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_no_wifi">Wi-Fi desconeutáu</string>
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_wifi_one_bar">Una barra de Wi-Fi</string>
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_wifi_two_bars">Dos barres de Wi-Fi</string>
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_wifi_three_bars">Trés barres de Wi-Fi</string>
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_wifi_signal_full">Señal de Wi-Fi al máximu</string>
+  <!-- Label for kernel threads in battery usage -->
+  <string name="process_kernel_label">Android OS</string>
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <string name="data_usage_uninstalled_apps">Aplicaciones desaniciaes</string>
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <string name="data_usage_uninstalled_apps_users">Usuarios y aplicaciones desaniciaos</string>
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <string name="tether_settings_title_usb">Anclaxe de USB</string>
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <string name="tether_settings_title_wifi">Zona Wi-Fi portátil</string>
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <string name="tether_settings_title_bluetooth">Anclaxe de Bluetooth</string>
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <string name="tether_settings_title_usb_bluetooth">Anclaxe a rede</string>
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <string name="tether_settings_title_all">Anclaxe a rede y zona Wi-Fi</string>
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <string name="managed_user_title">Perfil de trabayu</string>
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <string name="user_guest">Convidáu</string>
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <string name="unknown">Desconocíu</string>
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+  <string name="running_process_item_user_label">Usuariu: <xliff:g id="user_name">%1$s</xliff:g></string>
+</resources>
diff --git a/packages/SettingsLib/res/values-az-rAZ/arrays.xml b/packages/SettingsLib/res/values-az-rAZ/arrays.xml
new file mode 100644
index 0000000..442d155
--- /dev/null
+++ b/packages/SettingsLib/res/values-az-rAZ/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Skan edilir ..."</item>
+    <item msgid="8513729475867537913">"Qoşulur ..."</item>
+    <item msgid="515055375277271756">"Autentifikasiya edilir..."</item>
+    <item msgid="1943354004029184381">"IP ünvanı əldə edilir..."</item>
+    <item msgid="4221763391123233270">"Qoşulu"</item>
+    <item msgid="624838831631122137">"Durdurulmuş"</item>
+    <item msgid="7979680559596111948">"Ayrılır ..."</item>
+    <item msgid="1634960474403853625">"Əlaqə kəsildi"</item>
+    <item msgid="746097431216080650">"Uğursuz"</item>
+    <item msgid="6367044185730295334">"Bloklanıb"</item>
+    <item msgid="503942654197908005">"Keyfiyyətsiz bağlantıdan müvəqqəti qaçış"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Skan edilir..."</item>
+    <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> qoşulur…"</item>
+    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ilə autentifikasiya edilir..."</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> şəbəkəsindən IP ünvan əldə olunur..."</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> qoşuldu"</item>
+    <item msgid="1330262655415760617">"Dayandırılıb"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> şəbəkəsindən ayrılır..."</item>
+    <item msgid="197508606402264311">"Bağlantı kəsildi"</item>
+    <item msgid="8578370891960825148">"Uğursuz"</item>
+    <item msgid="5660739516542454527">"Bloklanıb"</item>
+    <item msgid="1805837518286731242">"Zəif bağlantı müvəqqəti aradan qaldırılır"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-az-rAZ/strings.xml b/packages/SettingsLib/res/values-az-rAZ/strings.xml
new file mode 100644
index 0000000..f479f6f
--- /dev/null
+++ b/packages/SettingsLib/res/values-az-rAZ/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Şəbəkə axtarmaq olmur"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Heç biri"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Yadda saxlanılan"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiv"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Konfiqurasiya Uğursuzluğu"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi Bağlantı Uğursuzluğu"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikasiya problemi"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Diapazonda deyil"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"İnternet bağlantısı tapılmadı, avtomatik olaraq yenidən qoşulmayacaq."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> tərəfindən saxlandı"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi köməkçisi vasitəsilə qoşulub"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s vasitəsilə qoşuludur"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s vasitəsilə əlçatandır"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Qoşuludur, internet yoxdur"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ayrıldı"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ayrılır..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Qoşulur..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Qoşulu"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Cütləşdirmə"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Qoşulub (telefonsuz)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Qoşuludur (media yoxdur)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Qoşulu (mesaj girişi yoxdur)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Bağlantı yaradılıb (telefon və ya media deyil)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Fayl transferi"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Daxiletmə cihazı"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"İnternet girişi"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontakt paylaşımı"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Kontakt paylaşımı üçün istifadə edin"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"internet bağlantı paylaşımı"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mesaj Girişi"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Girişi"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Media audioya birləşdirilib"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon audiosuna qoşulu"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Fayl transfer serverinə qoşulu"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Xəritəyə qoşulu"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP(es-ey-pi)\'yə qoşuludur"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Fayl transfer serverinə qoşulmayıb"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Daxiletmə cihazına qoşuldu"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"İnternet girişi üçün cihaza birləşdi"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokal internet bağlantısı cihazla paylaşılır"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"İnternet girişi üçün istifadə edin"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Xəritə üçün istifadə et"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM girişi üçün istifadə edin"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Media audio istifadə edin"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Telefon audiosu istifadə edin"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Fayl transferi üçün istifadə edin"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Daxiletmə üçün istifadə edin"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Birləşdir"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"CÜTLƏNDİR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Ləğv et"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Qoşulan zaman kontaktlarınıza və çağrı tarixçəsinə giriş cütlənməsi."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə birləşdirmək alınmadı."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Yanlış PIN və ya parola görə <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə cütləşmək alınmadı."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ilə ünsiyyət qurula bilmir."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Cütləşdirmə <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tərəfindən rədd edildi."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi sönülüdür."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi bağlantı kəsildi."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi bir xətdir."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi iki xətdir."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi üç xətdir."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wifi siqnalı tamdır."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-be/arrays.xml b/packages/SettingsLib/res/values-be/arrays.xml
new file mode 100644
index 0000000..e9ab91e
--- /dev/null
+++ b/packages/SettingsLib/res/values-be/arrays.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <string-array name="wifi_status">
+    <!-- Status message of Wi-Fi when it is idle. -->
+    <item/>
+    <!-- Status message of Wi-Fi when it is scanning. -->
+    <item>Сканаваньне\u2026</item>
+    <!-- Status message of Wi-Fi when it is connecting. -->
+    <item>Connecting\u2026</item>
+    <!-- Status message of Wi-Fi when it is authenticating. -->
+    <item>Праверка\u2026</item>
+    <!-- Status message of Wi-Fi when it is obtaining IP address. -->
+    <item>Obtaining IP address\u2026</item>
+    <!-- Status message of Wi-Fi when it is connected. -->
+    <item>Connected</item>
+    <!-- Status message of Wi-Fi when it is suspended. -->
+    <item>Suspended</item>
+    <!-- Status message of Wi-Fi when it is disconnecting. -->
+    <item>Disconnecting\u2026</item>
+    <!-- Status message of Wi-Fi when it is disconnected. -->
+    <item>Disconnected</item>
+    <!-- Status message of Wi-Fi when it is a failure. -->
+    <item>Unsuccessful</item>
+    <!-- Status message of Wi-Fi when it is blocked. -->
+    <item>Заблякавана</item>
+    <!-- Status message of Wi-Fi when connectiong is being verified. -->
+    <item>Temporarily avoiding poor connection</item>
+  </string-array>
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml
new file mode 100644
index 0000000..c5fd186
--- /dev/null
+++ b/packages/SettingsLib/res/values-be/strings.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <string name="wifi_security_short_wep">WEP</string>
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <string name="wifi_security_short_wpa">WPA</string>
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <string name="wifi_security_short_wpa2">WPA2</string>
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <string name="wifi_security_short_eap">802.1x</string>
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <string name="wifi_security_none">Нічога</string>
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <string name="wifi_security_wpa">WPA PSK</string>
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <string name="wifi_security_wpa2">WPA2 PSK</string>
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <string name="wifi_security_wpa_wpa2">WPA/WPA2 PSK</string>
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <string name="bluetooth_pairing_decline">Скасаваць</string>
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-bg/arrays.xml b/packages/SettingsLib/res/values-bg/arrays.xml
new file mode 100644
index 0000000..a754787
--- /dev/null
+++ b/packages/SettingsLib/res/values-bg/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Сканира се..."</item>
+    <item msgid="8513729475867537913">"Установява се връзка…"</item>
+    <item msgid="515055375277271756">"Удостоверява се..."</item>
+    <item msgid="1943354004029184381">"Получава се IP адрес"</item>
+    <item msgid="4221763391123233270">"Установена е връзка"</item>
+    <item msgid="624838831631122137">"Прекъсната"</item>
+    <item msgid="7979680559596111948">"Изключва се..."</item>
+    <item msgid="1634960474403853625">"Изкл."</item>
+    <item msgid="746097431216080650">"Неуспешно"</item>
+    <item msgid="6367044185730295334">"Блокирано"</item>
+    <item msgid="503942654197908005">"Временно се избягва лоша връзка"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"Изключва се от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Изкл."</item>
+    <item msgid="8578370891960825148">"Неуспешно"</item>
+    <item msgid="5660739516542454527">"Блокирано"</item>
+    <item msgid="1805837518286731242">"Временно се избягва лоша връзка"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml
new file mode 100644
index 0000000..1fc7193
--- /dev/null
+++ b/packages/SettingsLib/res/values-bg/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не може да се сканира за мрежи"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Запазено"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Деактивирани"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Неуспешно конфигуриране на IP адреса"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Неуспешна връзка с Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем при удостоверяването"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Извън обхват"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Не е открит достъп до интернет. Няма да се свърже отново автоматично."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Запазено от <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Установена е връзка чрез помощника за Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Установена е връзка през „%1$s“"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Мрежата е достъпна през „%1$s“"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Установена е връзка – няма достъп до интернет"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Изкл."</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Изключва се..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Установява се връзка…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Установена е връзка"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Сдвояване..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Свързано (без телефона)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Свързано (без мултимедията)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Има връзка (няма достъп до съобщенията)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Свързано (без телефона или мултимедията)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Мултимедийно аудио"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук на телефона"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Прехвърляне на файл"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Входно устройство"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Достъп до интернет"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Споделяне на контакти"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Използване за споделяне на контакти"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделяне на връзката с интернет"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Достъп до съобщенията"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Достъп до SIM картата"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Установена е връзка с медийно аудио"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Връзка със звука на телефона"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установена е връзка със сървър за трансфер на файлове"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Има връзка с MAP"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Установена е връзка със SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Няма връзка със сървър за трансфер на файлове"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Има връзка с устройството за въвеждане"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Има връзка с у-во за достъп до интернет"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Лок. връзка с интернет се споделя с у-вото"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Използване за достъп до интернет"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Да се използва за MAP"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Използване за достъп до SIM картата"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Употреба за медийно аудио"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Използване на телефон за аудио"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Използване на за пренос на файлове"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не може да се свърже с/ъс <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Сдвояването е отхвърлено от <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi е изключен."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Няма връзка с Wi-Fi."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi е с една чертичка."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi е с две чертички."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi е с три чертички."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Сигналът за Wi-Fi е пълен."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-bn-rBD/arrays.xml b/packages/SettingsLib/res/values-bn-rBD/arrays.xml
new file mode 100644
index 0000000..367e268
--- /dev/null
+++ b/packages/SettingsLib/res/values-bn-rBD/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"স্ক্যান করা হচ্ছে…"</item>
+    <item msgid="8513729475867537913">"সংযুক্ত হচ্ছে..."</item>
+    <item msgid="515055375277271756">"প্রমাণীকরণ হচ্ছে..."</item>
+    <item msgid="1943354004029184381">"IP ঠিকানা প্রাপ্ত করা হচ্ছে..."</item>
+    <item msgid="4221763391123233270">"সংযুক্ত হয়েছে"</item>
+    <item msgid="624838831631122137">"স্থগিত করা হয়েছে"</item>
+    <item msgid="7979680559596111948">"সংযোগ বিচ্ছিন্ন হচ্ছে..."</item>
+    <item msgid="1634960474403853625">"সংযোগ বিচ্ছিন্ন করা হয়েছে"</item>
+    <item msgid="746097431216080650">"অসফল"</item>
+    <item msgid="6367044185730295334">"ব্লক করা"</item>
+    <item msgid="503942654197908005">"সাময়িকরূপে দুর্বল সংযোগ এড়ানো হচ্ছে"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> থেকে IP ঠিকানা জানা হচ্ছে…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> তে সংযুক্ত হয়েছে"</item>
+    <item msgid="1330262655415760617">"স্থগিত করা হয়েছে"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> থেকে সংযোগ বিচ্ছিন্ন হচ্ছে…"</item>
+    <item msgid="197508606402264311">"সংযোগ বিচ্ছিন্ন করা হয়েছে"</item>
+    <item msgid="8578370891960825148">"অসফল"</item>
+    <item msgid="5660739516542454527">"অবরুদ্ধ"</item>
+    <item msgid="1805837518286731242">"সাময়িকরূপে দুর্বল সংযোগ এড়ানো হচ্ছে"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-bn-rBD/strings.xml b/packages/SettingsLib/res/values-bn-rBD/strings.xml
new file mode 100644
index 0000000..bdaecb7
--- /dev/null
+++ b/packages/SettingsLib/res/values-bn-rBD/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"নেটওয়ার্কগুলির জন্য স্ক্যান করা যাবে না"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"কোনো কিছুই নয়"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"সংরক্ষিত"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"অক্ষম হয়েছে"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP কনফিগারেশনের ব্যর্থতা"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi সংযোগের ব্যর্থতা"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"প্রমাণীকরণ সমস্যা"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"পরিসরের মধ্যে নয়"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"কোনো ইন্টারনেট অ্যাক্সেস শনাক্ত হয়নি, স্বয়ংক্রিয়ভাবে পুনরায় সংযোগ স্থাপন করবে না৷"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> দ্বারা সংরক্ষিত"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi সহায়ক-এর মাধ্যমে সংযুক্ত হয়েছে"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s মাধ্যমে সংযুক্ত হয়েছে"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s এর মাধ্যমে উপলব্ধ"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"সংযুক্ত, ইন্টারনেট নেই"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"সংযোগ বিচ্ছিন্ন করা হয়েছে"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"সংযোগ বিচ্ছিন্ন হচ্ছে..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"সংযুক্ত হচ্ছে..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"সংযুক্ত হয়েছে"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"যুক্ত করা হচ্ছে..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"সংযুক্ত (কোনো ফোন নেই)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"সংযুক্ত (কোনো মিডিয়া নেই)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"সংযুক্ত (কোনো বার্তা অ্যাক্সেস নেই)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"সংযুক্ত (কোনো ফোন বা মিডিয়া নেই)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"মিডিয়া অডিও"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ফোন অডিও"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ফাইল স্থানান্তর"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ইনপুট ডিভাইস"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ইন্টারনেট অ্যাক্সেস"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"পরিচিতি ভাগ করা"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"পরিচিতি ভাগ করার কাজে ব্যবহার করুন"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ইন্টারনেট সংযোগ ভাগ করা হচ্ছে"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"বার্তা অ্যাক্সেস"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM -এর অ্যাক্সেস"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"মিডিয়া অডিওতে সংযুক্ত রয়েছে"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ফোন অডিওতে সংযুক্ত"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ফাইল স্থানান্তর সার্ভারের সঙ্গে সংযুক্ত"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"মানচিত্রে সংযুক্ত"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP -তে সংযুক্ত হয়েছে"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ফাইল স্থানান্তর সার্ভারের সঙ্গে সংযুক্ত নয়"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ইনপুট ডিভাইসে সংযুক্ত"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ইন্টারনেট অ্যাক্সেসের জন্য ডিভাইসে সংযুক্ত"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ডিভাইসের সাথে স্থানীয় ইন্টারনেট সংযোগ ভাগ করছে"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ইন্টারনেট অ্যাক্সেসের জন্য ব্যবহার করুন"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"মানচিত্রের জন্য ব্যবহার করুন"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM -এর অ্যাক্সেসের জন্য ব্যবহার করুন"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"মিডিয়া অডিওয়ের জন্য ব্যবহার করুন"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ফোন অডিওয়ের জন্য ব্যবহার করুন"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ফাইল স্থানান্তরের জন্য ব্যবহার করুন"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সঙ্গে যোগাযোগ করতে পারবেন না।"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"যুক্ত করা <xliff:g id="DEVICE_NAME">%1$s</xliff:g> প্রত্যাখ্যান করেছে।"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi বন্ধ৷"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi এর সংযোগ বিচ্ছিন্ন হয়েছে৷"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi এ একটি দণ্ড৷"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi এ দুইটি দণ্ড৷"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi এ তিনটি দণ্ড৷"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wifi এ সম্পূর্ণ সিগন্যাল৷"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-br-rFR/arrays.xml b/packages/SettingsLib/res/values-br-rFR/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-br-rFR/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-br-rFR/strings.xml b/packages/SettingsLib/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-br-rFR/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-bs-rBA/arrays.xml b/packages/SettingsLib/res/values-bs-rBA/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-bs-rBA/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-bs-rBA/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-ca/arrays.xml b/packages/SettingsLib/res/values-ca/arrays.xml
new file mode 100644
index 0000000..1bcbe6e
--- /dev/null
+++ b/packages/SettingsLib/res/values-ca/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"S\'està cercant..."</item>
+    <item msgid="8513729475867537913">"S\'està connectant…"</item>
+    <item msgid="515055375277271756">"S\'està autenticant…"</item>
+    <item msgid="1943354004029184381">"S\'està obtenint l\'adreça IP…"</item>
+    <item msgid="4221763391123233270">"Connectat"</item>
+    <item msgid="624838831631122137">"Suspesa"</item>
+    <item msgid="7979680559596111948">"S\'està desconnectant..."</item>
+    <item msgid="1634960474403853625">"Desconnectada"</item>
+    <item msgid="746097431216080650">"Incorrecte"</item>
+    <item msgid="6367044185730295334">"Bloquejada"</item>
+    <item msgid="503942654197908005">"S\'està evitant temporalment una connexió feble"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"S\'està cercant..."</item>
+    <item msgid="355508996603873860">"S\'està connectant a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"S\'està autenticant amb <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"S\'està obtenint l\'adreça IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Connectat a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspesa"</item>
+    <item msgid="7698638434317271902">"S\'està desconnectant de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Desconnectada"</item>
+    <item msgid="8578370891960825148">"Incorrecte"</item>
+    <item msgid="5660739516542454527">"Bloquejada"</item>
+    <item msgid="1805837518286731242">"S\'està evitant temporalment una connexió feble"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml
new file mode 100644
index 0000000..b23531c
--- /dev/null
+++ b/packages/SettingsLib/res/values-ca/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No es poden cercar xarxes"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Cap"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Desat"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivat"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuració d\'IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de connexió Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema d\'autenticació"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora de l\'abast"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No s\'ha detectat accés a Internet, no s\'hi tornarà a connectar automàticament."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Desat per <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connectat mitjançant l\'assistent de Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Connectada mitjançant %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponible mitjançant %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Connectada, sense Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconnectat"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"S\'està desconnectant..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"S\'està connectant…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Connectat"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"S\'està vinculant..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connectats (sense telèfon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connectat (sense fitxers multimèdia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connectat (no hi ha accés als missatges)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connectat (sense telèfon o disp. mult.)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Àudio multimèdia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Àudio del telèfon"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferència del fitxer"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositiu d\'entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accés a Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartir contactes"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"S\'utilitza per compartir contactes."</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Connexió compartida a Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accés al missatge"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Accés a la SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connectat a l\'àudio del mitjà"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connectat a àudio del telèfon"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connectat al servidor de transferència de fitxers"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connectat a un mapa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Connectat a SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No està connectat al servidor de transferència de fitxers"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connectat a dispositiu d\'entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connectat al dispositiu per a accés a Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"S\'està compartint la connexió a Internet amb el dispositiu"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilitza\'l per a l\'accés a Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilitza per al mapa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Utilitza per a l\'accés a la SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilitza per a l\'àudio del mitjà"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilitza-ho per a l\'àudio del telèfon"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilitza per a la transferència de fitxers"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilitza per a entrada"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Vincula"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"VINCULA"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel·la"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"La vinculació permet accedir als contactes i a l\'historial de trucades quan el dispositiu està connectat."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No s\'ha pogut vincular amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No s\'ha pogut vincular amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, perquè el PIN o la contrasenya són incorrectes."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No es pot comunicar amb <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vinculació rebutjada per <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi desactivada."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi desconnectada."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Senyal Wi-Fi: una barra."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Senyal Wi-Fi: dues barres."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Senyal Wi-Fi: tres barres."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Senyal Wi-Fi: complet."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-cs/arrays.xml b/packages/SettingsLib/res/values-cs/arrays.xml
new file mode 100644
index 0000000..d990f46
--- /dev/null
+++ b/packages/SettingsLib/res/values-cs/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Vyhledávání..."</item>
+    <item msgid="8513729475867537913">"Připojování..."</item>
+    <item msgid="515055375277271756">"Ověřování..."</item>
+    <item msgid="1943354004029184381">"Načítání IP adresy…"</item>
+    <item msgid="4221763391123233270">"Připojeno"</item>
+    <item msgid="624838831631122137">"Pozastaveno"</item>
+    <item msgid="7979680559596111948">"Odpojování..."</item>
+    <item msgid="1634960474403853625">"Odpojeno"</item>
+    <item msgid="746097431216080650">"Neúspěšné"</item>
+    <item msgid="6367044185730295334">"Blokováno"</item>
+    <item msgid="503942654197908005">"Dočasné předcházení slabému připojení"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Vyhledávání..."</item>
+    <item msgid="355508996603873860">"Připojování k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Ověřování v síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Získávání IP adresy ze sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Připojeno k síti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Pozastaveno"</item>
+    <item msgid="7698638434317271902">"Odpojování od sítě <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Odpojeno"</item>
+    <item msgid="8578370891960825148">"Neúspěšné"</item>
+    <item msgid="5660739516542454527">"Blokováno"</item>
+    <item msgid="1805837518286731242">"Dočasné předcházení slabému připojení"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml
new file mode 100644
index 0000000..79e28fe
--- /dev/null
+++ b/packages/SettingsLib/res/values-cs/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nelze hledat sítě"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Žádné"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Uloženo"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Vypnuto"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Selhání konfigurace protokolu IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Selhání připojení Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s ověřením"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nebyl zjištěn žádný přístup k internetu, připojení nebude automaticky obnoveno."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Uloženo uživatelem <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Připojeno pomocí asistenta připojení Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Připojeno prostřednictvím %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Dostupné prostřednictvím %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Připojeno, není k dispozici internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojeno"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Odpojování..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Připojování..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Připojeno"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Párování..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Připojeno (žádný telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Připojeno (žádná média)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Připojeno (bez přístupu ke zprávám)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Připojeno (žádný telefon nebo média)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvuk médií"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefonu"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Přenos souborů"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupní zařízení"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Přístup k internetu"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Sdílení kontaktů"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Použít ke sdílení kontaktů"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Sdílení internetového připojení"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Přístup ke zprávám"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Přístup k SIM kartě"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Připojeno ke zvukovému médiu"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Připojeno k náhlavní soupravě"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Připojeno k serveru pro přenos dat"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Připojeno k mapě"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Připojeno k SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepřipojeno k serveru pro přenos souborů"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Připojeno ke vstupnímu zařízení"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Připojeno k zařízení za účelem přístupu k internetu"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Místní internetové připojení je sdíleno se zařízením"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použít pro přístup k internetu"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Použít pro mapu"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Používat pro přístup k SIM kartě"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Umožňuje připojení zvukového média"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Umožňuje připojení náhlavní soupravy"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použít pro přenos souborů"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použít pro vstup"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovat"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PÁROVAT"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Zrušit"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Párováním připojenému zařízení udělíte přístup ke svým kontaktům a historii volání."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nelze párovat se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nelze párovat se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. Kód PIN nebo přístupový klíč je nesprávný."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Se zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nelze navázat komunikaci."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Párování odmítnuto zařízením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Síť Wi-Fi je vypnuta."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Síť Wi-Fi je odpojena."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi – jedna čárka."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi – dvě čárky."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi – tři čárky."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi – plný signál."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-csb-rPL/arrays.xml b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-csb-rPL/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-csb-rPL/strings.xml b/packages/SettingsLib/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-csb-rPL/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-cy/arrays.xml b/packages/SettingsLib/res/values-cy/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-cy/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-cy/strings.xml b/packages/SettingsLib/res/values-cy/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-cy/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-da/arrays.xml b/packages/SettingsLib/res/values-da/arrays.xml
new file mode 100644
index 0000000..a8c2a45
--- /dev/null
+++ b/packages/SettingsLib/res/values-da/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Scanner ..."</item>
+    <item msgid="8513729475867537913">"Opretter forbindelse..."</item>
+    <item msgid="515055375277271756">"Godkender..."</item>
+    <item msgid="1943354004029184381">"Henter IP-adresse…"</item>
+    <item msgid="4221763391123233270">"Tilsluttet"</item>
+    <item msgid="624838831631122137">"Sat på pause"</item>
+    <item msgid="7979680559596111948">"Afbryder ..."</item>
+    <item msgid="1634960474403853625">"Afbrudt"</item>
+    <item msgid="746097431216080650">"Mislykkedes"</item>
+    <item msgid="6367044185730295334">"Blokeret"</item>
+    <item msgid="503942654197908005">"Undgår midlertidigt dårlig forbindelse"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Scanner ..."</item>
+    <item msgid="355508996603873860">"Opretter forbindelse til <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="554971459996405634">"Godkender med <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="7928343808033020343">"Henter IP-adresse fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="8937994881315223448">"Forbundet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Sat på pause"</item>
+    <item msgid="7698638434317271902">"Afbryder fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> ..."</item>
+    <item msgid="197508606402264311">"Afbrudt"</item>
+    <item msgid="8578370891960825148">"Mislykkedes"</item>
+    <item msgid="5660739516542454527">"Blokeret"</item>
+    <item msgid="1805837518286731242">"Undgår midlertidigt dårlig forbindelse"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml
new file mode 100644
index 0000000..59cdc90
--- /dev/null
+++ b/packages/SettingsLib/res/values-da/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Der kan ikke søges efter netværk"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gemt"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiveret"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurationsfejl"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-forbindelsesfejl"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem med godkendelse"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ikke inden for rækkevidde"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Der blev ikke fundet nogen internetadgang. Forbindelsen bliver ikke automatisk genoprettet."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Gemt af <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Forbindelse via Wi-Fi-assistent"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Tilsluttet via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Tilgængelig via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Tilsluttet – intet internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Afbrudt"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Afbryder ..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Opretter forbindelse..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Tilsluttet"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parrer..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Forbundet (ingen telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tilsluttet (intet medie)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Forbundet (ingen adgang til meddelelse)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Forbundet (ingen telefon eller medier)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medielyd"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonlyd"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filoverførsel"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inputenhed"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetadgang"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Deling af kontaktpersoner"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Brug til deling af kontaktpersoner"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling af internetforbindelse"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Adgang til meddelelse"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-adgang"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Forbundet til medielyd"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Forbundet til telefonlyd"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Forbundet til filoverførselsserver"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Forbundet til kort"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Sluttet til SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke forbundet til filoverførselsserver"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Forbundet til inputenhed"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tilsluttet enhed/internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Deler lokal internetforbindelse med enhed"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Brug til internetadgang"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Brug til kort"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Brug til SIM-adgang"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Brug til medielyd"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Brug til telefonlyd"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Brug til filoverførsel"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Brug til input"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ACCEPTÉR PARRING"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuller"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Parring giver adgang til dine kontaktpersoner og din opkaldshistorik, når enhederne er forbundet."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Der kunne ikke parres med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Der kunne ikke parres med <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grund af en forkert pinkode eller adgangsnøgle."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Der kan ikke kommunikeres med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Parring afvist af <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi er slået fra."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi er afbrudt."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi har én bjælke."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi har to bjælker."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi har tre bjælker."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi har fuldt signal."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-de/arrays.xml b/packages/SettingsLib/res/values-de/arrays.xml
new file mode 100644
index 0000000..6772c7d
--- /dev/null
+++ b/packages/SettingsLib/res/values-de/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Scan läuft…"</item>
+    <item msgid="8513729475867537913">"Verbindung wird hergestellt..."</item>
+    <item msgid="515055375277271756">"Authentifizierung..."</item>
+    <item msgid="1943354004029184381">"IP-Adresse wird abgerufen..."</item>
+    <item msgid="4221763391123233270">"Verbunden"</item>
+    <item msgid="624838831631122137">"Angehalten"</item>
+    <item msgid="7979680559596111948">"Verbindung wird getrennt..."</item>
+    <item msgid="1634960474403853625">"Nicht verbunden"</item>
+    <item msgid="746097431216080650">"Nicht erfolgreich"</item>
+    <item msgid="6367044185730295334">"Blockiert"</item>
+    <item msgid="503942654197908005">"Schlechte Internetverbindung wird vorübergehend vermieden."</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Scan läuft…"</item>
+    <item msgid="355508996603873860">"Verbindung mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g> wird hergestellt..."</item>
+    <item msgid="554971459996405634">"Authentifizierung mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"IP-Adresse wird von <xliff:g id="NETWORK_NAME">%1$s</xliff:g> abgerufen..."</item>
+    <item msgid="8937994881315223448">"Verbunden mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Angehalten"</item>
+    <item msgid="7698638434317271902">"Verbindung mit <xliff:g id="NETWORK_NAME">%1$s</xliff:g> wird getrennt..."</item>
+    <item msgid="197508606402264311">"Nicht verbunden"</item>
+    <item msgid="8578370891960825148">"Nicht erfolgreich"</item>
+    <item msgid="5660739516542454527">"Blockiert"</item>
+    <item msgid="1805837518286731242">"Schlechte Internetverbindung wird vorübergehend vermieden."</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml
new file mode 100644
index 0000000..424cf83
--- /dev/null
+++ b/packages/SettingsLib/res/values-de/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Netzwerkscan nicht möglich"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Keine"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gespeichert"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Deaktiviert"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-Konfigurationsfehler"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WLAN-Verbindungsfehler"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentifizierungsproblem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nicht in Reichweite"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Keine Internetverbindung erkannt, es kann nicht automatisch eine Verbindung hergestellt werden."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Gespeichert von <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Über WLAN-Assistenten verbunden"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Über %1$s verbunden"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Verfügbar über %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Verbunden, kein Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Nicht verbunden"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbindung wird getrennt..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbindung wird hergestellt..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Verbunden"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing läuft…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Verbunden (kein Telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Verbunden (außer Audiomedien)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Verbunden (ohne Nachrichtenzugriff)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Verbunden (außer Telefon- und Audiomedien)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-Audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon-Audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dateiübertragung"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Eingabegerät"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetzugriff"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktfreigabe"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Für Kontaktfreigabe nutzen"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Freigabe der Internetverbindung"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Nachrichtenzugriff"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Zugriff auf SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbunden mit  Audiosystem von Medien"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbunden mit Audiosystem des Telefons"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Mit Dateiübertragungsserver verbunden"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Mit Karte verbunden"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Mit SAP verbunden"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nicht mit Dateiübertragungsserver verbunden"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Mit einem Eingabegerät verbunden"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Für Internetzugriff an Gerät angeschlossen"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokale Internetverbindung für Gerät freigeben"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Für Internetzugriff verwenden"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Für Karte verwenden"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Für SIM-Zugriff verwenden"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Für Audiosystem von Medien verwenden"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Für Audiosystem des Telefons verwenden"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Für Dateiübertragung verwenden"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Für Eingabe verwenden"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pairing durchführen"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"Pairing durchführen"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Abbrechen"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Über das Pairing kann auf Ihre Kontakte und auf Ihren Anrufverlauf zugegriffen werden, wenn eine Verbindung besteht."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Pairing mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> war nicht möglich, weil die eingegebene PIN oder der Zugangscode falsch ist."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kommunikation mit <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ist nicht möglich."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Verbindung wurde von <xliff:g id="DEVICE_NAME">%1$s</xliff:g> abgelehnt."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"WLAN: aus"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"WLAN getrennt"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"WLAN: ein Balken"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"WLAN: zwei Balken"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"WLAN: drei Balken"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"WLAN: volle Signalstärke"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-el/arrays.xml b/packages/SettingsLib/res/values-el/arrays.xml
new file mode 100644
index 0000000..f616547
--- /dev/null
+++ b/packages/SettingsLib/res/values-el/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Σάρωση..."</item>
+    <item msgid="8513729475867537913">"Σύνδεση..."</item>
+    <item msgid="515055375277271756">"Έλεγχος ταυτότητας..."</item>
+    <item msgid="1943354004029184381">"Λήψη διεύθυνσης IP…"</item>
+    <item msgid="4221763391123233270">"Συνδεδεμένο"</item>
+    <item msgid="624838831631122137">"Σε αναστολή"</item>
+    <item msgid="7979680559596111948">"Αποσύνδεση..."</item>
+    <item msgid="1634960474403853625">"Αποσυνδέθηκε"</item>
+    <item msgid="746097431216080650">"Ανεπιτυχής"</item>
+    <item msgid="6367044185730295334">"Αποκλεισμένο"</item>
+    <item msgid="503942654197908005">"Προσωρινή αποφυγή αδύναμης σύνδεσης"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"Αποσύνδεση από <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Αποσυνδέθηκε"</item>
+    <item msgid="8578370891960825148">"Ανεπιτυχής"</item>
+    <item msgid="5660739516542454527">"Αποκλεισμένο"</item>
+    <item msgid="1805837518286731242">"Προσωρινή αποφυγή αδύναμης σύνδεσης"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml
new file mode 100644
index 0000000..48ff636
--- /dev/null
+++ b/packages/SettingsLib/res/values-el/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Δεν είναι δυνατή η σάρωση για δίκτυα"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Καμία"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Αποθηκευμένο"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Απενεργοποιημένο"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Αποτυχία διαμόρφωσης διεύθυνσης IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Αποτυχία σύνδεσης Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Πρόβλημα ελέγχου ταυτότητας"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Εκτός εμβέλειας"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Δεν εντοπίστηκε καμία πρόσβαση στο διαδίκτυο, δεν θα γίνει αυτόματη επανασύνδεση."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Αποθηκεύτηκε από <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Σύνδεση μέσω βοηθού Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Συνδέθηκε μέσω %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Διαθέσιμο μέσω %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Συνδέθηκε, χωρίς διαδίκτυο"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Αποσυνδέθηκε"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Αποσύνδεση..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Σύνδεση..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Συνδεδεμένο"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Σύζευξη..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Συνδεδεμένο (όχι τηλ.)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Συνδεδεμένο (όχι μέσα)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Συνδεδεμένο (χωρίς πρόσβαση μηνύματος)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Συνδεδεμένο (χωρίς τηλέφωνο ή πολυμέσα)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Ήχος πολυμέσων"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Ήχος τηλεφώνου"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Μεταφορά αρχείου"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Συσκευή εισόδου"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Πρόσβαση στο Διαδίκτυο"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Κοινή χρήση επαφών"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Για κοινή χρήση επαφών"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Κοινή χρήση σύνδεσης στο Διαδίκτυο"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Πρόσβαση στο μήνυμα"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Πρόσβαση SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Συνδέθηκε σε ήχο πολυμέσων"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Συνδεδεμένο στον ήχο τηλεφώνου"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Συνδεδεμένο σε διακομιστή μεταφοράς αρχείων"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Συνδεδεμένο στο χάρτη"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Συνδέθηκε σε SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Δεν έχει συνδεθεί σε διακομιστή μεταφοράς αρχείων"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Συνδέθηκε σε συσκευή εισόδου"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Συνδέθηκε με συσκευή με πρόσβ. στο Διαδ."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Κοιν. χρ. σύνδ. στο Διαδ. με συσκευή"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Χρήση για την πρόσβαση στο Διαδίκτυο"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Χρήση για χάρτη"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Χρήση για πρόσβαση στη SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Χρήση για ήχο πολυμέσων"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Χρήση για ήχο τηλεφώνου"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Χρήση για τη μεταφορά αρχείων"</string>
+    <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_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> λόγω εσφαλμένου αριθμού PIN ή κλειδιού πρόσβασης."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Δεν είναι δυνατή η σύνδεση με τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Η ζεύξη απορρίφθηκε από τη συσκευή <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi ανενεργό."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Το Wi-Fi έχει αποσυνδεθεί."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Μία γραμμή Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Δύο γραμμές Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Τρεις γραμμές Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Άριστο σήμα Wi-Fi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rAU/arrays.xml b/packages/SettingsLib/res/values-en-rAU/arrays.xml
new file mode 100644
index 0000000..8fa3918
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rAU/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Scanning…"</item>
+    <item msgid="8513729475867537913">"Connecting…"</item>
+    <item msgid="515055375277271756">"Authenticating…"</item>
+    <item msgid="1943354004029184381">"Obtaining IP address…"</item>
+    <item msgid="4221763391123233270">"Connected"</item>
+    <item msgid="624838831631122137">"Suspended"</item>
+    <item msgid="7979680559596111948">"Disconnecting…"</item>
+    <item msgid="1634960474403853625">"Disconnected"</item>
+    <item msgid="746097431216080650">"Unsuccessful"</item>
+    <item msgid="6367044185730295334">"Blocked"</item>
+    <item msgid="503942654197908005">"Temporarily avoiding poor connection"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Scanning…"</item>
+    <item msgid="355508996603873860">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Authenticating with <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obtaining IP address from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspended"</item>
+    <item msgid="7698638434317271902">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Disconnected"</item>
+    <item msgid="8578370891960825148">"Unsuccessful"</item>
+    <item msgid="5660739516542454527">"Blocked"</item>
+    <item msgid="1805837518286731242">"Temporarily avoiding poor connection"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml
new file mode 100644
index 0000000..ccbbdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rAU/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Can\'t scan for networks"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Configuration Failure"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi Connection Failure"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No Internet Access Detected, won\'t automatically reconnect."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Saved by <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Connected via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Available via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Connected, no Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnected"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnecting…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connecting…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Connected"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connected (no phone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connected (no media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connected (no message access)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connected (no phone or media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Phone audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"File transfer"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Input device"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internet access"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Contact sharing"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Use for contact sharing"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Access"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connected to map"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Connected to SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Not connected to file-transfer server"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connected to input device"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connected to device for Internet access"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Sharing local Internet connection with device"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Use for Internet access"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Use for map"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Use for SIM access"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Use for media audio"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Use for phone audio"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Use for file transfer"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Use for input"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pair"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAIR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Pairing grants access to your contacts and call history when connected."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g> because of an incorrect PIN or passkey."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Can\'t communicate with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pairing rejected by <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi off."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi disconnected."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi one bar."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi two bars."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi three bars."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi signal full."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rGB/arrays.xml b/packages/SettingsLib/res/values-en-rGB/arrays.xml
new file mode 100644
index 0000000..8fa3918
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rGB/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Scanning…"</item>
+    <item msgid="8513729475867537913">"Connecting…"</item>
+    <item msgid="515055375277271756">"Authenticating…"</item>
+    <item msgid="1943354004029184381">"Obtaining IP address…"</item>
+    <item msgid="4221763391123233270">"Connected"</item>
+    <item msgid="624838831631122137">"Suspended"</item>
+    <item msgid="7979680559596111948">"Disconnecting…"</item>
+    <item msgid="1634960474403853625">"Disconnected"</item>
+    <item msgid="746097431216080650">"Unsuccessful"</item>
+    <item msgid="6367044185730295334">"Blocked"</item>
+    <item msgid="503942654197908005">"Temporarily avoiding poor connection"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Scanning…"</item>
+    <item msgid="355508996603873860">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Authenticating with <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obtaining IP address from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspended"</item>
+    <item msgid="7698638434317271902">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Disconnected"</item>
+    <item msgid="8578370891960825148">"Unsuccessful"</item>
+    <item msgid="5660739516542454527">"Blocked"</item>
+    <item msgid="1805837518286731242">"Temporarily avoiding poor connection"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml
new file mode 100644
index 0000000..ccbbdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rGB/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Can\'t scan for networks"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Configuration Failure"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi Connection Failure"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No Internet Access Detected, won\'t automatically reconnect."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Saved by <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Connected via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Available via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Connected, no Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnected"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnecting…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connecting…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Connected"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connected (no phone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connected (no media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connected (no message access)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connected (no phone or media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Phone audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"File transfer"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Input device"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internet access"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Contact sharing"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Use for contact sharing"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Access"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connected to map"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Connected to SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Not connected to file-transfer server"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connected to input device"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connected to device for Internet access"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Sharing local Internet connection with device"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Use for Internet access"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Use for map"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Use for SIM access"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Use for media audio"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Use for phone audio"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Use for file transfer"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Use for input"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pair"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAIR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Pairing grants access to your contacts and call history when connected."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g> because of an incorrect PIN or passkey."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Can\'t communicate with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pairing rejected by <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi off."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi disconnected."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi one bar."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi two bars."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi three bars."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi signal full."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rIN/arrays.xml b/packages/SettingsLib/res/values-en-rIN/arrays.xml
new file mode 100644
index 0000000..8fa3918
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rIN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Scanning…"</item>
+    <item msgid="8513729475867537913">"Connecting…"</item>
+    <item msgid="515055375277271756">"Authenticating…"</item>
+    <item msgid="1943354004029184381">"Obtaining IP address…"</item>
+    <item msgid="4221763391123233270">"Connected"</item>
+    <item msgid="624838831631122137">"Suspended"</item>
+    <item msgid="7979680559596111948">"Disconnecting…"</item>
+    <item msgid="1634960474403853625">"Disconnected"</item>
+    <item msgid="746097431216080650">"Unsuccessful"</item>
+    <item msgid="6367044185730295334">"Blocked"</item>
+    <item msgid="503942654197908005">"Temporarily avoiding poor connection"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Scanning…"</item>
+    <item msgid="355508996603873860">"Connecting to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Authenticating with <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obtaining IP address from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Connected to <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspended"</item>
+    <item msgid="7698638434317271902">"Disconnecting from <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Disconnected"</item>
+    <item msgid="8578370891960825148">"Unsuccessful"</item>
+    <item msgid="5660739516542454527">"Blocked"</item>
+    <item msgid="1805837518286731242">"Temporarily avoiding poor connection"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml
new file mode 100644
index 0000000..ccbbdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rIN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Can\'t scan for networks"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Saved"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disabled"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Configuration Failure"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi Connection Failure"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authentication problem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Not in range"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No Internet Access Detected, won\'t automatically reconnect."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Saved by <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connected via Wi‑Fi assistant"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Connected via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Available via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Connected, no Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnected"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnecting…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connecting…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Connected"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pairing…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connected (no phone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connected (no media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connected (no message access)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connected (no phone or media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Phone audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"File transfer"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Input device"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internet access"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Contact sharing"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Use for contact sharing"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Access"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connected to map"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Connected to SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Not connected to file-transfer server"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connected to input device"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connected to device for Internet access"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Sharing local Internet connection with device"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Use for Internet access"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Use for map"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Use for SIM access"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Use for media audio"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Use for phone audio"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Use for file transfer"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Use for input"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pair"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAIR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancel"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Pairing grants access to your contacts and call history when connected."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Couldn\'t pair with <xliff:g id="DEVICE_NAME">%1$s</xliff:g> because of an incorrect PIN or passkey."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Can\'t communicate with <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pairing rejected by <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi off."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi disconnected."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi one bar."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi two bars."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi three bars."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi signal full."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rPT/arrays.xml b/packages/SettingsLib/res/values-en-rPT/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rPT/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-en-rPT/strings.xml b/packages/SettingsLib/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-en-rPT/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-eo/arrays.xml b/packages/SettingsLib/res/values-eo/arrays.xml
new file mode 100644
index 0000000..e58c1d5
--- /dev/null
+++ b/packages/SettingsLib/res/values-eo/arrays.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <string-array name="wifi_status">
+    <!-- Status message of Wi-Fi when it is idle. -->
+    <item/>
+    <!-- Status message of Wi-Fi when it is scanning. -->
+    <item>Scanning\u2026</item>
+    <!-- Status message of Wi-Fi when it is connecting. -->
+    <item>Connecting\u2026</item>
+    <!-- Status message of Wi-Fi when it is authenticating. -->
+    <item>Authenticating\u2026</item>
+    <!-- Status message of Wi-Fi when it is obtaining IP address. -->
+    <item>Obtaining IP address\u2026</item>
+    <!-- Status message of Wi-Fi when it is connected. -->
+    <item>Konektita</item>
+    <!-- Status message of Wi-Fi when it is suspended. -->
+    <item>Suspended</item>
+    <!-- Status message of Wi-Fi when it is disconnecting. -->
+    <item>Disconnecting\u2026</item>
+    <!-- Status message of Wi-Fi when it is disconnected. -->
+    <item>Malkonektita</item>
+    <!-- Status message of Wi-Fi when it is a failure. -->
+    <item>Unsuccessful</item>
+    <!-- Status message of Wi-Fi when it is blocked. -->
+    <item>Blocked</item>
+    <!-- Status message of Wi-Fi when connectiong is being verified. -->
+    <item>Temporarily avoiding poor connection</item>
+  </string-array>
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+  <string-array name="wifi_status_with_ssid">
+    <!-- Status message of Wi-Fi when it is idle. -->
+    <item/>
+    <!-- Status message of Wi-Fi when it is scanning. -->
+    <item>Scanning\u2026</item>
+    <!-- Status message of Wi-Fi when it is connecting to a network. -->
+    <item>Connecting to <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <!-- Status message of Wi-Fi when it is authenticating with a network. -->
+    <item>Authenticating with <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <!-- Status message of Wi-Fi when it is obtaining IP address from a network. -->
+    <item>Obtaining IP address from <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <!-- Status message of Wi-Fi when it is connected to a network. -->
+    <item>Connected to <xliff:g id="network_name">%1$s</xliff:g></item>
+    <!-- Status message of Wi-Fi when it is suspended. -->
+    <item>Suspended</item>
+    <!-- Status message of Wi-Fi when it is disconnecting from a network. -->
+    <item>Disconnecting from <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
+    <!-- Status message of Wi-Fi when it is disconnected. -->
+    <item>Malkonektita</item>
+    <!-- Status message of Wi-Fi when it is a failure. -->
+    <item>Unsuccessful</item>
+    <!-- Status message of Wi-Fi when it is blocked. -->
+    <item>Blocked</item>
+    <!-- Status message of Wi-Fi when connectiong is being verified. -->
+    <item>Temporarily avoiding poor connection</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-eo/strings.xml b/packages/SettingsLib/res/values-eo/strings.xml
new file mode 100644
index 0000000..8af20e3
--- /dev/null
+++ b/packages/SettingsLib/res/values-eo/strings.xml
@@ -0,0 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <string name="wifi_remembered">Konservita</string>
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <string name="bluetooth_disconnected">Malkonektita</string>
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <string name="bluetooth_connected">Konektita</string>
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <string name="bluetooth_pairing_decline">Nuligi</string>
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <string name="data_usage_uninstalled_apps">Forigitaj aplikaĵoj</string>
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <string name="data_usage_uninstalled_apps_users">Forigitaj aplikaĵoj kaj uzantoj</string>
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <string name="user_guest">Gasto</string>
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-es-rCO/arrays.xml b/packages/SettingsLib/res/values-es-rCO/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rCO/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-es-rCO/strings.xml b/packages/SettingsLib/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rCO/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-es-rMX/arrays.xml b/packages/SettingsLib/res/values-es-rMX/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rMX/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-es-rMX/cm_strings.xml b/packages/SettingsLib/res/values-es-rMX/cm_strings.xml
new file mode 100644
index 0000000..8f368b9
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rMX/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplicaciones</string>
+  <string name="picker_activities">Actividades</string>
+  <string name="select_custom_app_title">Seleccionar aplicación personalizada</string>
+  <string name="select_custom_activity_title">Seleccionar actividad personalizada</string>
+  <string name="lockscreen_targets_message">Atajos de la pantalla de bloqueo</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-es-rMX/strings.xml b/packages/SettingsLib/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rMX/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-es-rUS/arrays.xml b/packages/SettingsLib/res/values-es-rUS/arrays.xml
new file mode 100644
index 0000000..5947056
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rUS/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Explorando..."</item>
+    <item msgid="8513729475867537913">"Conectando…"</item>
+    <item msgid="515055375277271756">"Autenticando…"</item>
+    <item msgid="1943354004029184381">"Obteniendo la dirección IP…"</item>
+    <item msgid="4221763391123233270">"Conectado"</item>
+    <item msgid="624838831631122137">"Suspendido"</item>
+    <item msgid="7979680559596111948">"Desconectando…"</item>
+    <item msgid="1634960474403853625">"Desconectado"</item>
+    <item msgid="746097431216080650">"Incorrecto"</item>
+    <item msgid="6367044185730295334">"Bloqueada"</item>
+    <item msgid="503942654197908005">"Desactivando mala conexión  temporalmente"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Explorando..."</item>
+    <item msgid="355508996603873860">"Conectando a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Autenticando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obteniendo dirección IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspendido"</item>
+    <item msgid="7698638434317271902">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Desconectado"</item>
+    <item msgid="8578370891960825148">"Incorrecto"</item>
+    <item msgid="5660739516542454527">"Bloqueada"</item>
+    <item msgid="1805837518286731242">"Desactivando mala conexión  temporalmente"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-es-rUS/cm_strings.xml b/packages/SettingsLib/res/values-es-rUS/cm_strings.xml
new file mode 100644
index 0000000..ed7c702
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rUS/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplicaciones</string>
+  <string name="picker_activities">Actividades</string>
+  <string name="select_custom_app_title">Seleccionar aplicación personalizada</string>
+  <string name="select_custom_activity_title">Seleccionar actividad personalizada</string>
+  <string name="lockscreen_targets_message">Atajos de la pantalla bloqueada</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml
new file mode 100644
index 0000000..67e9114
--- /dev/null
+++ b/packages/SettingsLib/res/values-es-rUS/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No se pueden buscar las redes."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitada"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuración IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de conexión Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de alcance"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No se detectó el acceso a Internet. No se volverá a conectar de forma automática."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Guardadas por <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conexión por asistente de Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Conexión a través de %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponible a través de %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Conectado a Wi-Fi, sin conexión a Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Vinculando..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sin acceso a mensajes)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin tel. ni audio multimedia)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio del dispositivo"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de archivos"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartir contactos"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utilizar para compartir contactos"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso a mensajes"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acceso SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio multimedia"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del dispositivo"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado al servidor de transferencia de archivo"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado al mapa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Conexión a SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"No conectado al servidor de transferencia de archivo"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado a un dispositivo para acceder a Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Conexión a Internet local compartida con dispositivo"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acceso a Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Usar para acceder a la SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para el audio multimedia"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para el audio del dispositivo"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para la transferencia de archivos"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Vincular"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SINCRONIZAR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"La sincronización te permite acceder a los contactos y al historial de llamadas cuando el dispositivo está conectado."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No se pudo sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No se pudo sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que el PIN o la clave de acceso son incorrectos."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No se puede establecer la comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vínculo rechazado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi inhabilitado"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi desconectado"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Una barra de Wi-Fi"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Dos barras de Wi-Fi"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Tres barras de Wi-Fi"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Señal de Wi-Fi excelente"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-es/arrays.xml b/packages/SettingsLib/res/values-es/arrays.xml
new file mode 100644
index 0000000..ba51a81
--- /dev/null
+++ b/packages/SettingsLib/res/values-es/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Buscando..."</item>
+    <item msgid="8513729475867537913">"Estableciendo conexión..."</item>
+    <item msgid="515055375277271756">"Autenticando..."</item>
+    <item msgid="1943354004029184381">"Obteniendo dirección IP…"</item>
+    <item msgid="4221763391123233270">"Conexión establecida"</item>
+    <item msgid="624838831631122137">"Suspendida"</item>
+    <item msgid="7979680559596111948">"Desconectando..."</item>
+    <item msgid="1634960474403853625">"Desconectada"</item>
+    <item msgid="746097431216080650">"Con error"</item>
+    <item msgid="6367044185730295334">"Bloqueada"</item>
+    <item msgid="503942654197908005">"Inhabilitando conexión inestable temporalmente..."</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Buscando..."</item>
+    <item msgid="355508996603873860">"Estableciendo conexión con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Autenticando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obteniendo dirección IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Conexión establecida con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspendida"</item>
+    <item msgid="7698638434317271902">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Desconectada"</item>
+    <item msgid="8578370891960825148">"Con error"</item>
+    <item msgid="5660739516542454527">"Bloqueada"</item>
+    <item msgid="1805837518286731242">"Inhabilitando conexión inestable temporalmente..."</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-es/cm_strings.xml b/packages/SettingsLib/res/values-es/cm_strings.xml
new file mode 100644
index 0000000..8f368b9
--- /dev/null
+++ b/packages/SettingsLib/res/values-es/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplicaciones</string>
+  <string name="picker_activities">Actividades</string>
+  <string name="select_custom_app_title">Seleccionar aplicación personalizada</string>
+  <string name="select_custom_activity_title">Seleccionar actividad personalizada</string>
+  <string name="lockscreen_targets_message">Atajos de la pantalla de bloqueo</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml
new file mode 100644
index 0000000..30983dd
--- /dev/null
+++ b/packages/SettingsLib/res/values-es/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"No se puede buscar redes."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Guardado"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inhabilitado"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Error de configuración de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Error de conexión Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Error de autenticación"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuera de rango"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"No se ha detectado acceso a Internet, no se volverá a conectar automáticamente."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Guardadas por <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado a través de asistente Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Conectado a través de %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponible a través de %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Conexión sin Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectada"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Estableciendo conexión…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Vinculando…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sin teléfono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sin audio multimedia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sin acceso a mensajes)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sin teléfono ni multimedia)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio del teléfono"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de archivos"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartir contactos"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Usar para compartir contactos"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso a mensajes"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acceso a tarjeta SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio del medio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado con el servidor de transferencia de archivos"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado a mapa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Conectado a SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Sin conexión con el servidor de transferencia de archivos"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado a dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado para acceso a Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compartiendo conexión a Internet con el dispositivo"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acceder a Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Utilizar para acceso a tarjeta SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para audio de medio"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para audio del teléfono"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uso de la transferencia de archivos"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Vincular"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"VINCULAR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"La vinculación permite acceder a tus contactos y al historial de llamadas cuando el dispositivo está conectado."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"No se ha podido vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"No se ha podido vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> porque la clave de acceso o el PIN son incorrectos."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"No se puede establecer comunicación con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Vinculación rechazada por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi desactivado."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi desconectado."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Una barra de Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Dos barras de Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Tres barras de Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Señal de Wi-Fi al máximo."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-et-rEE/arrays.xml b/packages/SettingsLib/res/values-et-rEE/arrays.xml
new file mode 100644
index 0000000..2a8f69b
--- /dev/null
+++ b/packages/SettingsLib/res/values-et-rEE/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Skannimine…"</item>
+    <item msgid="8513729475867537913">"Ühenduse loomine…"</item>
+    <item msgid="515055375277271756">"Autentimine…"</item>
+    <item msgid="1943354004029184381">"IP-aadressi hankimine…"</item>
+    <item msgid="4221763391123233270">"Ühendatud"</item>
+    <item msgid="624838831631122137">"Peatatud"</item>
+    <item msgid="7979680559596111948">"Ühenduse katkestamine…"</item>
+    <item msgid="1634960474403853625">"Ühendus katkestatud"</item>
+    <item msgid="746097431216080650">"Ebaõnnestus"</item>
+    <item msgid="6367044185730295334">"Blokeeritud"</item>
+    <item msgid="503942654197908005">"Kehva ühenduse ajutine vältimine"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Skannimine…"</item>
+    <item msgid="355508996603873860">"Ühendamine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Autentimine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"IP-aadressi hankimine võrgust <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Ühendatud võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Peatatud"</item>
+    <item msgid="7698638434317271902">"Ühenduse katkestamine võrguga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Ühendus katkestatud"</item>
+    <item msgid="8578370891960825148">"Ebaõnnestus"</item>
+    <item msgid="5660739516542454527">"Blokeeritud"</item>
+    <item msgid="1805837518286731242">"Kehva ühenduse ajutine vältimine"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-et-rEE/cm_strings.xml b/packages/SettingsLib/res/values-et-rEE/cm_strings.xml
new file mode 100644
index 0000000..1658fb1
--- /dev/null
+++ b/packages/SettingsLib/res/values-et-rEE/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Rakendused</string>
+  <string name="picker_activities">Tegevused</string>
+  <string name="select_custom_app_title">Vali kohandatud rakendus</string>
+  <string name="select_custom_activity_title">Vali kohandatud tegevus</string>
+  <string name="lockscreen_targets_message">Lukustuskuva otseteed</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-et-rEE/strings.xml b/packages/SettingsLib/res/values-et-rEE/strings.xml
new file mode 100644
index 0000000..af58a91
--- /dev/null
+++ b/packages/SettingsLib/res/values-et-rEE/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Võrke ei saa kontrollida"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Puudub"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Salvestatud"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Keelatud"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP seadistamise ebaõnnestumine"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-ühenduse viga"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentimise probleem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Pole vahemikus"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Interneti-ühendust ei tuvastatud, seadet ei ühendata automaatselt."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Salvestas: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ühendatud WiFi-abi kaudu"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Ühendatud üksuse %1$s kaudu"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Saadaval üksuse %1$s kaudu"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Ühendatud, Interneti-ühendus puudub"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ühendus katkestatud"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ühenduse katkestamine ..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Ühendamine ..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Ühendatud"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Sidumine ..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ühendatud (telefoni pole)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ühendatud (meediat pole)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ühendatud (sõnumita juurdepääs)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ühendatud (pole telefoni ega meediat)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Meedia heli"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefoni heli"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Failiedastus"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Sisendseade"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetti juurdepääs"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontakti jagamine"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Kasutamine kontaktide jagamiseks"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneti-ühenduse jagamine"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Juurdepääs sõnumile"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-kaardi juurdepääs"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ühendatud meediumiheliga"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ühendatud telefoniheliga"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ühendatud failiedastuse serveriga"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ühendatud kaardiga"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Ühendatud SAP-iga"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ei ole failiedastuse serveriga ühendatud"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ühendatud sisendseade"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ühendatud seadmega Internetti juurdepääsuks"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Kohaliku Interneti-ühenduse jagamine seadmega"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Interneti-juurdepääsuks kasutamine"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Kasuta kaardi jaoks"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM-kaardi juurdepääsuks kasutamine"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Kasuta meediumiheli jaoks"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Kasuta telefoniheli jaoks"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Kasutage failide edastamiseks"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Kasutage sisendi jaoks"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Seo"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SEO"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Tühista"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Sidumine annab ühenduse ajal juurdepääsu kontaktidele ja kõneajaloole."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ei saanud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> siduda."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ei saanud seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> siduda vale PIN-koodi või parooli tõttu."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Seadmega <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ei saa sidet luua."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hülgas sidumise."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"WiFi on välja lülitatud."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"WiFi-ühendus on katkestatud."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"WiFi: üks pulk."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"WiFi: kaks pulka."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"WiFi: kolm pulka."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"WiFi-signaal on tugev."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-eu-rES/arrays.xml b/packages/SettingsLib/res/values-eu-rES/arrays.xml
new file mode 100644
index 0000000..7746f01
--- /dev/null
+++ b/packages/SettingsLib/res/values-eu-rES/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Bilatzen…"</item>
+    <item msgid="8513729475867537913">"Konektatzen…"</item>
+    <item msgid="515055375277271756">"Autentifikatzen…"</item>
+    <item msgid="1943354004029184381">"IP helbidea lortzen…"</item>
+    <item msgid="4221763391123233270">"Konektatuta"</item>
+    <item msgid="624838831631122137">"Etenda"</item>
+    <item msgid="7979680559596111948">"Deskonektatzen…"</item>
+    <item msgid="1634960474403853625">"Deskonektatuta"</item>
+    <item msgid="746097431216080650">"Ezin izan da konektatu"</item>
+    <item msgid="6367044185730295334">"Blokeatuta"</item>
+    <item msgid="503942654197908005">"Konexio ahula aldi baterako saihesten"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Bilatzen…"</item>
+    <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> sarera konektatzen…"</item>
+    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> sarearekin autentifikatzen…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> sarearen IP helbidea lortzen…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> sarera konektatuta"</item>
+    <item msgid="1330262655415760617">"Etenda"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> saretik deskonektatzen…"</item>
+    <item msgid="197508606402264311">"Deskonektatuta"</item>
+    <item msgid="8578370891960825148">"Ezin izan da konektatu"</item>
+    <item msgid="5660739516542454527">"Blokeatuta"</item>
+    <item msgid="1805837518286731242">"Konexio ahula aldi baterako saihesten"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-eu-rES/strings.xml b/packages/SettingsLib/res/values-eu-rES/strings.xml
new file mode 100644
index 0000000..f500557
--- /dev/null
+++ b/packages/SettingsLib/res/values-eu-rES/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ezin dira sareak bilatu"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Bat ere ez"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gordeta"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desgaituta"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ezin izan da konfiguratu IP helbidea"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ezin izan da konektatu Wi-Fi sarera"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikazio-arazoa"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Urrunegi"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ez da hauteman Interneterako sarbiderik. Ez da automatikoki berriro konektatuko."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> aplikazioak gorde du"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi laguntzailearen bidez konektatuta"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s bidez konektatuta"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s bidez erabilgarri"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Konektatuta, ez dago Interneteko konexiorik"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deskonektatuta"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Deskonektatzen…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Konektatzen…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Konektatuta"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parekatzen…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Konektatuta (ez dago telefonorik)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Konektatuta (ez dago euskarririk)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Konektatuta (mezuetarako sarbiderik ez)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Konektatuta (ez dago telef./euskarririk)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Euskarriaren audioa"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonoaren audioa"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Fitxategi-transferentzia"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Sarrerako gailua"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Interneterako sarbidea"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktuak partekatzea"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Erabili kontaktuak partekatzeko"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneteko konexioa partekatzea"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mezuetarako sarbidea"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM txartelerako sarbidea"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Euskarriaren audiora konektatuta"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefonoaren audiora konektatuta"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Fitxategi-transferentziako zerbitzarira konektatuta"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Mapara konektatuta"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP sarbide-puntura konektatuta"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Fitxategi-transferentziako zerbitzarira konektatu gabe"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Sarrerako gailura konektatuta"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Gailura konektatuta Interneteko sarbiderako"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Tokiko Interneteko konexioa gailu batekin partekatzea"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Erabili Interneteko sarbiderako"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Erabili maparako"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Erabili SIM txartelerako sarbiderako"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Erabili euskarriaren audiorako"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Erabili telefonoaren audiorako"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Erabili fitxategi-transferentziarako"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Erabili idazketarako"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parekatu"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAREKATU"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Utzi"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Gailuak parekatzen badituzu, batetik besteko kontaktuak eta deien historia atzitu ahal izango dituzu."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatu."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ezin izan da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin parekatu PIN edo pasakode okerra idatzi delako."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ezin da <xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuarekin komunikatu."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> gailuak bikotetzea ukatu du."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Desaktibatuta dago Wi-Fi konexioa."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Deskonektatu egin da Wi-Fi konexioa."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi sarearen barra bat."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi sarearen bi barra."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi sarearen hiru barra."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi sarearen seinalea osoa."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-fa/arrays.xml b/packages/SettingsLib/res/values-fa/arrays.xml
new file mode 100644
index 0000000..1781c79
--- /dev/null
+++ b/packages/SettingsLib/res/values-fa/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"اسکن کردن..."</item>
+    <item msgid="8513729475867537913">"در حال اتصال…"</item>
+    <item msgid="515055375277271756">"در حال تأیید اعتبار..."</item>
+    <item msgid="1943354004029184381">"‏در حال دریافت آدرس IP..."</item>
+    <item msgid="4221763391123233270">"متصل"</item>
+    <item msgid="624838831631122137">"معلق"</item>
+    <item msgid="7979680559596111948">"در حال قطع اتصال..."</item>
+    <item msgid="1634960474403853625">"اتصال قطع شد"</item>
+    <item msgid="746097431216080650">"ناموفق"</item>
+    <item msgid="6367044185730295334">"مسدود شده"</item>
+    <item msgid="503942654197908005">"جلوگیری موقت از اتصال ضعیف"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"اتصال قطع شد از <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"اتصال قطع شد"</item>
+    <item msgid="8578370891960825148">"ناموفق"</item>
+    <item msgid="5660739516542454527">"مسدود شده"</item>
+    <item msgid="1805837518286731242">"جلوگیری موقت از اتصال ضعیف"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml
new file mode 100644
index 0000000..2968913
--- /dev/null
+++ b/packages/SettingsLib/res/values-fa/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"اسکن شبکه‌ها امکان‌پذیر نیست"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"هیچ‌کدام"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"ذخیره‌شده"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیرفعال شد"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏پیکربندی IP انجام نشد"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏اتصال Wi-Fi برقرار نشد"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"مشکل تأیید اعتبار"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"در محدوده نیست"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"دسترسی به اینترنت شناسایی نشد، به صورت خودکار وصل نمی‌شود."</string>
+    <string name="saved_network" msgid="4352716707126620811">"ذخیره‌شده توسط <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏متصل شده از طریق دستیار Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"‏متصل از طریق %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"‏دردسترس از طریق %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"متصل، بدون اینترنت"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"اتصال قطع شد"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"در حال قطع اتصال..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"در حال اتصال…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"متصل"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"در حال مرتبط‌سازی..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"متصل شد (بدون تلفن)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"متصل شد (بدون رسانه)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"متصل (عدم دسترسی به پیام)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"متصل شد (بدون تلفن یا رسانه)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"رسانه صوتی"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"صدای تلفن"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"انتقال فایل"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"دستگاه ورودی"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"دسترسی به اینترنت"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"اشتراک‌گذاری مخاطب"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"استفاده برای اشتراک‌گذاری مخاطب"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"اشتراک‌گذاری اتصال اینترنت"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"دسترسی به پیام"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"دسترسی سیم‌کارت"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"به رسانه صوتی متصل شد"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"به تلفن صوتی متصل شد"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"به سرور انتقال فایل متصل شد"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"به نقشه متصل شد"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"‏متصل به SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"به سرور انتقال فایل متصل نیست"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"به دستگاه ورودی متصل شد"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"برای دسترسی به اینترنت، به دستگاه متصل شد"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"اشتراک‌گذاری اتصال اینترنت محلی با دستگاه"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"استفاده برای دسترسی به اینترنت"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"استفاده برای نقشه"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"استفاده برای دسترسی سیم‌کارت"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"استفاده برای رسانه صوتی"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"استفاده برای تلفن صوتی"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"استفاده برای انتقال فایل"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ارتباط با <xliff:g id="DEVICE_NAME">%1$s</xliff:g> امکان‌پذیر نیست."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> مرتبط‌سازی را رد کرد."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"‏Wi‑Fi خاموش است."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"‏Wi-Fi قطع‌ شد."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"‏یک نوار برای Wi‑Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"‏دو نوار برای Wi‑Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"‏سه نوار برای Wi‑Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"‏قدرت سیگنال Wi‑Fi کامل است."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-fi/arrays.xml b/packages/SettingsLib/res/values-fi/arrays.xml
new file mode 100644
index 0000000..76cf49b
--- /dev/null
+++ b/packages/SettingsLib/res/values-fi/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Etsitään..."</item>
+    <item msgid="8513729475867537913">"Yhdistetään…"</item>
+    <item msgid="515055375277271756">"Varmennetaan…"</item>
+    <item msgid="1943354004029184381">"Haetaan IP-osoitetta..."</item>
+    <item msgid="4221763391123233270">"Yhdistetty"</item>
+    <item msgid="624838831631122137">"Pidätetty"</item>
+    <item msgid="7979680559596111948">"Katkaistaan yhteyttä..."</item>
+    <item msgid="1634960474403853625">"Yhteys katkaistu"</item>
+    <item msgid="746097431216080650">"Epäonnistui"</item>
+    <item msgid="6367044185730295334">"Estetty"</item>
+    <item msgid="503942654197908005">"Vältetään huonoa yhteyttä tilapäisesti"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Etsitään..."</item>
+    <item msgid="355508996603873860">"Yhdistetään verkkoon <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Varmennetaan verkkoon <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Haetaan IP-osoitetta verkosta <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Yhdistetty verkkoon <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Pidätetty"</item>
+    <item msgid="7698638434317271902">"Katkaistaan yhteys verkosta <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Yhteys katkaistu"</item>
+    <item msgid="8578370891960825148">"Epäonnistui"</item>
+    <item msgid="5660739516542454527">"Estetty"</item>
+    <item msgid="1805837518286731242">"Vältetään huonoa yhteyttä tilapäisesti"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml
new file mode 100644
index 0000000..9ef1087
--- /dev/null
+++ b/packages/SettingsLib/res/values-fi/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Verkkoja ei voi etsiä."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ei mitään"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Tallennettu"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Pois käytöstä"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-kokoonpanovirhe"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-yhteysvirhe"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Todennusvirhe"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ei kantoalueella"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Internetyhteyttä ei havaittu, yhteyttä ei muodosteta automaattisesti uudelleen."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Tallentaja: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Yhteys muodostettu Wi‑Fi-apurin kautta"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Yhdistetty seuraavan kautta: %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Käytettävissä seuraavan kautta: %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Yhdistetty, ei internetyhteyttä."</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Yhteys katkaistu"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Katkaistaan yhteyttä..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Yhdistetään…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Yhdistetty"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Laiteparia muodostetaan..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Yhdistetty (ei puhelimen ääntä)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Yhdistetty (ei median ääntä)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Yhdistetty (ei MAP)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Yhdistetty (ei puhelimen/median ääntä)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Median ääni"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Puhelimen ääni"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Tiedostonsiirto"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Syöttölaite"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetyhteys"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Yhteystietojen jakaminen"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Käytä yhteystietojen jakamiseen"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetyhteyden jakaminen"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"MAP"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-kortin käyttö"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Yhdistetty median ääneen"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Yhdistetty puhelimen ääneen"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Yhdistetty tiedostonsiirtopalvelimeen"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"MAP-yhteys"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP-yhteys on muodostettu."</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ei yhdistetty tiedostonsiirtopalvelimeen"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Yhdistetty syöttölaitteeseen"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Yhdistetty laitteen internetyhteyteen"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Paikallinen internetyhteys jaetaan laitteen kanssa"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Käytä internetyhteyteen"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Käytä MAP-profiilille"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Käytetään SIM-kortin käyttöoikeuden määrittämiseen."</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Käytä median äänille"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Käytä puhelimen äänille"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Käytä tiedostojen siirtoon"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Käytä syöttöön"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Muodosta laitepari"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"MUODOSTA LAITEPARI"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Peruuta"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Laiteparin muodostaminen mahdollistaa yhteystietojen ja soittohistorian käyttämisen yhteyden aikana."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Laiteparin muodostaminen laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> epäonnistui."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Laiteparia laitteen <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kanssa ei voitu muodostaa, koska PIN-koodi tai avain oli virheellinen."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ei yhteyttä laitteeseen <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Laite <xliff:g id="DEVICE_NAME">%1$s</xliff:g> torjui laitepariyhteyden."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi pois käytöstä"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Ei Wi-Fi-yhteyttä"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi-signaali – yksi palkki"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi-signaali – kaksi palkkia"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi-signaali – kolme palkkia"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Vahva Wi-Fi-signaali"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-fr-rCA/arrays.xml b/packages/SettingsLib/res/values-fr-rCA/arrays.xml
new file mode 100644
index 0000000..991d824
--- /dev/null
+++ b/packages/SettingsLib/res/values-fr-rCA/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Recherche…"</item>
+    <item msgid="8513729475867537913">"Connexion en cours…"</item>
+    <item msgid="515055375277271756">"Authentification en cours…"</item>
+    <item msgid="1943354004029184381">"Récupération de l\'adresse IP…"</item>
+    <item msgid="4221763391123233270">"Connecté"</item>
+    <item msgid="624838831631122137">"Suspendu"</item>
+    <item msgid="7979680559596111948">"Déconnexion…"</item>
+    <item msgid="1634960474403853625">"Déconnecté"</item>
+    <item msgid="746097431216080650">"Échec"</item>
+    <item msgid="6367044185730295334">"Bloqué"</item>
+    <item msgid="503942654197908005">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Recherche…"</item>
+    <item msgid="355508996603873860">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Authentification avec <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obtention de l\'adresse IP à partir de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Connecté à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspendu"</item>
+    <item msgid="7698638434317271902">"Déconnexion de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Déconnecté"</item>
+    <item msgid="8578370891960825148">"Échec"</item>
+    <item msgid="5660739516542454527">"Bloqué"</item>
+    <item msgid="1805837518286731242">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml
new file mode 100644
index 0000000..19eb40b
--- /dev/null
+++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Impossible de rechercher des réseaux."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Aucun"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Enregistré"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivés"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Échec de configuration de l\'adresse IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Échec de connexion Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problème d\'authentification"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Aucun accès à Internet détecté, reconnexion automatique impossible"</string>
+    <string name="saved_network" msgid="4352716707126620811">"Enregistrés par <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connecté à l\'aide de l\'assistant Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Connecté par %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Accessible par %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Connecté, aucun accès à Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Déconnexion…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connexion en cours…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Association…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connecté (sans audio pour appels tél.)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connecté (sans audio contenu mutimédia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connecté (sans accès aux messages)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connecté (sans audio tel./multimédia)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Paramètres audio du support"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Paramètres audio du téléphone"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfert de fichier"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Périphérique d\'entrée"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accès Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Partage de contact"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utiliser pour le partage de contacts"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accès aux messages"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Accès à la carte SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté à l\'audio du téléphone"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connecté à la carte"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Connecté au point d\'accès au service"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connecté au périphérique d\'entrée"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connecté à l\'appareil pour accès Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Connexion Internet locale partagée"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utiliser pour l\'accès à Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utiliser pour la carte"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Utiliser pour l\'accès à la carte SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utiliser pour les paramètres audio du support"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utiliser pour les paramètres audio du téléphone"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utiliser comme entrée"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Associer"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ASSOCIER"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuler"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"L\'association vous permet d\'accéder à vos contacts et à l\'historique des appels lorsque vous êtes connecté."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Impossible d\'associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en raison d\'un NIP ou d\'une clé d\'accès incorrects."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi désactivé."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi déconnecté."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi : une barre."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi : deux barres."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi : trois barres."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi : signal complet."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-fr/arrays.xml b/packages/SettingsLib/res/values-fr/arrays.xml
new file mode 100644
index 0000000..050793b
--- /dev/null
+++ b/packages/SettingsLib/res/values-fr/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Recherche…"</item>
+    <item msgid="8513729475867537913">"Connexion…"</item>
+    <item msgid="515055375277271756">"Authentification..."</item>
+    <item msgid="1943354004029184381">"Récupération de l\'adresse IP…"</item>
+    <item msgid="4221763391123233270">"Connecté"</item>
+    <item msgid="624838831631122137">"Interrompu"</item>
+    <item msgid="7979680559596111948">"Déconnexion…"</item>
+    <item msgid="1634960474403853625">"Déconnecté"</item>
+    <item msgid="746097431216080650">"Échec"</item>
+    <item msgid="6367044185730295334">"Bloqué"</item>
+    <item msgid="503942654197908005">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Recherche…"</item>
+    <item msgid="355508996603873860">"Connexion à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Authentification avec <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Récupération de l\'adresse IP à partir de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Connecté à <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Interrompu"</item>
+    <item msgid="7698638434317271902">"Déconnexion de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Déconnecté"</item>
+    <item msgid="8578370891960825148">"Échec"</item>
+    <item msgid="5660739516542454527">"Bloqué"</item>
+    <item msgid="1805837518286731242">"Mauvaise connexion évitée momentanément"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml
new file mode 100644
index 0000000..b184160
--- /dev/null
+++ b/packages/SettingsLib/res/values-fr/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Impossible de rechercher des réseaux."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Aucune"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Enregistré"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Désactivé"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Échec de configuration de l\'adresse IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Échec de la connexion Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problème d\'authentification."</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Hors de portée"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Aucun accès à Internet détecté, reconnexion automatique impossible"</string>
+    <string name="saved_network" msgid="4352716707126620811">"Enregistré par <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connecté via l\'assistant Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Connecté via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponible via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Connecté, aucun accès à Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Déconnecté"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Déconnexion…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connexion…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Connecté"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Association…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Connecté (sans audio pour appels tél.)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Connecté (sans audio contenu mutimédia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connecté (sans accès aux messages)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Connecté (sans audio tel./multimédia)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Multimédia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Appels et notifications"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfert de fichier"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Périphérique d\'entrée"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accès Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Partage de contacts"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utiliser pour le partage de contacts"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accès aux messages"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Accès à la carte SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté aux paramètres audio du téléphone"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connecté à la carte"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Connecté au point d\'accès au service"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Connexion au serveur de transfert de fichiers non établie"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connecté au périphérique d\'entrée"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connecté à l\'appareil pour accès Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Connexion Internet locale partagée"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utiliser pour l\'accès à Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utiliser pour la carte"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Utiliser pour l\'accès à la carte SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utiliser pour les paramètres audio du média"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utiliser pour les paramètres audio du téléphone"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utiliser pour le transfert de fichiers"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utiliser comme entrée"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Associer"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ASSOCIER"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuler"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"L\'association vous permet d\'accéder à vos contacts et à l\'historique des appels lorsque vous êtes connecté."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Impossible d\'associer à <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossible d\'établir l\'association avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g> en raison d\'un code ou d\'une clé d\'accès incorrects."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossible d\'établir la communication avec <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Association refusée par <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi désactivé"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi déconnecté"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Signal Wi-Fi faible"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Signal Wi-Fi moyen"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Signal Wi-Fi bon"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Signal Wi-Fi excellent"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-frp-rIT/arrays.xml b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-frp-rIT/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-frp-rIT/strings.xml b/packages/SettingsLib/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-frp-rIT/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-fy-rNL/arrays.xml b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-fy-rNL/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-fy-rNL/strings.xml b/packages/SettingsLib/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-fy-rNL/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-ga-rIE/arrays.xml b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-ga-rIE/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-ga-rIE/strings.xml b/packages/SettingsLib/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-ga-rIE/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-gd-rGB/arrays.xml b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-gd-rGB/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-gd-rGB/strings.xml b/packages/SettingsLib/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-gd-rGB/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-gl-rES/arrays.xml b/packages/SettingsLib/res/values-gl-rES/arrays.xml
new file mode 100644
index 0000000..8122efb
--- /dev/null
+++ b/packages/SettingsLib/res/values-gl-rES/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Buscando..."</item>
+    <item msgid="8513729475867537913">"Conectando..."</item>
+    <item msgid="515055375277271756">"Autenticando…"</item>
+    <item msgid="1943354004029184381">"Obtendo enderezo IP..."</item>
+    <item msgid="4221763391123233270">"Conectada"</item>
+    <item msgid="624838831631122137">"Suspendida"</item>
+    <item msgid="7979680559596111948">"Desconectando..."</item>
+    <item msgid="1634960474403853625">"Desconectada"</item>
+    <item msgid="746097431216080650">"Incorrecta"</item>
+    <item msgid="6367044185730295334">"Bloqueada"</item>
+    <item msgid="503942654197908005">"Evitando conexión deficiente temporalmente"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Buscando..."</item>
+    <item msgid="355508996603873860">"Conectando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Autenticando con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obtendo enderezo IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspendida"</item>
+    <item msgid="7698638434317271902">"Desconectando de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Desconectada"</item>
+    <item msgid="8578370891960825148">"Incorrecta"</item>
+    <item msgid="5660739516542454527">"Bloqueada"</item>
+    <item msgid="1805837518286731242">"Evitando conexión deficiente temporalmente"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-gl-rES/strings.xml b/packages/SettingsLib/res/values-gl-rES/strings.xml
new file mode 100644
index 0000000..07bde32
--- /dev/null
+++ b/packages/SettingsLib/res/values-gl-rES/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Non se poden explorar redes"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ningunha"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Gardada"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desactivadas"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Erro na configuración de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Erro na conexión wifi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticación"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Non está dentro da zona de cobertura"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Non se detectou acceso a Internet e non se volverá conectar automaticamente."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Redes gardadas por <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado ao asistente de wifi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Conectado a través de %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Dispoñible a través de %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Conectado, pero sen Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Sincronizando..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (ningún teléfono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sen ficheiros multimedia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sen acceso ás mensaxes)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (ningún teléfono nin soporte)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimedia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio do teléfono"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferencia de ficheiros"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acceso a Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartir contactos"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utilizar para compartir contactos"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Uso compartido da conexión a Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso ás mensaxes"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acceso á SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao audio multimedia"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao audio do teléfono"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferencia de ficheiros"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado ao mapa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Conectado a SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Non conectado co servidor de transferencia de ficheiros"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado ao dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado ao dispositivo para acceder a Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compartindo conexión a Internet co dispositivo"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilízase para o acceso a Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para o mapa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Usar para acceso á SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilízase para audio multimedia"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilízase para o audio do teléfono"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilízase para a transferencia de ficheiros"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilízase para a entrada"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Sincronizar"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SINCRONIZAR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"A sincronización garante acceso aos teus contactos e ao historial de chamadas ao estar conectado"</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Non se puido sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Non se puido sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g> debido a que se introduciu un contrasinal ou PIN incorrecto."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Non se pode comunicar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Sincronización rexeitada por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi desactivada."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi desconectada."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Unha barra de wifi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Dúas barras de wifi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Tres barras de wifi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Sinal completo de wifi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-gu-rIN/arrays.xml b/packages/SettingsLib/res/values-gu-rIN/arrays.xml
new file mode 100644
index 0000000..0c9e673
--- /dev/null
+++ b/packages/SettingsLib/res/values-gu-rIN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"સ્કેન કરી રહ્યું છે..."</item>
+    <item msgid="8513729475867537913">"કનેક્ટ થઈ રહ્યું છે…"</item>
+    <item msgid="515055375277271756">"પ્રમાણિત કરી રહ્યું છે..."</item>
+    <item msgid="1943354004029184381">"IP સરનામું મેળવી રહ્યું છે..."</item>
+    <item msgid="4221763391123233270">"કનેક્ટ કર્યું"</item>
+    <item msgid="624838831631122137">"સસ્પેન્ડ કરેલ"</item>
+    <item msgid="7979680559596111948">"ડિસ્કનેક્ટ થઈ રહ્યું છે..."</item>
+    <item msgid="1634960474403853625">"ડિસ્કનેક્ટ કર્યું"</item>
+    <item msgid="746097431216080650">"અસફળ"</item>
+    <item msgid="6367044185730295334">"અવરોધિત"</item>
+    <item msgid="503942654197908005">"નબળા કનેક્શનને અસ્થાયી રૂપે ટાળી રહ્યું છે"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> તરફથી IP સરનામું મેળવી રહ્યું છે..."</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> સાથે કનેક્ટ થયાં"</item>
+    <item msgid="1330262655415760617">"સસ્પેન્ડ કરેલ"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> થી ડિસ્કનેક્ટ થઈ રહ્યાં છે…"</item>
+    <item msgid="197508606402264311">"ડિસ્કનેક્ટ કર્યું"</item>
+    <item msgid="8578370891960825148">"અસફળ"</item>
+    <item msgid="5660739516542454527">"અવરોધિત"</item>
+    <item msgid="1805837518286731242">"અસ્થાયી રૂપે નબળા કનેક્શનને ટાળી રહ્યું છે"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-gu-rIN/cm_strings.xml b/packages/SettingsLib/res/values-gu-rIN/cm_strings.xml
new file mode 100644
index 0000000..e8aa9cc
--- /dev/null
+++ b/packages/SettingsLib/res/values-gu-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">એપ્લિકેશન્સ</string>
+  <string name="picker_activities">પ્રવૃત્તિઓ</string>
+  <string name="select_custom_app_title">કસ્ટમ એપ્લિકેશન પસંદ કરો</string>
+  <string name="select_custom_activity_title">કસ્ટમ પ્રવૃત્તિ પસંદ કરો</string>
+  <string name="lockscreen_targets_message">લૉક સ્ક્રીન શોર્ટકટ્સ</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-gu-rIN/strings.xml b/packages/SettingsLib/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..03bd2d2
--- /dev/null
+++ b/packages/SettingsLib/res/values-gu-rIN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"નેટવર્ક્સ માટે સ્કૅન કરી શકતા નથી"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"કોઈ નહીં"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"સાચવેલા"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"અક્ષમ કર્યો"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP કન્ફિગરેશન નિષ્ફળ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi કનેક્શન નિષ્ફળ"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"પ્રમાણીકરણ સમસ્યા"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"રેન્જમાં નથી"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"કોઈ ઇન્ટરનેટ અ‍ૅક્સેસ શોધાયું નથી, આપમેળે ફરીથી કનેક્ટ કરશે નહીં."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> દ્વારા સચવાયું"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi-Fi સહાયક દ્વારા કનેક્ટ થયું"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s દ્વારા કનેક્ટ થયેલ"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s દ્વારા ઉપલબ્ધ"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"કનેક્ટ કર્યું, કોઈ ઇન્ટરનેટ નથી"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ડિસ્કનેક્ટ કર્યું"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"ડિસ્કનેક્ટ થઈ રહ્યું છે..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"કનેક્ટ થઈ રહ્યું છે…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"કનેક્ટ કર્યું"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"જોડી કરી રહ્યું છે…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"કનેક્ટ કર્યું (કોઇ ફોન નથી)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"કનેક્ટ કર્યું (મીડિયા નથી)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"કનેક્ટ કર્યું (કોઇ સંદેશ ઍક્સેસ નથી)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"કનેક્ટ કરેલ (કોઈ ફોન અથવા મીડિયા નથી)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"મીડિયા ઑડિઓ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ફોન ઑડિઓ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ફાઇલ સ્થાનાંતરણ"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ઇનપુટ ઉપકરણ"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ઇન્ટરનેટ ઍક્સેસ"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"સંપર્ક શેરિંગ"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"સંપર્ક શેરિંગ માટે ઉપયોગ કરો"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ઇન્ટરનેટ કનેક્શન શેરિંગ"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"સંદેશ ઍક્સેસ"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ઍક્સેસ"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"મીડિયા ઑડિઓ સાથે કનેક્ટ કર્યુ"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ફોન ઑડિઓ સાથે કનેક્ટ થયાં"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ફાઇલ સ્થાનાંતરણ સેવાથી કનેક્ટ થયાં"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"નકશા સાથે કનેક્ટ થયું"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP થી કનેક્ટ કરેલ"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ફાઇલ સ્થાનાંતરણ સેવાથી કનેક્ટ થયેલ નથી"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ઇનપુટ ઉપકરણ સાથે કનેક્ટ થયાં"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ઇન્ટરનેટ ઍક્સેસ માટે ઉપકરણથી કનેક્ટેડ છે"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ઉપકરણ સાથે સ્થાનિક ઇન્ટરનેટ કનેક્શન શેર કરે છે"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ઇન્ટરનેટ ઍક્સેસ માટે ઉપયોગ કરો"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"નકશા માટે વાપરો"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM ઍક્સેસ માટે ઉપયોગ કરો"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"મીડિયા ઑડિઓ માટે ઉપયોગ કરો"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ફોન ઑડિઓ માટે ઉપયોગ કરો"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ફાઇલ સ્થાનાંતર માટે ઉપયોગ કરો"</string>
+    <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_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">"એક ખોટા PIN અથવા પાસકીને કારણે <xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે જોડી બનાવી શકાઈ નથી."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> સાથે સંચાર કરી શકાતો નથી."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> દ્વારા જોડી કરવાનું નકાર્યું."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi બંધ."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi ડિસ્કનેક્ટ થયું."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi એક બાર."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi બે બાર."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi ત્રણ બાર."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"પૂર્ણ Wifi સિગ્નલ."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-hi/arrays.xml b/packages/SettingsLib/res/values-hi/arrays.xml
new file mode 100644
index 0000000..ec1c57f
--- /dev/null
+++ b/packages/SettingsLib/res/values-hi/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"स्‍कैन कर रहा है…"</item>
+    <item msgid="8513729475867537913">"कनेक्ट हो रहा है..."</item>
+    <item msgid="515055375277271756">"प्रमाणीकरण कर रहा है…"</item>
+    <item msgid="1943354004029184381">"IP पता प्राप्त कर रहा है…"</item>
+    <item msgid="4221763391123233270">"कनेक्ट किया गया"</item>
+    <item msgid="624838831631122137">"निलंबित"</item>
+    <item msgid="7979680559596111948">"डिस्‍कनेक्‍ट हो रहा है..."</item>
+    <item msgid="1634960474403853625">"डिस्कनेक्‍ट किया गया"</item>
+    <item msgid="746097431216080650">"असफल"</item>
+    <item msgid="6367044185730295334">"अवरोधित"</item>
+    <item msgid="503942654197908005">"खराब कनेक्शन को अस्थायी रूप से अनदेखा कर रहा है"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से IP पता प्राप्त कर रहा है…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से कनेक्‍ट किया गया"</item>
+    <item msgid="1330262655415760617">"निलंबित"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> से डिस्‍कनेक्‍ट कर रहा है…"</item>
+    <item msgid="197508606402264311">"डिस्कनेक्‍ट किया गया"</item>
+    <item msgid="8578370891960825148">"असफल"</item>
+    <item msgid="5660739516542454527">"अवरोधित"</item>
+    <item msgid="1805837518286731242">"खराब कनेक्शन को अस्थायी रूप से अनदेखा कर रहा है"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml
new file mode 100644
index 0000000..c6edfc8
--- /dev/null
+++ b/packages/SettingsLib/res/values-hi/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"नेटवर्क के लिए स्‍कैन नहीं कर सकता"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"कोई नहीं"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"सहेजा गया"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"अक्षम"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP कॉन्‍फ़िगरेशन की विफलता"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"वाईफ़ाई कनेक्‍शन विफलता"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"रेंज में नहीं"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"किसी इंटरनेट कनेक्‍शन का पता नहीं चला, अपने आप पुन: कनेक्‍ट नहीं हो सकता."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> के द्वारा सहेजा गया"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"वाई-फ़ाई सहायक के द्वारा कनेक्‍ट है"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s के द्वारा उपलब्ध"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s के द्वारा उपलब्ध"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"कनेक्ट किया गया, इंटरनेट नहीं"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"डिस्कनेक्‍ट किया गया"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"डिस्‍कनेक्‍ट हो रहा है..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"कनेक्ट हो रहा है..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"कनेक्ट किया गया"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"युग्‍मित कर रहा है…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"कनेक्‍ट है (फ़ोन नहीं)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"कनेक्‍ट है (मीडि‍या नहीं)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"कनेक्ट किया गया (कोई संदेश एक्सेस नहीं)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"कनेक्‍ट है (फ़ोन या मीडि‍या नहीं)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"मीडिया ऑडियो"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"फ़ोन ऑडियो"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"फ़ाइल स्थानांतरण"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"इनपुट डिवाइस"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"इंटरनेट पहुंच"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"संपर्क साझाकरण"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"संपर्क साझाकरण के लिए उपयोग करें"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इंटरनेट कनेक्शन साझाकरण"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"संदेश एक्सेस"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"सिम ऐक्सेस"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"मीडिया ऑडियो से कनेक्‍ट किया गया"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फ़ोन ऑडियो से कनेक्‍ट किया गया"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फ़ाइल स्‍थानांतरण सर्वर से कनेक्‍ट किया गया"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"मानचित्र से कनेक्ट किया गया"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP से कनेक्ट किया गया"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"फ़ाइल स्‍थानांतरण सर्वर से कनेक्‍ट नहीं किया गया"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"इनपुट डिवाइस से कनेक्‍ट किया गया"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"इंटरनेट पहुंच के लिए डिवाइस से कनेक्‍ट"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"डिवाइस से स्‍थानीय इंटरनेट कनेक्‍शन शेयर किया जा रहा है"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"इंटरनेट पहुंच के लिए उपयोग करें"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"मानचित्र के लिए उपयोग करें"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"सिम ऐक्सेस के लिए उपयोग करें"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"मीडिया ऑडियो के लिए उपयोग करें"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"फ़ोन ऑडियो के लिए उपयोग करें"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"फ़ाइल स्‍थानांतरण के लिए उपयोग करें"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> से संचार नहीं कर सकता."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारा युग्‍मन अस्‍वीकृत किया गया."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"वाई-फ़ाई बंद है."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"वाई-फ़ाई डिस्कनेक्ट है."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"वाई-फ़ाई का एक बार है."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"वाई-फ़ाई की दो पट्टी मिल रही हैं."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"वाई-फ़ाई की एक पट्टी मिल रही है."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"पूरे वाई-फ़ाई सिग्नल मिल रहे हैं."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-hr/arrays.xml b/packages/SettingsLib/res/values-hr/arrays.xml
new file mode 100644
index 0000000..b7a0d51
--- /dev/null
+++ b/packages/SettingsLib/res/values-hr/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Skeniranje..."</item>
+    <item msgid="8513729475867537913">"Povezivanje…"</item>
+    <item msgid="515055375277271756">"Autentikacija…"</item>
+    <item msgid="1943354004029184381">"Dohvaćanje IP adrese…"</item>
+    <item msgid="4221763391123233270">"Povezan"</item>
+    <item msgid="624838831631122137">"Obustavljeno"</item>
+    <item msgid="7979680559596111948">"Isključivanje…"</item>
+    <item msgid="1634960474403853625">"Niste povezani"</item>
+    <item msgid="746097431216080650">"Neuspješno"</item>
+    <item msgid="6367044185730295334">"Blokirano"</item>
+    <item msgid="503942654197908005">"Privremeno izbjegavanje loše veze"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Skeniranje..."</item>
+    <item msgid="355508996603873860">"Povezivanje na mrežu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Autentikacija s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Dohvaćanje IP adrese s mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Povezano s mrežom <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Obustavljeno"</item>
+    <item msgid="7698638434317271902">"Isključivanje iz mreže <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Niste povezani"</item>
+    <item msgid="8578370891960825148">"Neuspješno"</item>
+    <item msgid="5660739516542454527">"Blokirano"</item>
+    <item msgid="1805837518286731242">"Privremeno izbjegavanje loše veze"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml
new file mode 100644
index 0000000..f8cf53a
--- /dev/null
+++ b/packages/SettingsLib/res/values-hr/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Skeniranje mreža nije moguće"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nema"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Spremljeno"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogućeno"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Konfiguracija IP-a nije uspjela"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Povezivanje s Wi-Fi-jem nije uspjelo"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem u autentifikaciji"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nije u rasponu"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Pristup internetu nije otkriven. Nema automatskog ponovnog povezivanja."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Spremljeno: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Povezani putem pomoćnika za Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Povezano putem %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Dostupno putem %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Povezano, bez interneta"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Niste povezani"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Isključivanje…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Povezivanje…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Povezan"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Uparivanje…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Povezano (bez telefona)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Povezano (bez medija)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Povezano (bez pristupa porukama)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Povezano (bez telefona ili medija)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medijski zvuk"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefona"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prijenos datoteke"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ulazni uređaj"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Pristup internetu"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Dijeljenje kontakata"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Upotrijebi za dijeljenje kontakata"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Dijeljenje internetske veze"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Pristup porukama"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Pristup SIM-u"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezano s medijskim zvukom"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezano sa telefonskim zvukom"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezano s poslužiteljem za prijenos datoteka"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Povezano s kartom"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Povezano sa SAP-om"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niste povezani s poslužiteljem za prijenos datoteka"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Povezano s ulaznim uređajem"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Povezano s uređajem za pristup internetu"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Dijeljenje lokalne internetske veze s uređajem"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Upotrijebi za pristup internetu"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Upotreba za kartu"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Upotrijebi za pristup SIM-u"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Koristi za medijski zvuk"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Koristi za telefonski zvuk"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Koristi za prijenos datoteke"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Upotrijebi za ulaz"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Upari"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"UPARI"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Odustani"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Uparivanje omogućuje pristup vašim kontaktima i povijesti poziva dok ste povezani."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije bilo moguće."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Uparivanje s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije bilo moguće zbog netočnog PIN-a ili zaporke."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Komunikacija s uređajem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nije moguća."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Uparivanje odbio uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi je isključen."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi je isključen."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi signal ima jedan stupac."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi signal ima dva stupca."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi signal ima tri stupca."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi signal je pun."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-hu/arrays.xml b/packages/SettingsLib/res/values-hu/arrays.xml
new file mode 100644
index 0000000..681489e
--- /dev/null
+++ b/packages/SettingsLib/res/values-hu/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Keresés..."</item>
+    <item msgid="8513729475867537913">"Kapcsolódás…"</item>
+    <item msgid="515055375277271756">"Hitelesítés..."</item>
+    <item msgid="1943354004029184381">"IP-cím lekérése..."</item>
+    <item msgid="4221763391123233270">"Csatlakozva"</item>
+    <item msgid="624838831631122137">"Felfüggesztve"</item>
+    <item msgid="7979680559596111948">"Kapcsolat bontása..."</item>
+    <item msgid="1634960474403853625">"Nincs kapcsolat"</item>
+    <item msgid="746097431216080650">"Sikertelen"</item>
+    <item msgid="6367044185730295334">"Letiltva"</item>
+    <item msgid="503942654197908005">"A rossz minőségű kapcsolatok átmeneti elkerülése"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Keresés..."</item>
+    <item msgid="355508996603873860">"Csatlakozás a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózathoz..."</item>
+    <item msgid="554971459996405634">"Hitelesítés a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózaton..."</item>
+    <item msgid="7928343808033020343">"IP-cím lekérése a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózattól..."</item>
+    <item msgid="8937994881315223448">"Kapcsolódva a(z) <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózathoz"</item>
+    <item msgid="1330262655415760617">"Felfüggesztve"</item>
+    <item msgid="7698638434317271902">"Kapcsolat bontása <xliff:g id="NETWORK_NAME">%1$s</xliff:g> hálózattal..."</item>
+    <item msgid="197508606402264311">"Nincs kapcsolat"</item>
+    <item msgid="8578370891960825148">"Sikertelen"</item>
+    <item msgid="5660739516542454527">"Letiltva"</item>
+    <item msgid="1805837518286731242">"A rossz minőségű kapcsolatok átmeneti elkerülése"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml
new file mode 100644
index 0000000..e786e81
--- /dev/null
+++ b/packages/SettingsLib/res/values-hu/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nem lehet beolvasni a hálózatokat"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nincs"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Mentve"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Letiltva"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurációs hiba"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-kapcsolati hiba"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Azonosítási probléma"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Hatókörön kívül"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nincs érzékelhető internet-hozzáférés, ezért nem kapcsolódik újra automatikusan."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Mentette: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Csatlakozva Wi‑Fi-segéddel"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Csatlakozva a következőn keresztül: %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Elérhető a következőn keresztül: %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Csatlakozva, nincs internetelérés"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Szétkapcsolva"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Szétkapcsolás..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Csatlakozás…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Csatlakozva"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Párosítás..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Csatlakoztatva (nincs telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Csatlakoztatva (nincs hordozó)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Csatlakoztatva (nincs üzenet-hozzáférés)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Csatlakoztatva (nincs telefon vagy hordozó)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Média audió"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon hangja"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Fájlátvitel"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Beviteli eszköz"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetelérés"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Névjegyek megosztása"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Használja a névjegyek megosztására"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetkapcsolat megosztása"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Üzenet-hozzáférés"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-elérés"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Csatlakoztatva az eszköz hangjához"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Csatlakoztatva a telefon hangjához"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Csatlakozva a fájlküldő szerverhez"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Csatlakoztatva a térképhez"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Csatlakozva az SAP-hoz"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nincs csatlakozva a fájlküldő szerverhez"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Beviteli eszköz csatlakoztatva"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Eszközhöz csatlakozik az interneteléréshez"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Helyi internetkapcsolat megosztva az eszközzel"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Használat internetelérésre"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Használat a térképhez"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Használat SIM-elérésre"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Felhasználás az eszköz hangjához"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Felhasználás a telefon hangjához"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Felhasználás fájlátvitelre"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Használat beviteli eszközként"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párosítás"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PÁROSÍTÁS"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Mégse"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"A párosítás hozzáférést biztosít a névjegyekhez és híváselőzményekhez összekapcsolt állapotban."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nem lehet párosítani a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"A párosítás sikertelen volt a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel hibás PIN kód vagy jelszó miatt."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nem lehet kommunikálni a(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszközzel."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"A(z) <xliff:g id="DEVICE_NAME">%1$s</xliff:g> eszköz elutasította a párosítást."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi kikapcsolva."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Nincs Wi-Fi-kapcsolat."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi-jel: egy sáv."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi-jel: két sáv."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi-jel: három sáv."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi-jel: teljes."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-hy-rAM/arrays.xml b/packages/SettingsLib/res/values-hy-rAM/arrays.xml
new file mode 100644
index 0000000..483e9d3
--- /dev/null
+++ b/packages/SettingsLib/res/values-hy-rAM/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Սկանավորում…"</item>
+    <item msgid="8513729475867537913">"Միանում է..."</item>
+    <item msgid="515055375277271756">"Նույնականացում…"</item>
+    <item msgid="1943354004029184381">"IP հասցեն գտնվում է...."</item>
+    <item msgid="4221763391123233270">"Միացված է"</item>
+    <item msgid="624838831631122137">"Կասեցված է"</item>
+    <item msgid="7979680559596111948">"Անջատվում է…"</item>
+    <item msgid="1634960474403853625">"Անջատված է"</item>
+    <item msgid="746097431216080650">"Անհաջող"</item>
+    <item msgid="6367044185730295334">"Արգելափակված"</item>
+    <item msgid="503942654197908005">"Ժամանակավորապես խուսափելով թույլ կապից"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"Անջատվում է <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-ից…"</item>
+    <item msgid="197508606402264311">"Անջատված"</item>
+    <item msgid="8578370891960825148">"Անհաջող"</item>
+    <item msgid="5660739516542454527">"Արգելափակված"</item>
+    <item msgid="1805837518286731242">"Վատ ցանցից ժամանակավոր խուսափում"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-hy-rAM/strings.xml b/packages/SettingsLib/res/values-hy-rAM/strings.xml
new file mode 100644
index 0000000..e51435c
--- /dev/null
+++ b/packages/SettingsLib/res/values-hy-rAM/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Հնարավոր չէ սկանավորել ցանցերը"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ոչ մեկը"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Պահված է"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Անջատված"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP կարգավորման ձախողում"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi կապի ձախողում"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Նույնականացման խնդիր"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ընդգրկույթից դուրս է"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ինտերնետի հասանելիություն չկա. ավտոմատ կերպով կրկին չի միանա:"</string>
+    <string name="saved_network" msgid="4352716707126620811">"Պահել է հետևյալ օգտվողը՝ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Կապակցված է Wi‑Fi Օգնականի միջոցով"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Կապակցված է %1$s-ի միջոցով"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Հասանելի է %1$s-ի միջոցով"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Կապակցված է առանց համացանցի"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Անջատված է"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Անջատվում է..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Միանում է..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Միացված է"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Զուգավորում..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Միացված (առանց հեռախոսի)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Միացված է (առանց մեդիա)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Միացված է (հաղորդագրությանը մուտք չկա)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Միացված է (առանց հեռախոսի և մեդիայի)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Մեդիա աուդիո"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Հեռախոսի աուդիո"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Ֆայլերի փոխանցում"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ներմուծման սարք"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ինտերնետի մուտք"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Կոնտակտի համօգտագործում"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Օգտագործել կոնտակտի համօգտագործման համար"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ինտերնետ կապի տարածում"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Մուտք հաղորդագրություն"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM քարտի հասանելիություն"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Միացված է մեդիա աուդիոյին"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Միացված է հեռախոսի ձայնային տվյալներին"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Միացված է ֆայլերի փոխանցման սերվերին"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Միացված է քարտեզին"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Կապակցված է SAP-ին"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ֆայլերը փոխանցող սերվերի հետ կապ չկա"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Միացված է մուտքային սարքին"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Կապակցված է սարքին` ինտերնետ մուտք գործելու համար"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Տեղային ինտերնետ կապի տարածում սարքի հետ"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Օգտագործել ինտերնետ մուտք գործելու համար"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Օգտագործել քարտեզի համար"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM քարտի օգտագործում"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Օգտագործել մեդիա աուդիոյի համար"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Օգտագործել հեռախոսի աուդիոյի համար"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Օգտագործել ֆայլի փոխանցման համար"</string>
+    <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_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>-ի հետ սխալ PIN-ի կամ անցաբառի պատճառով:."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Հնարավոր չէ կապ հաստատել  <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի հետ:"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Զուգավորումը մերժվեց <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ի կողմից:"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi-ն անջատված է:"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi-ը կապակցված չէ:"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi-ի ուժգնությունը՝ մեկ գիծ:"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi-ի ուժգնությունը՝ երկու գիծ:"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi-ի ուժգնությունը՝ երեք գիծ:"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi-ի ազդանշանը ուժեղ է:"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-in/arrays.xml b/packages/SettingsLib/res/values-in/arrays.xml
new file mode 100644
index 0000000..c2488df
--- /dev/null
+++ b/packages/SettingsLib/res/values-in/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Memindai..."</item>
+    <item msgid="8513729475867537913">"Menyambung…"</item>
+    <item msgid="515055375277271756">"Mengautentikasi…"</item>
+    <item msgid="1943354004029184381">"Mendapatkan alamat IP…"</item>
+    <item msgid="4221763391123233270">"Terhubung"</item>
+    <item msgid="624838831631122137">"Ditangguhkan"</item>
+    <item msgid="7979680559596111948">"Memutus sambungan..."</item>
+    <item msgid="1634960474403853625">"Sambungan terputus"</item>
+    <item msgid="746097431216080650">"Gagal"</item>
+    <item msgid="6367044185730295334">"Dicekal"</item>
+    <item msgid="503942654197908005">"Menghindari sambungan buruk untuk sementara"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Memindai..."</item>
+    <item msgid="355508996603873860">"Menyambung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Mengautentikasi dengan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Mendapatkan alamat IP dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Tersambung ke <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Ditangguhkan"</item>
+    <item msgid="7698638434317271902">"Diputus dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Sambungan terputus"</item>
+    <item msgid="8578370891960825148">"Gagal"</item>
+    <item msgid="5660739516542454527">"Dicekal"</item>
+    <item msgid="1805837518286731242">"Menghindari sambungan buruk untuk sementara"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-in/cm_strings.xml b/packages/SettingsLib/res/values-in/cm_strings.xml
new file mode 100644
index 0000000..d9c8315
--- /dev/null
+++ b/packages/SettingsLib/res/values-in/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Aplikasi</string>
+  <string name="picker_activities">Aktivitas</string>
+  <string name="select_custom_app_title">Pilih aplikasi khusus</string>
+  <string name="select_custom_activity_title">Pilih aktivitas khusus</string>
+  <string name="lockscreen_targets_message">Pintasan kunci layar</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml
new file mode 100644
index 0000000..1a319e6
--- /dev/null
+++ b/packages/SettingsLib/res/values-in/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tidak dapat memindai jaringan"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Tidak Ada"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Nonaktif"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Kegagalan Konfigurasi IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kegagalan Sambungan Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah autentikasi"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam jangkauan"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Akses Internet Tidak Terdeteksi, tidak akan menyambung ulang secara otomatis."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Disimpan oleh <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Terhubung melalui Asisten Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Terhubung melalui %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Tersedia melalui %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Tersambung, tidak ada internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Sambungan terputus"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutus sambungan..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Menyambung…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Terhubung"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Menyandingkan..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Terhubung (bukan telepon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Terhubung (kecuali media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Tersambung (tidak ada akses pesan)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Terhubung (bukan telepon atau media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio media"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telepon"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfer file"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Perangkat masukan"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Berbagi kontak"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gunakan untuk berbagi kontak"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Berbagi sambungan internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Akses Pesan"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Akses SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tersambung ke media audio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tersambung ke audio ponsel"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer file"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Tersambung ke peta"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Terhubung ke SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak tersambung kepada server transfer file"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Terhubung ke perangkat masukan"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tersambung ke perangkat untuk akses Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Berbagi sambungan Internet lokal dengan perangkat"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Digunakan untuk akses internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gunakan untuk peta"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Gunakan untuk akses SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gunakan untuk audio media"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gunakan untuk audio ponsel"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk transfer file"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk masukan"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pasangan"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SANDINGKAN"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Batal"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Penyandingan memberi akses ke kontak dan riwayat panggilan saat tersambung"</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Tidak dapat menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Tidak dapat menyandingkan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> karena PIN atau kode sandi salah."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Tidak dapat berkomunikasi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Penyandingan ditolak oleh <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi tidak aktif."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi tidak tersambung."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi satu baris."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi dua baris"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi tiga baris."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Sinyal Wi-Fi penuh."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-is-rIS/arrays.xml b/packages/SettingsLib/res/values-is-rIS/arrays.xml
new file mode 100644
index 0000000..540956f
--- /dev/null
+++ b/packages/SettingsLib/res/values-is-rIS/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Leitar…"</item>
+    <item msgid="8513729475867537913">"Tengist…"</item>
+    <item msgid="515055375277271756">"Auðkennir…"</item>
+    <item msgid="1943354004029184381">"Sækir IP-tölu…"</item>
+    <item msgid="4221763391123233270">"Tengt"</item>
+    <item msgid="624838831631122137">"Lokað"</item>
+    <item msgid="7979680559596111948">"Aftengist…"</item>
+    <item msgid="1634960474403853625">"Aftengt"</item>
+    <item msgid="746097431216080650">"Mistókst"</item>
+    <item msgid="6367044185730295334">"Læst"</item>
+    <item msgid="503942654197908005">"Forðast lélega tengingu tímabundið"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Leitar…"</item>
+    <item msgid="355508996603873860">"Tengist <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Auðkennir á <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Sækir IP-tölu frá <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Tengt við <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Lokað"</item>
+    <item msgid="7698638434317271902">"Aftengist <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Aftengt"</item>
+    <item msgid="8578370891960825148">"Mistókst"</item>
+    <item msgid="5660739516542454527">"Læst"</item>
+    <item msgid="1805837518286731242">"Forðast lélega tengingu tímabundið"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-is-rIS/strings.xml b/packages/SettingsLib/res/values-is-rIS/strings.xml
new file mode 100644
index 0000000..e5bebbd
--- /dev/null
+++ b/packages/SettingsLib/res/values-is-rIS/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ekki er hægt að leita að netum"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ekkert"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Vistað"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Óvirkt"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-stillingarvilla"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi-tengingarvilla"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Vandamál við auðkenningu"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ekkert samband"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Enginn netaðgangur fannst; endurtengist ekki sjálfkrafa."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> vistaði"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Tengt í gegnum Wi-Fi aðstoð"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Tengt í gegnum %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Í boði í gegnum %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Tengt, enginn internetaðgangur"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Aftengt"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Aftengist…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Tengist…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Tengt"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parar…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Tengt (ekki sími)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tengt (ekki efnisspilun)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Tengt (enginn skilaboðaaðgangur)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Tengt (ekki sími eða efnisspilun)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Hljóð efnis"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Hljóð síma"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Skráaflutningur"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inntakstæki"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetaðgangur"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Deiling tengiliða"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Nota til að deila tengiliðum"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deiling nettengingar"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Skilaboðaaðgangur"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Aðgangur að SIM-korti"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tengt við hljóðspilun efnis"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tengt við hljóð símans"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Tengt við skráaflutningsþjón"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Tengt við kort"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Tengt við SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ekki tengt við skráaflutningsþjón."</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Tengt við inntakstæki"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Tengt við tæki til að fá netaðgang"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Internettengingu deilt með tæki"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Nota fyrir netaðgang"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Nota fyrir kort"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Nota fyrir aðgang að SIM-korti"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Nota fyrir hljóð efnisspilunar"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Nota fyrir hljóð símans"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Nota við skráaflutning"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Nota fyrir inntak"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Para"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PARA"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Hætta við"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Pörun veitir aðgang að tengiliðunum þínum og símtalaferli þegar tengingu hefur verið komið á."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ekki var hægt að para við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ekki tókst að para við <xliff:g id="DEVICE_NAME">%1$s</xliff:g> þar sem PIN-númer eða aðgangslykill er rangur."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ekki er hægt að eiga samskipti við <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> hafnaði pörun."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Slökkt á Wi-Fi."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi ótengt."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi: Eitt strik."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi: Tvö strik."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi: Þrjú strik."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Fullur Wi-Fi sendistyrkur."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-it/arrays.xml b/packages/SettingsLib/res/values-it/arrays.xml
new file mode 100644
index 0000000..719adbc
--- /dev/null
+++ b/packages/SettingsLib/res/values-it/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Ricerca..."</item>
+    <item msgid="8513729475867537913">"Connessione..."</item>
+    <item msgid="515055375277271756">"Autenticazione..."</item>
+    <item msgid="1943354004029184381">"Acquisizione indirizzo IP..."</item>
+    <item msgid="4221763391123233270">"Connessa"</item>
+    <item msgid="624838831631122137">"Sospesa"</item>
+    <item msgid="7979680559596111948">"Disconnessione..."</item>
+    <item msgid="1634960474403853625">"Disconnessa"</item>
+    <item msgid="746097431216080650">"Operazione non riuscita"</item>
+    <item msgid="6367044185730295334">"Bloccato"</item>
+    <item msgid="503942654197908005">"Al momento vengono evitate connessioni deboli"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Ricerca..."</item>
+    <item msgid="355508996603873860">"Connessione a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Autenticazione con <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Acquisizione indirizzo IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Connessa a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Sospesa"</item>
+    <item msgid="7698638434317271902">"Disconnessione da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Disconnessa"</item>
+    <item msgid="8578370891960825148">"Operazione non riuscita"</item>
+    <item msgid="5660739516542454527">"Bloccato"</item>
+    <item msgid="1805837518286731242">"Al momento vengono evitate connessioni deboli"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-it/cm_strings.xml b/packages/SettingsLib/res/values-it/cm_strings.xml
index e7cc83a..ff906e5 100644
--- a/packages/SettingsLib/res/values-it/cm_strings.xml
+++ b/packages/SettingsLib/res/values-it/cm_strings.xml
@@ -23,5 +23,5 @@
   <string name="picker_activities">Attività</string>
   <string name="select_custom_app_title">Seleziona app personalizzata</string>
   <string name="select_custom_activity_title">Seleziona attività personalizzata</string>
-  <string name="lockscreen_targets_message">Scorciatoie schermata di sblocco</string>
+  <string name="lockscreen_targets_message">Scorciatoie del blocco schermo</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml
new file mode 100644
index 0000000..95fb7ee
--- /dev/null
+++ b/packages/SettingsLib/res/values-it/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Impossibile cercare reti"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nessuna"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Salvata"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Disattivata"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Errore configurazione IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Errore connessione Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema di autenticazione"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fuori portata"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nessun accesso a Internet rilevato, non verrà eseguita la riconnessione automatica."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Salvata da <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Connesso tramite assistente Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Collegato tramite %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponibile tramite %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Connesso senza Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Disconnesso"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Disconnessione..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Connessione..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Connesso"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Accoppiamento..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Collegato (telefono escluso)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Collegato (contenuti multimed. esclusi)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Connesso (nessun accesso ai messaggi)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Collegato (telef. o conten. mult. esclusi)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio multimediale"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telefono"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Trasferimento file"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo di input"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Accesso Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Condivisione contatti"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Usa per condivisione contatti"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Condivisione connessione Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accesso ai messaggi"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Accesso alla SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Collegato ad audio media"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Collegato ad audio telefono"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Collegato al server di trasferimento file"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Connesso alla mappa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Collegato al SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Non collegato al server di trasferimento file"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Connesso a dispositivo di input"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Connesso a dispositivo per accesso Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Connessione Internet locale condivisa con dispositivo"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usa per accesso Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilizza per la mappa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Utilizza per accesso SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usa per audio media"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usa per audio telefono"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usa per trasferimento file"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizza per l\'input"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Accoppia"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ACCOPPIA"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annulla"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"L\'accoppiamento consente l\'accesso ai tuoi contatti e alla cronologia chiamate quando i dispositivi sono connessi."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Impossibile eseguire l\'accoppiamento con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>. La passkey o il PIN è errato."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Impossibile comunicare con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Accoppiamento rifiutato da <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi non attivo."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Rete Wi-Fi scollegata."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi: una barra."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi: due barre."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi: tre barre."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Segnale Wi-Fi completo."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-iw/arrays.xml b/packages/SettingsLib/res/values-iw/arrays.xml
new file mode 100644
index 0000000..d5f3d9d
--- /dev/null
+++ b/packages/SettingsLib/res/values-iw/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"סורק..."</item>
+    <item msgid="8513729475867537913">"מתחבר ..."</item>
+    <item msgid="515055375277271756">"מאמת…"</item>
+    <item msgid="1943354004029184381">"‏משיג כתובת IP…"</item>
+    <item msgid="4221763391123233270">"מחובר"</item>
+    <item msgid="624838831631122137">"בהשעיה"</item>
+    <item msgid="7979680559596111948">"מתנתק..."</item>
+    <item msgid="1634960474403853625">"מנותק"</item>
+    <item msgid="746097431216080650">"נכשל"</item>
+    <item msgid="6367044185730295334">"חסומה"</item>
+    <item msgid="503942654197908005">"נמנע זמנית מחיבור חלש"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"מתנתק מרשת <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"מנותק"</item>
+    <item msgid="8578370891960825148">"נכשל"</item>
+    <item msgid="5660739516542454527">"חסומה"</item>
+    <item msgid="1805837518286731242">"נמנע זמנית מחיבור חלש"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml
new file mode 100644
index 0000000..ed4a015
--- /dev/null
+++ b/packages/SettingsLib/res/values-iw/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"לא ניתן לסרוק לאיתור רשתות"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ללא"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"נשמר"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"מושבת"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏כשל בתצורת IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏כשל בחיבור Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"בעיית אימות"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"מחוץ לטווח"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"אין גישה לאינטרנט. לא יתבצע חיבור מחדש באופן אוטומטי."</string>
+    <string name="saved_network" msgid="4352716707126620811">"נשמר על ידי <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏מחובר באמצעות אסיסטנט ה-Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"‏מחובר דרך %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"‏זמינה דרך %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"מחובר. אין אינטרנט"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"מנותק"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"מתנתק..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"מתחבר ..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"מחובר"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"מבצע התאמה..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"מחובר (ללא טלפון)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"מחובר (ללא מדיה)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"מחובר (אין גישה להודעות)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"מחובר (ללא טלפון או מדיה)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"אודיו של מדיה"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"אודיו של טלפון"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"העברת קבצים"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"מכשיר קלט"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"גישה לאינטרנט"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"שיתוף אנשי קשר"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"השתמש עבור שיתוף אנשי קשר"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"שיתוף חיבור לאינטרנט"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"גישה להודעות"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"‏גישה ל-SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"מחובר לאודיו של מדיה"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"מחובר לאודיו של הטלפון"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"מחובר לשרת העברת קבצים"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"מחובר למפה"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"‏מחובר ל-SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"לא מחובר לשרת העברת קבצים"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"מחובר למכשיר קלט"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"מחובר למכשיר לצורך גישה לאינטרנט"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"משתף חיבור אינטרנט מקומי עם מכשיר"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"השתמש עבור גישה לאינטרנט"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"שימוש עבור מפה"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"‏השתמש לגישה של SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"השתמש עבור אודיו של מדיה"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"השתמש עבור האודיו של הטלפון"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"השתמש להעברת קבצים"</string>
+    <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_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> בשל קוד PIN או סיסמה שגויים."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"לא ניתן לתקשר עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ההתאמה נדחתה על ידי <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"‏Wi-Fi כבוי."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"‏Wi-Fi מנותק."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"‏פס אחד של Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"‏שני פסים של Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"‏שלושה פסים של Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"‏אות Wi-Fi מלא."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ja/arrays.xml b/packages/SettingsLib/res/values-ja/arrays.xml
new file mode 100644
index 0000000..f9f2ae7
--- /dev/null
+++ b/packages/SettingsLib/res/values-ja/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"スキャン中..."</item>
+    <item msgid="8513729475867537913">"接続中..."</item>
+    <item msgid="515055375277271756">"認証中..."</item>
+    <item msgid="1943354004029184381">"IPアドレスを取得中..."</item>
+    <item msgid="4221763391123233270">"接続済み"</item>
+    <item msgid="624838831631122137">"保留中"</item>
+    <item msgid="7979680559596111948">"切断中..."</item>
+    <item msgid="1634960474403853625">"切断されました"</item>
+    <item msgid="746097431216080650">"失敗しました"</item>
+    <item msgid="6367044185730295334">"ブロック中"</item>
+    <item msgid="503942654197908005">"接続不良により一時的に無効"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>から切断中..."</item>
+    <item msgid="197508606402264311">"切断されました"</item>
+    <item msgid="8578370891960825148">"失敗しました"</item>
+    <item msgid="5660739516542454527">"ブロック中"</item>
+    <item msgid="1805837518286731242">"接続不良により一時的に無効"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml
new file mode 100644
index 0000000..571a4b2
--- /dev/null
+++ b/packages/SettingsLib/res/values-ja/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ネットワークをスキャンできません"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"なし"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"保存済み"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"無効"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP設定エラー"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi接続エラー"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"認証に問題"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"圏外"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"インターネットアクセスを検出できないため、自動的に再接続されません。"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g>で保存"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fiアシスタント経由で接続"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s経由で接続"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s経由で使用可能"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"接続済み、インターネットは利用できません"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"切断"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"切断中..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"接続中..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"接続"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"ペアとして設定中..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"接続済み（電話を除く）"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"接続済み（メディアを除く）"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"接続済み（メッセージへのアクセスなし）"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"接続済み（電話/メディアを除く）"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"メディアの音声"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"電話の音声"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ファイル転送"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"入力デバイス"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"インターネットアクセス"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"連絡先の共有"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"連絡先の共有に使用"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"インターネット接続の共有"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"メッセージへのアクセス"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIMアクセス"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"メディアの音声に接続"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"携帯電話の音声に接続"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ファイル転送サーバーに接続"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"地図に接続済み"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAPに接続"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ファイル転送サーバーに接続しない"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"入力デバイスに接続されています"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"インターネットアクセス用に接続"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ローカルインターネット接続をデバイスと共有"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"インターネットアクセスに使用する"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"地図に使用"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIMアクセスに使用"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"メディアの音声に使用"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"携帯電話の音声に使用"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ファイル転送に使用"</string>
+    <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_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">"PINまたはパスキーが正しくないため、<xliff:g id="DEVICE_NAME">%1$s</xliff:g>をペアに設定できませんでした。"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>と通信できません。"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ペア設定が<xliff:g id="DEVICE_NAME">%1$s</xliff:g>に拒否されました。"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-FiはOFFです。"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fiが切断されました。"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fiはレベル1です。"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fiはレベル2です。"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fiはレベル3です。"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fiの電波はフルです。"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ka-rGE/arrays.xml b/packages/SettingsLib/res/values-ka-rGE/arrays.xml
new file mode 100644
index 0000000..1185d8e
--- /dev/null
+++ b/packages/SettingsLib/res/values-ka-rGE/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"სკანირება…"</item>
+    <item msgid="8513729475867537913">"დაკავშირება…"</item>
+    <item msgid="515055375277271756">"ავტორიზაცია…"</item>
+    <item msgid="1943354004029184381">"IP მისამართის მიღება…"</item>
+    <item msgid="4221763391123233270">"დაკავშირებულია"</item>
+    <item msgid="624838831631122137">"შეწყვეტილია"</item>
+    <item msgid="7979680559596111948">"კავშირის გაწყვეტა…"</item>
+    <item msgid="1634960474403853625">"არ არის ხაზზე"</item>
+    <item msgid="746097431216080650">"ვერ მოხერხდა"</item>
+    <item msgid="6367044185730295334">"დაბლოკილი"</item>
+    <item msgid="503942654197908005">"ცუდი კავშირის დროებით თავიდან აცილება"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"კავშირის გაწყვეტა <xliff:g id="NETWORK_NAME">%1$s</xliff:g>-თან…"</item>
+    <item msgid="197508606402264311">"კავშირი გაწყვეტილია"</item>
+    <item msgid="8578370891960825148">"ვერ მოხერხდა"</item>
+    <item msgid="5660739516542454527">"დაბლოკილი"</item>
+    <item msgid="1805837518286731242">"ცუდი კავშირის დროებით თავიდან აცილება"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ka-rGE/strings.xml b/packages/SettingsLib/res/values-ka-rGE/strings.xml
new file mode 100644
index 0000000..046a062
--- /dev/null
+++ b/packages/SettingsLib/res/values-ka-rGE/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ქსელების სკანირება არა არის შესაძლებელი"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"არცერთი"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"დამახსოვრებულია"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"გამორთულია"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP კონფიგურაციის შეფერხება"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi კავშირის შეფერხება"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ავთენტიკაციის პრობლემა"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"არ არის დიაპაზონში"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ინტერნეტთან წვდომის ამოცნობა ვერ მოხერხდა. ავტომატურად ხელახლა დაკავშირება არ განხორციელდება."</string>
+    <string name="saved_network" msgid="4352716707126620811">"შენახული <xliff:g id="NAME">%1$s</xliff:g>-ის მიერ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"დაკავშირებულია Wi-Fi თანაშემწით"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s-ით დაკავშირებული"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"ხელმისაწვდომია %1$s-ით"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"დაკავშირებულია, ინტერნეტის გარეშე"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"კავშირი გაწყვეტილია"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"მიმდინარეობს გათიშვა…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"მიმდინარეობს დაკავშირება…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"შეერთებულია"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"დაწყვილება…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"დაკავშირებულია (ტელეფონის გარდა)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"მიერთებულია (მედიის გარდა)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"დაკავშირებულია (შეტყობინებაზე წვდომა არ არის)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"დაკავშირება (გარდა ტელეფონისა და მედიისა)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"მედია აუდიო"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ტელეფონის აუდიო"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ფაილების გადაცემა"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"შეყვანის მოწყობილობა"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ინტერნეტზე წვდომა"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"კონტაქტის გაზიარება"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"კონტაქტის გაზიარებისთვის გამოყენება"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ინტერნეტ კავშირის გაზიარება"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"შეტყობინებებზე წვდომა"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM წვდომა"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"დაკავშირებულია აუდიო მულტიმედიურ სისტემასთან"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"დაკავშირებულია ტელეფონის აუდიო მოწყობილობასთან"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"დაკავშირებულია ფაილების გადაცემის სერვერთან"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"რუკასთან დაკავშირებული"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP-თან დაკავშირებული"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"არ არის დაკავშირებული ფაილების ტრანსფერის სერვერთან"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"დაკავშირებულია შეყვანის მოწყობილობასთან"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"დაკავშირებულია მოწყობილობასთან ინტერნეტთან წვდომისთვის"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ლოკალური კავშირის გაზიარება მოწყობილობასთან"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"გამოიყენე ინტერნეტთან წვდომისთვის"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"რუკაზე გამოყენება"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"გამოყენება SIM წვდომისთვის"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"მედია აუდიოსთვის გამოყენება"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"გამოიყენეთ ტელეფონის აუდიომოწყობილობაში"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ფაილების ტრანსფერისათვის გამოყენება"</string>
+    <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_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>-თან დაწყვილება ვერ მოხერხდა, რადგან PIN ან გასაღები არასწორია."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"შეუძლებელია <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-თან კომუნიკაცია."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"დაწყვილება უარყოფილია <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-ის მიერ."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"WiFi გამორთულია."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"WiFi არ არის დაკავშირებული."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"WiFi სიგნალი ერთ ზოლზეა."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"WiFi სიგნალი ორ ზოლზეა."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"WiFi სიგნალი სამ ზოლზეა."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"WiFi სიგნალი სრულია."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-kk-rKZ/arrays.xml b/packages/SettingsLib/res/values-kk-rKZ/arrays.xml
new file mode 100644
index 0000000..6555efe
--- /dev/null
+++ b/packages/SettingsLib/res/values-kk-rKZ/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Тексеруде…"</item>
+    <item msgid="8513729475867537913">"Қосылуда..."</item>
+    <item msgid="515055375277271756">"Растауда…"</item>
+    <item msgid="1943354004029184381">"IP мекенжайына қол жеткізуде…"</item>
+    <item msgid="4221763391123233270">"Қосылған"</item>
+    <item msgid="624838831631122137">"Уақытша тоқтатылды"</item>
+    <item msgid="7979680559596111948">"Ажыратуда…"</item>
+    <item msgid="1634960474403853625">"Ажыратылған"</item>
+    <item msgid="746097431216080650">"Сәтсіз"</item>
+    <item msgid="6367044185730295334">"Бөгелген"</item>
+    <item msgid="503942654197908005">"Нашар байланысты уақытша қолданбау"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> байланысынан ажыратылуда…"</item>
+    <item msgid="197508606402264311">"Ажыратылған"</item>
+    <item msgid="8578370891960825148">"Сәтсіз"</item>
+    <item msgid="5660739516542454527">"Бөгелген"</item>
+    <item msgid="1805837518286731242">"Нашар байланысты уақытша қолданбау"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-kk-rKZ/strings.xml b/packages/SettingsLib/res/values-kk-rKZ/strings.xml
new file mode 100644
index 0000000..4403526
--- /dev/null
+++ b/packages/SettingsLib/res/values-kk-rKZ/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Желілерді шолу мүмкін емес"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ешқандай"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Сақталды"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Өшірілген"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурациясының қатесі"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi байланысының қатесі"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Растау мәселесі"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Аумақта жоқ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернетке қатынас анықталмады, автоматты түрде қайта қосылу орындалмайды."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> сақтаған"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi көмекшісі арқылы қосылу орындалды"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s арқылы қосылған"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s арқылы қолжетімді"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Қосылған, интернет жоқ"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ажыратылған"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ажыратылуда…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Жалғауда..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Жалғанған"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Жұптауда..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Жалғанған (телефон жоқ)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Жалғанған (медиа жоқ)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Жалғанған (хабарлар қол жетімсіз)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Жалғанған (телефон және медиа жоқ)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Meдиа аудиосы"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Телефон аудиосы"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Файл жіберу"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Кіріс құрылғысы"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернетке қосылу"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Контактіні бөлісу"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Контактіні бөлісу үшін пайдалану"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернет байланысын ортақ қолдану"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Хабарға кіру"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM картасына кіру"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиосына жалғанған"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Телефон аудиосына қосылған"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл жіберу серверіне жалғанған"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Картаға жалғанған"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP жүйесіне қосылған"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Файл жіберу серверіне жалғанбаған"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Кіріс құрылғысына косылған"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Құрылғыға интернетке кіру үшін жалғанған"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Жергілікті интернет байланысын құрылғымен ортақ пайдалану"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Интернетке кіру үшін қолдану"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Карта үшін қолдану"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM картасына кіру үшін пайдалану"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Медиа аудиосы үшін қолдану"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Телефон аудиосы үшін қолдану"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Файлды жіберу үшін қолдану"</string>
+    <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_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> құрылғысымен жұптала алмады, себебі PIN немесе кілтсөз дұрыс емес."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысымен қатынаса алмайды"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> құрылғысы жұпталудан бас тартты."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi өшірулі."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi ажыратылған."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi сигналы — бір жолақ."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi сигналы — екі жолақ."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi сигналы — үш жолақ."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi сигналы толық."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-km-rKH/arrays.xml b/packages/SettingsLib/res/values-km-rKH/arrays.xml
new file mode 100644
index 0000000..3c65bf3
--- /dev/null
+++ b/packages/SettingsLib/res/values-km-rKH/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"កំពុង​វិភាគ​រក…"</item>
+    <item msgid="8513729475867537913">"កំពុង​ត​ភ្ជាប់​…"</item>
+    <item msgid="515055375277271756">"កំពុង​ផ្ទៀងផ្ទាត់..."</item>
+    <item msgid="1943354004029184381">"កំពុង​ទទួល​អាសយដ្ឋាន IP…"</item>
+    <item msgid="4221763391123233270">"បាន​តភ្ជាប់"</item>
+    <item msgid="624838831631122137">"បាន​ពន្យារ​ពេល"</item>
+    <item msgid="7979680559596111948">"កំពុង​ផ្ដាច់…"</item>
+    <item msgid="1634960474403853625">"បាន​ផ្ដាច់"</item>
+    <item msgid="746097431216080650">"មិន​ជោគជ័យ"</item>
+    <item msgid="6367044185730295334">"បាន​ទប់​ស្កាត់"</item>
+    <item msgid="503942654197908005">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ​ជា​បណ្ដោះ​អាសន្ន"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"កំពុង​ផ្ដាច់​ពីរ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"បាន​ផ្ដាច់"</item>
+    <item msgid="8578370891960825148">"មិន​ជោគជ័យ"</item>
+    <item msgid="5660739516542454527">"បាន​ទប់ស្កាត់"</item>
+    <item msgid="1805837518286731242">"ជៀសវាង​ការ​តភ្ជាប់​​ខ្សោយ​ជា​បណ្ដោះអាសន្ន"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-km-rKH/strings.xml b/packages/SettingsLib/res/values-km-rKH/strings.xml
new file mode 100644
index 0000000..ed00f87
--- /dev/null
+++ b/packages/SettingsLib/res/values-km-rKH/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"មិន​អាច​វិភាគ​រក​បណ្ដាញ"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"គ្មាន"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"បាន​រក្សាទុក"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"បាន​បិទ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"ការ​កំណត់​រចនាសម្ព័ន្ធ IP បរាជ័យ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"ការ​ភ្ជាប់​ WiFi បរាជ័យ"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"បញ្ហា​ក្នុង​ការ​ផ្ទៀងផ្ទាត់"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"នៅ​ក្រៅ​តំបន់"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"រក​មិន​ឃើញ​ការ​ចូល​ដំណើរការ​អ៊ីនធឺណិត, នឹង​មិន​ភ្ជាប់​ឡើង​វិញ​ដោយ​ស្វ័យ​ប្រវត្តិ​ទេ។"</string>
+    <string name="saved_network" msgid="4352716707126620811">"បានរក្សាទុកដោយ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"បានភ្ជាប់តាមរយៈជំនួយការ Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"បានភ្ជាប់តាមរយៈ %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"មានតាមរយៈ %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"បានភ្ជាប់ ប៉ុន្តែគ្មានអ៊ីនធឺណិតទេ"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"បាន​ផ្ដាច់"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"កំពុង​ផ្ដាច់…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"កំពុង​ត​ភ្ជាប់​…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"បាន​តភ្ជាប់"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"កំពុង​ផ្គូផ្គង..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"បាន​តភ្ជាប់ (គ្មាន​ទូរស័ព្ទ)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"បាន​តភ្ជាប់ (គ្មាន​មេឌៀ)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"បាន​ភ្ជាប់ (គ្មាន​ការ​ចូល​ដំណើរការ​សារ)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"បាន​តភ្ជាប់ (គ្មាន​ទូរស័ព្ទ ឬ​មេឌៀ)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"សំឡេង​មេឌៀ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"សំឡេង​ទូរស័ព្ទ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ផ្ទេរ​ឯកសារ"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ឧបករណ៍​បញ្ចូល"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ចូល​អ៊ីនធឺណិត"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"ការ​ចែករំលែក​​ទំនាក់ទំនង"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"ប្រើ​សម្រាប់​ការ​ចែករំលែក​ទំនាក់ទំនង"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ចែករំលែក​ការ​តភ្ជាប់​អ៊ីនធឺណិត"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"​​ចូល​ដំណើរការ​សារ"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"ការចូលដំណើរការស៊ីម"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"បា​ន​ភ្ជាប់​ទៅ​អូឌីយ៉ូ​មេឌៀ"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"តភ្ជាប់​ទៅ​អូឌីយ៉ូ​ទូរស័ព្ទ"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"បាន​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​មេ​ផ្ទេរ​ឯកសារ"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"បាន​ភ្ជាប់​ទៅ​​​ផែនទី"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"បានភ្ជាប់ទៅ SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"មិន​បាន​តភ្ជាប់​ទៅ​ម៉ាស៊ីន​មេ​ផ្ទេរ​ឯកសារ"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"បាន​តភ្ជាប់​ទៅ​ឧបករណ៍​បញ្ចូល"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"បាន​តភ្ជាប់​​ឧបករណ៍​សម្រាប់​ចូល​អ៊ីនធឺណិត"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ចែករំលែក​ការ​តភ្ជាប់​អ៊ីនធឺណិត​មូលដ្ឋាន​ជា​មួយ​ឧបករណ៍"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ប្រើ​សម្រាប់​ចូល​អ៊ីនធឺណិត"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ប្រើ​សម្រាប់​ផែនទី"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"ប្រើសម្រាប់ចូលដំណើរការស៊ីម"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ប្រើ​សម្រាប់​សំឡេង​មេឌៀ"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ប្រើ​សម្រាប់​​អូឌីយ៉ូ​ទូរស័ព្ទ"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ប្រើ​សម្រាប់​ផ្ទេរ​ឯកសារ"</string>
+    <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_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> ព្រោះ​​​កូដ PIN ឬ​លេខ​កូដ​មិន​ត្រឹមត្រូវ។"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"មិន​អាច​ទាក់ទង​ជា​មួយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ការ​ផ្គូផ្គង​បាន​បដិសេធ​ដោយ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ។"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"បានបិទ Wifi"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"បានផ្តាច់ Wifi"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi មួយកាំ"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi ពីរកាំ"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi បីកាំ"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"សេវា Wifi ពេញ"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-kn-rIN/arrays.xml b/packages/SettingsLib/res/values-kn-rIN/arrays.xml
new file mode 100644
index 0000000..7e42fb4
--- /dev/null
+++ b/packages/SettingsLib/res/values-kn-rIN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</item>
+    <item msgid="8513729475867537913">"ಸಂಪರ್ಕಪಡಿಸಲಾಗುತ್ತಿದೆ..."</item>
+    <item msgid="515055375277271756">"ಪ್ರಮಾಣೀಕರಿಸಲಾಗುತ್ತಿದೆ..."</item>
+    <item msgid="1943354004029184381">"IP ವಿಳಾಸವನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ…"</item>
+    <item msgid="4221763391123233270">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</item>
+    <item msgid="624838831631122137">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</item>
+    <item msgid="7979680559596111948">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."</item>
+    <item msgid="1634960474403853625">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</item>
+    <item msgid="746097431216080650">"ಯಶಸ್ವಿಯಾಗಲಿಲ್ಲ"</item>
+    <item msgid="6367044185730295334">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</item>
+    <item msgid="503942654197908005">"ಕಳಪೆ ಸಂಪರ್ಕವನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ತಡೆಗಟ್ಟಲಾಗುತ್ತಿದೆ"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ನಿಂದ IP ವಿಳಾಸವನ್ನು ಪಡೆಯಲಾಗುತ್ತಿದೆ…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ಗೆ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ"</item>
+    <item msgid="1330262655415760617">"ತಡೆಹಿಡಿಯಲಾಗಿದೆ"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ನಿಂದ ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ…"</item>
+    <item msgid="197508606402264311">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</item>
+    <item msgid="8578370891960825148">"ಯಶಸ್ವಿಯಾಗಲಿಲ್ಲ"</item>
+    <item msgid="5660739516542454527">"ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ"</item>
+    <item msgid="1805837518286731242">"ಕಳಪೆ ಸಂಪರ್ಕವನ್ನು ತಾತ್ಕಾಲಿಕವಾಗಿ ತಡೆಗಟ್ಟಲಾಗುತ್ತಿದೆ"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-kn-rIN/cm_strings.xml b/packages/SettingsLib/res/values-kn-rIN/cm_strings.xml
new file mode 100644
index 0000000..0d5fa43
--- /dev/null
+++ b/packages/SettingsLib/res/values-kn-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">ಅಪ್ಲಿಕೇಶನ್‌ಗಳು</string>
+  <string name="picker_activities">ಚಟುವಟಿಕೆಗಳು</string>
+  <string name="select_custom_app_title">ಕಸ್ಟಮ ಆಪ್ ಆಯ್ಕೆಗೊಳಿಸು</string>
+  <string name="select_custom_activity_title">ಕಸ್ಟಮ್ ಚಟುವಟಿಕೆ ಆಯ್ಕೆಗೊಳಿಸು</string>
+  <string name="lockscreen_targets_message">ಲಾಕ್‌ ಸ್ಕ್ರೀನ್ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-kn-rIN/strings.xml b/packages/SettingsLib/res/values-kn-rIN/strings.xml
new file mode 100644
index 0000000..3e1d94d
--- /dev/null
+++ b/packages/SettingsLib/res/values-kn-rIN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗಾಗಿ ಸ್ಕ್ಯಾನ್‌ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ಯಾವುದೂ ಇಲ್ಲ"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"ಉಳಿಸಲಾಗಿದೆ"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP ಕಾನ್ಫಿಗರೇಶನ್ ವಿಫಲತೆ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi ಸಂಪರ್ಕ ವಿಫಲತೆ"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ಪ್ರಮಾಣೀಕರಣ ಸಮಸ್ಯೆ"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"ವ್ಯಾಪ್ತಿಯಲ್ಲಿಲ್ಲ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ಯಾವುದೇ ಇಂಟರ್ನೆಟ್‌ ಪ್ರವೇಶ ಪತ್ತೆಯಾಗಿಲ್ಲ, ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಮರುಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> ರಿಂದ ಉಳಿಸಲಾಗಿದೆ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi ಸಹಾಯಕದ ಮೂಲಕ ಸಂಪರ್ಕಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s ಮೂಲಕ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s ಮೂಲಕ ಲಭ್ಯವಿದೆ"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ, ಇಂಟರ್ನೆಟ್ ಇಲ್ಲ"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗಿದೆ"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"ಸಂಪರ್ಕಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"ಜೋಡಿಸಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ಸಂಪರ್ಕಗೊಂಡಿದೆ (ಫೋನ್ ಇಲ್ಲ)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ಸಂಪರ್ಕಗೊಂಡಿದೆ (ಮಾಧ್ಯಮವಿಲ್ಲ)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ (ಯಾವುದೇ ಸಂದೇಶ ಪ್ರವೇಶವಿಲ್ಲ)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ಸಂಪರ್ಕಗೊಂಡಿದೆ (ಫೋನ್ ಅಥವಾ ಮಾಧ್ಯಮವಿಲ್ಲ)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"ಮಾಧ್ಯಮ ಆಡಿಯೋ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ಫೋನ್ ಆಡಿಯೋ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ಫೈಲ್ ವರ್ಗಾವಣೆ"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ಇನ್‌ಪುಟ್‌ ಸಾಧನ"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶ"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"ಸಂಪರ್ಕ ಹಂಚಿಕೆ"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"ಸಂಪರ್ಕ ಹಂಚಿಕೆಗಾಗಿ ಬಳಸಿ"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಹಂಚಿಕೊಳ್ಳುವಿಕೆ"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"ಸಂದೇಶ ಪ್ರವೇಶಿಸುವಿಕೆ"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"ಸಿಮ್ ಪ್ರವೇಶ"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ಮಾಧ್ಯಮ ಆಡಿಯೋಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ಫೋನ್ ಆಡಿಯೋಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ಫೈಲ್ ವರ್ಗಾವಣೆ ಸರ್ವರ್‌ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ನಕ್ಷೆಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ಫೈಲ್ ವರ್ಗಾವಣೆ ಸರ್ವರ್‌ಗೆ ಸಂಪರ್ಕಗೊಳ್ಳಲಿಲ್ಲ"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ಇನ್‌ಪುಟ್‌ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶಕ್ಕಾಗಿ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ಸಾಧನದ ಜೊತೆಗೆ ಸ್ಥಳೀಯ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶಕ್ಕಾಗಿ ಬಳಸಿ"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ನಕ್ಷೆಗಾಗಿ ಬಳಸಿ"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"ಸಿಮ್ ಪ್ರವೇಶಕ್ಕೆ ಬಳಸಿ"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ಮಾಧ್ಯಮ ಆಡಿಯೋ ಬಳಸು"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ಫೋನ್‌ ಆಡಿಯೋಗಾಗಿ ಬಳಕೆ"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ಫೈಲ್‌ ವರ್ಗಾವಣೆಗಾಗಿ ಬಳಸು"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಜೊತೆಗೆ ಸಂವಹನ ನಡೆಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ಜೋಡಿಸುವಿಕೆಯನ್ನು <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ತಿರಸ್ಕರಿಸಿದೆ"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"ವೈಫೈ ಆಫ್."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"ವೈಫೈ ಸಂಪರ್ಕ ಕಡಿತಗೊಂಡಿದೆ."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"ವೈಫೈ ಒಂದು ಪಟ್ಟಿ."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"ವೈಫೈ ಎರಡು ಪಟ್ಟಿಗಳು."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"ವೈಫೈ ಮೂರು ಪಟ್ಟಿಗಳು."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"ವೈಫೈ ಸಿಗ್ನಲ್‌‌ ಪೂರ್ತಿ ಇದೆ."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ko/arrays.xml b/packages/SettingsLib/res/values-ko/arrays.xml
new file mode 100644
index 0000000..0fcb70d
--- /dev/null
+++ b/packages/SettingsLib/res/values-ko/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"검색 중..."</item>
+    <item msgid="8513729475867537913">"연결 중…"</item>
+    <item msgid="515055375277271756">"인증하는 중..."</item>
+    <item msgid="1943354004029184381">"IP 주소를 가져오는 중..."</item>
+    <item msgid="4221763391123233270">"연결됨"</item>
+    <item msgid="624838831631122137">"일시 정지됨"</item>
+    <item msgid="7979680559596111948">"연결을 끊는 중…"</item>
+    <item msgid="1634960474403853625">"연결 끊김"</item>
+    <item msgid="746097431216080650">"실패"</item>
+    <item msgid="6367044185730295334">"차단됨"</item>
+    <item msgid="503942654197908005">"연결 불량 일시적으로 방지"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 IP 주소를 가져오는 중..."</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에 연결됨"</item>
+    <item msgid="1330262655415760617">"일시 정지됨"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>에서 연결을 끊는 중..."</item>
+    <item msgid="197508606402264311">"연결 끊김"</item>
+    <item msgid="8578370891960825148">"실패"</item>
+    <item msgid="5660739516542454527">"차단됨"</item>
+    <item msgid="1805837518286731242">"연결 상태 불량 일시적으로 방지"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml
new file mode 100644
index 0000000..2f78a90
--- /dev/null
+++ b/packages/SettingsLib/res/values-ko/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"네트워크를 검색할 수 없습니다."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"없음"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"저장됨"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"사용 중지됨"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 설정 실패"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi 연결 실패"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"인증 문제"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"범위 내에 없음"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"감지된 인터넷 액세스가 없으며 자동으로 다시 연결되지 않습니다."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g>(으)로 저장됨"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi 도우미를 통해 연결됨"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s을(를) 통해 연결됨"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s을(를) 통해 사용 가능"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"인터넷을 사용하지 않고 연결됨"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"연결 끊김"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"연결을 끊는 중…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"연결 중…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"연결됨"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"페어링 중..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"연결됨(전화 없음)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"연결됨(미디어 없음)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"연결됨(메시지 액세스 없음)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"연결됨(전화 또는 미디어 없음)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"미디어 오디오"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"휴대폰 오디오"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"파일 전송"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"입력 장치"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"인터넷 액세스"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"연락처 공유"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"연락처 공유용"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"인터넷 연결 공유"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"메시지 액세스"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM 액세스"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"미디어 오디오에 연결됨"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"휴대전화 오디오에 연결됨"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"파일 전송 서버에 연결됨"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"지도에 연결됨"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP에 연결됨"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"파일 전송 서버에 연결되지 않았습니다."</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"입력 장치에 연결됨"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"인터넷 액세스를 위해 기기에 연결됨"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"로컬 인터넷 연결을 기기와 공유 중"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"인터넷 액세스에 사용"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"지도에 사용"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM 액세스에 사용"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"미디어 오디오에 사용"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"휴대전화 오디오에 사용"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"파일 전송에 사용"</string>
+    <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_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">"PIN 또는 패스키가 잘못되어 <xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 페어링하지 못했습니다."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>와(과) 통신할 수 없습니다."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>에서 페어링을 거부했습니다."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi가 꺼져 있습니다."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi 연결이 끊어졌습니다."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi 신호 막대가 한 개입니다."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi 신호 막대가 두 개입니다."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi 신호 막대가 세 개입니다."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi 신호가 강합니다."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ku/arrays.xml b/packages/SettingsLib/res/values-ku/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-ku/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-ku/strings.xml b/packages/SettingsLib/res/values-ku/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-ku/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-ky-rKG/arrays.xml b/packages/SettingsLib/res/values-ky-rKG/arrays.xml
new file mode 100644
index 0000000..207dea1
--- /dev/null
+++ b/packages/SettingsLib/res/values-ky-rKG/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Скандалууда…"</item>
+    <item msgid="8513729475867537913">"Туташууда…"</item>
+    <item msgid="515055375277271756">"Аныктыгы текшерилүүдө…"</item>
+    <item msgid="1943354004029184381">"IP дареги алынууда…"</item>
+    <item msgid="4221763391123233270">"Туташып турат"</item>
+    <item msgid="624838831631122137">"Убактылуу токтотулду"</item>
+    <item msgid="7979680559596111948">"Ажыратылууда…"</item>
+    <item msgid="1634960474403853625">"Ажыратылды"</item>
+    <item msgid="746097431216080650">"Ийгиликсиз"</item>
+    <item msgid="6367044185730295334">"Бөгөттөлгөн"</item>
+    <item msgid="503942654197908005">"Начар байланыштан убактылуу баш тартууда"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> тармагынан IP дареги алынууда…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> тармагына туташты"</item>
+    <item msgid="1330262655415760617">"Убактылуу токтотулду"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> тармагынан ажыратылууда…"</item>
+    <item msgid="197508606402264311">"Ажыратылды"</item>
+    <item msgid="8578370891960825148">"Ийгиликсиз"</item>
+    <item msgid="5660739516542454527">"Бөгөттөлгөн"</item>
+    <item msgid="1805837518286731242">"Начар байланыштан убактылуу баш тартууда"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ky-rKG/strings.xml b/packages/SettingsLib/res/values-ky-rKG/strings.xml
new file mode 100644
index 0000000..cb70c6c
--- /dev/null
+++ b/packages/SettingsLib/res/values-ky-rKG/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Түйүндөрдү издөө мүмкүн эмес"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Жок"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Сакталды"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Өчүрүлгөн"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурациясы бузулду"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi туташуусу бузулду"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Аутентификация маселеси бар"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Тейлөө аймагында эмес"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернетке кирүү мүмкүнчүлүгү табылган жок, андыктан автоматтык түрдө кайра туташпайт."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> тарабынан сакталды"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi жардамчысы аркылуу туташып турат"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s аркылуу жеткиликтүү"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s аркылуу жеткиликтүү"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Туташып турат, Интернет жок"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ажыратылды"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Ажыратылууда…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Туташууда…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Туташып турат"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Жупташтырылууда…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Туташып турат (телефониясыз)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Туташып турат (медиасыз)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Байланышта (билдирүү алмашуу жок)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Туташып турат (телефониясыз же медиасыз)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Аудио"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Телефон"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Файл алмашуу"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Киргизүү түзмөгү"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернетке мүмкүнчүлүк алуу"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Байланышты бөлүшүү"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Байланышты бөлүшүү үчүн колдонуу"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернет байланышын бөлүшүү"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Билдирүү алмашуу"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM картаны пайдалануу мүмкүнчүлүгү"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиого туташты"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Телефон аудиосуна туташты"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл өткөрүү серверине туташты"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"MAP\'ка байланышты"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP\'ка туташып турат"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Файл өткөрүү серверине туташкан жок"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Киргизүү түзмөгүнө туташты"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Интернетке мүмкүнчүлүк алуу үчүн түзмөккө туташты"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Жергиликтүү Интернет туташуусу түзмөк менен бөлүшүлүүдө"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Интернетке мүмкүнчүлүк алуу үчүн колдонулсун"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"MAP үчүн колдонуу"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM картаны пайдалануу үчүн колдонуу"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Медиа аудио үчүн колдонуу"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Телефон аудиосу үчүн колдонулсун"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Файл өткөрүү үчүн колдонулсун"</string>
+    <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_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">"PIN же код туура эмес болгондуктан <xliff:g id="DEVICE_NAME">%1$s</xliff:g> туташуу мүмкүн эмес."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен байланышуу мүмкүн эмес."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Жупташтырууну <xliff:g id="DEVICE_NAME">%1$s</xliff:g> четке какты."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi өчүк."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi туташуусу жок."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi: бир таякча."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi: эки таякча."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi: үч таякча."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wifi: күчтүү сигнал."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-lb/arrays.xml b/packages/SettingsLib/res/values-lb/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-lb/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-lb/strings.xml b/packages/SettingsLib/res/values-lb/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-lb/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-lo-rLA/arrays.xml b/packages/SettingsLib/res/values-lo-rLA/arrays.xml
new file mode 100644
index 0000000..799a6ec
--- /dev/null
+++ b/packages/SettingsLib/res/values-lo-rLA/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"ກຳລັງສະແກນ..."</item>
+    <item msgid="8513729475867537913">"ກຳລັງເຊື່ອມຕໍ່..."</item>
+    <item msgid="515055375277271756">"ກຳລັງພິສູດຢືນຢັນ..."</item>
+    <item msgid="1943354004029184381">"ກຳລັງຂໍທີ່ຢູ່ IP..."</item>
+    <item msgid="4221763391123233270">"ເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="624838831631122137">"ຖືກລະງັບໄວ້"</item>
+    <item msgid="7979680559596111948">"ກຳລັງຕັດການເຊື່ອມຕໍ່..."</item>
+    <item msgid="1634960474403853625">"ບໍ່ໄດ້ເຊື່ອມຕໍ່"</item>
+    <item msgid="746097431216080650">"ບໍ່ສຳເລັດ"</item>
+    <item msgid="6367044185730295334">"ບລັອກແລ້ວ"</item>
+    <item msgid="503942654197908005">"ຫຼີກເວັ້ນການເຊື່ອມຕໍ່ຊົ່ວຄາວຫາກສັນຍານບໍ່ແຮງພໍ"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"ກຳລັງຕັດການເຊື່ອມຕໍ່ຈາກ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"ປິດການເຊື່ອມຕໍ່ແລ້ວ"</item>
+    <item msgid="8578370891960825148">"ບໍ່ສຳເລັດ"</item>
+    <item msgid="5660739516542454527">"ປິດກັ້ນແລ້ວ"</item>
+    <item msgid="1805837518286731242">"ຫຼີກເວັ້ນການເຊື່ອມຕໍ່ເຄືອຂ່າຍສັນຍານອ່ອນຊົ່ວຄາວ"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-lo-rLA/strings.xml b/packages/SettingsLib/res/values-lo-rLA/strings.xml
new file mode 100644
index 0000000..37d7bef
--- /dev/null
+++ b/packages/SettingsLib/res/values-lo-rLA/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ບໍ່ສາມາດກວດຫາເຄືອຂ່າຍໄດ້"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ບໍ່ໃຊ້"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"ບັນ​ທຶກແລ້ວ"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ປິດການນຳໃຊ້"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"ການ​ຕັ້ງ​ຄ່າ IP ລົ້ມ​ເຫຼວ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"​ການ​ເຊື່ອມ​ຕໍ່ WiFi ລົ້ມ​ເຫຼວ"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ບັນຫາການພິສູດຢືນຢັນ"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"ບໍ່ຢູ່ໃນໄລຍະທີ່ເຊື່ອມຕໍ່ໄດ້"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"​ບໍ່​ພົບ​ການ​ເຊື່ອມ​ຕໍ່​ອິນ​ເຕີ​ເນັດ​, ຈະ​ບໍ່​ຖືກ​ເຊື່ອມ​ຕໍ່​ໃໝ່​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ."</string>
+    <string name="saved_network" msgid="4352716707126620811">"ບັນທຶກ​​​ໂດຍ <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"ເຊື່ອມ​ຕໍ່​ຜ່ານ Wi‑Fi ຕົວ​ຊ່ວຍ​ແລ້ວ"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"​ເຊື່ອມຕໍ່​ຜ່ານ %1$s ​ແລ້ວ"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"ມີ​ໃຫ້​ຜ່ານ %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"​ເຊື່ອມ​ຕໍ່​ແລ້ວ,​ ບໍ່​ມີ​ອິນ​ເຕີ​ເນັດ"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ຕັດການເຊື່ອມຕໍ່ແລ້ວ"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"ກຳລັງຢຸດການເຊື່ອມຕໍ່..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"ກຳລັງເຊື່ອມຕໍ່..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"ເຊື່ອມ​ຕໍ່ແລ້ວ"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"ກຳລັງຈັບຄູ່..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີໂທລະສັບ)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີສື່)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ເຊື່ອມຕໍ່ (ບໍ່ມີການເຂົ້າເຖິງຂໍ້ຄວາມ)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ເຊື່ອມຕໍ່ແລ້ວ (ບໍ່ມີໂທລະສັບ ຫຼືສື່)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"ສຽງ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ສຽງໂທລະສັບ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ການໂອນຍ້າຍໄຟລ໌"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ອຸປະກອນປ້ອນຂໍ້ມູນ"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ການເຂົ້າເຖິງອິນເຕີເນັດ"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"ການ​ແບ່ງ​ປັນ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"​ໃຊ້​ສຳ​ລັບການ​ແບ່ງ​ປັນ​ລາຍ​ຊື່​ຜູ່​ຕິດ​ຕໍ່"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ການແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"ການ​ເຂົ້າ​ເຖິງ​ຂໍ້​ຄວາມ"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"ການ​ເຂົ້າ​ເຖິງ SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ເຊື່ອມຕໍ່ກັບສື່ດ້ານສຽງແລ້ວ"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ເຊື່ອມຕໍ່ກັບສຽງໂທລະສັບແລ້ວ"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ເຊື່ອມຕໍ່ກັບເຊີບເວີໂອນຍ້າຍໄຟລ໌ແລ້ວ"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ເຊື່ອມ​ຕໍ່​ກັບ​ແຜນ​ທີ່ແລ້ວ"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"ເຊື່ອມ​ຕໍ່​ກັບ SAP ​ແລ້ວ"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ບໍ່ໄດ້ເຊື່ອມຕໍ່ຫາເຊີບເວີໂອນຍ້າຍໄຟລ໌"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ເຊື່ອມຕໍ່ກັບອຸປະກອນປ້ອນຂໍ້ມູນແລ້ວ"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ເຊື່ອມຕໍ່ກັບອຸປະກອນເພື່ອເຂົ້າເຖິງອິນເຕີເນັດແລ້ວ"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ກຳລັງແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດກັບອຸປະກອນ"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ໃຊ້ເພື່ອເຂົ້າອິນເຕີເນັດ"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ໃຊ້ສຳລັບແຜນທີ່"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"ການ​ໃຊ້​ສໍາ​ລັບ​ການ​ເຂົ້າ​ເຖິງ SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ໃຊ້ສຳລັບສື່ດ້ານສຽງ"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ໃຊ້ສຳລັບລະບົບສຽງຂອງໂທລະສັບ"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ໃຊ້ເພື່ອໂອນຍ້າຍໄຟລ໌"</string>
+    <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_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> ໄດ້ ເພາະ PIN ຫຼື passkey ບໍ່ຖືກຕ້ອງ."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ບໍ່ສາມາດຕິດຕໍ່ສື່ສານກັບ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ໄດ້."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ການຈັບຄູ່ຖືກປະຕິເສດໂດຍ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"WiFi ປິດຢູ່."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"ຕັດການເຊື່ອມຕໍ່ Wi-Fi ແລ້ວ."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"ສັນຍານ Wi-Fi ນຶ່ງຂີດ."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"ສັນຍານ Wi-Fi ສອງຂີດ."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi ສາມຂີດ."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"ສັນຍານ Wi-Fi ເຕັມ"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-lt/arrays.xml b/packages/SettingsLib/res/values-lt/arrays.xml
new file mode 100644
index 0000000..8b16385
--- /dev/null
+++ b/packages/SettingsLib/res/values-lt/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Nuskaitoma..."</item>
+    <item msgid="8513729475867537913">"Prisijungiama..."</item>
+    <item msgid="515055375277271756">"Nustatoma tapatybė..."</item>
+    <item msgid="1943354004029184381">"Gaunamas IP adresas..."</item>
+    <item msgid="4221763391123233270">"Prisijungta"</item>
+    <item msgid="624838831631122137">"Pristabdyta"</item>
+    <item msgid="7979680559596111948">"Atjungiama..."</item>
+    <item msgid="1634960474403853625">"Atsijungęs (-usi)"</item>
+    <item msgid="746097431216080650">"Nesėkminga"</item>
+    <item msgid="6367044185730295334">"Užblokuota"</item>
+    <item msgid="503942654197908005">"Laikinai vengiama prasto ryšio"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Nuskaitoma..."</item>
+    <item msgid="355508996603873860">"Prijungiama prie <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Nustatoma tapatybė su <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Gaunamas IP adresas iš <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Prijungta prie <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Pristabdyta"</item>
+    <item msgid="7698638434317271902">"Atjungiama nuo <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Atsijungęs (-usi)"</item>
+    <item msgid="8578370891960825148">"Nesėkminga"</item>
+    <item msgid="5660739516542454527">"Užblokuota"</item>
+    <item msgid="1805837518286731242">"Laikinai vengiama prasto ryšio"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml
new file mode 100644
index 0000000..57dd5a6
--- /dev/null
+++ b/packages/SettingsLib/res/values-lt/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nepavyksta nuskaityti tinklų"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nėra"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Išsaugotas"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Neleidžiama"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP konfigūracijos triktis"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"„Wi-Fi“ ryšio triktis"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentifikavimo problema"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ne diapazone"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Neaptikta jokia prieiga prie interneto, nebus automatiškai iš naujo prisijungta."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Išsaugojo <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Prisijungta naudojant „Wi‑Fi“ pagelbiklį"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Prisijungta naudojant „%1$s“"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Pasiekiama naudojant „%1$s“"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Prisijungta, nėra interneto"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atsijungęs (-usi)"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Atjungiama..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Prisijungiama..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Prisijungta"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Susiejama..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Prijungta (be telefono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Prijungta (be laikmenos)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Prisijungta (be prieigos prie pranešimų)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Prijungta (be telefono ar laikmenos)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Laikmenos garsas"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefono garsas"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Failo perkėlimas"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Įvesties įrenginys"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prieiga prie interneto"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktų bendrinimas"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Naudoti kontaktams bendrinti"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneto ryšio bendrinimas"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Prieiga prie pranešimų"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM prieiga"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Prijungta prie medijos garso įrašo"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Prijungta prie telefono garso"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Prijungta prie failų perkėlimo serverio"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Prisijungta prie žemėlapio"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Prisijungta prie SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neprijungta prie failų perkėlimo serverio"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Prisijungta prie įvesties įrenginio."</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pr. prie įr., kad gaut. pr. prie int."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Bendr. vt. int. ryš. su įr."</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Naudoti interneto prieigai"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Naudoti žemėlapyje"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Naudoti SIM prieigai"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Naudoti medijos garsui"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Naudoti telefono garso įrašui"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Naudoti failų perkėlimui"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Naudoti įvedant"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Susieti"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SUSIETI"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Atšaukti"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Susiejus suteikiama prieiga prie kontaktų ir skambučių istorijos, esant prisijungus."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nepavyko susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nepavyko susieti su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ dėl netinkamo PIN kodo ar prieigos rakto."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nepavyksta užmegzti ryšio su „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Susiejimą atmetė <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"„Wi-Fi“ išjungtas."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"„Wi-Fi“ atjungtas."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Viena „Wi-Fi“ signalo juosta."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Dvi „Wi-Fi“ signalo juostos."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Trys „Wi-Fi“ signalo juostos."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Stiprus „Wi-Fi“ signalas."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-lv/arrays.xml b/packages/SettingsLib/res/values-lv/arrays.xml
new file mode 100644
index 0000000..40ba222
--- /dev/null
+++ b/packages/SettingsLib/res/values-lv/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Notiek skenēšana..."</item>
+    <item msgid="8513729475867537913">"Notiek savienojuma izveide…"</item>
+    <item msgid="515055375277271756">"Notiek autentificēšana..."</item>
+    <item msgid="1943354004029184381">"Notiek IP adreses iegūšana…"</item>
+    <item msgid="4221763391123233270">"Izveidots savienojums"</item>
+    <item msgid="624838831631122137">"Atlikts"</item>
+    <item msgid="7979680559596111948">"Notiek atvienošana..."</item>
+    <item msgid="1634960474403853625">"Atvienots"</item>
+    <item msgid="746097431216080650">"Neizdevās"</item>
+    <item msgid="6367044185730295334">"Bloķēts"</item>
+    <item msgid="503942654197908005">"Pagaidām netiek izmantots vājš savienojums."</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Notiek skenēšana..."</item>
+    <item msgid="355508996603873860">"Notiek savienojuma izveide ar <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Notiek autentificēšana ar <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Notiek IP adreses iegūšana no <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Savienots ar <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Atlikts"</item>
+    <item msgid="7698638434317271902">"Notiek atvienošana no <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Atvienots"</item>
+    <item msgid="8578370891960825148">"Neizdevās"</item>
+    <item msgid="5660739516542454527">"Bloķēts"</item>
+    <item msgid="1805837518286731242">"Pagaidām netiek izmantots vājš savienojums."</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml
new file mode 100644
index 0000000..725da49
--- /dev/null
+++ b/packages/SettingsLib/res/values-lv/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nevar skenēt tīklus"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nav"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Saglabāts"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Atspējots"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP konfigurācijas kļūme"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi savienojuma kļūme"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentificēšanas problēma"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nav diapazona ietvaros"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nevar noteikt interneta savienojumu. Savienojums netiks izveidots vēlreiz automātiski."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Saglabāja: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Izveidots savienojums ar Wi‑Fi palīgu"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Savienots, izmantojot %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Pieejams, izmantojot %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Savienots, nav piekļuves internetam"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Atvienots"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Notiek atvienošana..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Notiek savienojuma izveide…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Izveidots savienojums"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Notiek pāra izveide..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Savienojums ir izveidots (nav tālruņa)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Sav. ir izveidots (nav multivides)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Savienots (nav piekļuves ziņojumam)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Sav. ir izveidots (nav tel. vai multiv.)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Multivides audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Tālruņa audio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Failu pārsūtīšana"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Ievades ierīce"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Interneta piekļuve"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktpersonas informācijas kopīgošana"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Izmantot kontaktpersonas informācijas kopīgošanai"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneta savienojuma koplietošana"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Piekļuve ziņojumam"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Piekļuve SIM kartei"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Savienots ar multivides audio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Savienots ar tālruņa audio"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Savienots ar failu pārsūtīšanas serveri"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Izveidots savienojums ar karti"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Savienots ar SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nav savienots ar failu pārsūtīšanas serveri"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Izveidots savienojums ar ievades ierīci"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Savien. ar ier., lai nodr. int. piekļ."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Tiek kopliet. lok. intern. savien. ar ierīci"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Izmantot, lai piekļūtu internetam"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Lietot kartei"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Izmantot, lai piekļūtu SIM kartei"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Izmantot multivides skaņai"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Izmantot tālruņa skaņai"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Izmantot faila pārsūtīšanai"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Izmantot ievadei"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Izveidot pāri"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SAVIENOT PĀRĪ"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Atcelt"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Veicot savienošanu pārī, šī ierīce savienojuma laikā varēs piekļūt jūsu kontaktpersonām un zvanu vēsturei."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nevarēja savienot pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nevarēja savienot pārī ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, jo tika ievadīts nepareizs PIN kods vai nepareiza ieejas atslēga."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nevar sazināties ar ierīci <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> noraidīja pāra izveidi."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi savienojums izslēgts"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi savienojums pārtraukts"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi: viena josla"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi: divas joslas"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi: trīs joslas"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Pilna piekļuve Wi-Fi signālam"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-mk-rMK/arrays.xml b/packages/SettingsLib/res/values-mk-rMK/arrays.xml
new file mode 100644
index 0000000..5c51a7d
--- /dev/null
+++ b/packages/SettingsLib/res/values-mk-rMK/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Скенирање..."</item>
+    <item msgid="8513729475867537913">"Се поврзува..."</item>
+    <item msgid="515055375277271756">"Автентицирање..."</item>
+    <item msgid="1943354004029184381">"Добивање ИП адреса..."</item>
+    <item msgid="4221763391123233270">"Поврзана"</item>
+    <item msgid="624838831631122137">"Суспендирана"</item>
+    <item msgid="7979680559596111948">"Се исклучува..."</item>
+    <item msgid="1634960474403853625">"Исклучено"</item>
+    <item msgid="746097431216080650">"Неуспешна"</item>
+    <item msgid="6367044185730295334">"Блокирана"</item>
+    <item msgid="503942654197908005">"Привремено избегнува лоша врска"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"Добивање ИП адреса од <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>
+    <item msgid="7698638434317271902">"Исклучување од <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Исклучено"</item>
+    <item msgid="8578370891960825148">"Неуспешна"</item>
+    <item msgid="5660739516542454527">"Блокирано"</item>
+    <item msgid="1805837518286731242">"Привремено избегнува лоша врска"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-mk-rMK/strings.xml b/packages/SettingsLib/res/values-mk-rMK/strings.xml
new file mode 100644
index 0000000..52688e3
--- /dev/null
+++ b/packages/SettingsLib/res/values-mk-rMK/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не може да скенира за мрежи"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ниедна"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Зачувано"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Оневозможено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Конфигурирањето ИП не успеа"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Поврзувањето преку Wi-Fi не успеа"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем со автентикација"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Надвор од опсег"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Не е откриен пристап до интернет, нема автоматски повторно да се поврзете."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Зачувано од <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Поврзано преку помошник за Wi-Fismile"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Поврзано преку %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Достапно преку %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Поврзана, нема интернет"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Исклучено"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Се исклучува..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Се поврзува..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Поврзани"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Поврзување..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Поврзани (без телефон)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Поврзани (без медиуми)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Поврзано (без порака за пристап)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Поврзан (без телефон или медиуми)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Аудио на медиуми"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Аудио на телефон"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Пренос на датотека"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Влезен уред"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Пристап на интернет"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Споделување контакти"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Користи за споделување контакти"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделување конекција на интернет"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Порака за пристап"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Пристап до СИМ"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Поврзан со аудио на медиуми"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Поврзан со аудио на телефон"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Поврзан со сервер за пренос на датотеки"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Поврзано со карта"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Поврзано со SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Не е поврзан со сервер за пренос на датотеки"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Поврзан со влезен уред"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Поврзан со уред за пристап на интернет"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Споделување локална конекција на интернет со уред"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Користи за пристап на интернет"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Користи за карта"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Користете се пристап до СИМ"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Користи за аудио на медиуми"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Користи за аудио на телефон"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Користи за пренос на датотеки"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не може да комуницира со <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Спарувањето е одбиено од <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi е исклучено."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi е исклучено."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Една црта на Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Две црти на Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Три црти на Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Полн сигнал на Wi-Fi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ml-rIN/arrays.xml b/packages/SettingsLib/res/values-ml-rIN/arrays.xml
new file mode 100644
index 0000000..4d3261a
--- /dev/null
+++ b/packages/SettingsLib/res/values-ml-rIN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"സ്‌കാൻചെയ്യുന്നു..."</item>
+    <item msgid="8513729475867537913">"കണക്‌റ്റുചെയ്യുന്നു..."</item>
+    <item msgid="515055375277271756">"പ്രാമാണീകരിക്കുന്നു..."</item>
+    <item msgid="1943354004029184381">"IP വിലാസം നേടുന്നു..."</item>
+    <item msgid="4221763391123233270">"കണക്റ്റുചെയ്‌തു"</item>
+    <item msgid="624838831631122137">"താൽക്കാലികമായി നിർത്തി"</item>
+    <item msgid="7979680559596111948">"വിച്‌ഛേദിക്കുന്നു..."</item>
+    <item msgid="1634960474403853625">"വിച്ഛേദിച്ചു"</item>
+    <item msgid="746097431216080650">"പരാജയപ്പെട്ടു"</item>
+    <item msgid="6367044185730295334">"തടഞ്ഞിരിക്കുന്നു"</item>
+    <item msgid="503942654197908005">"മോശം കണക്ഷൻ താൽക്കാലികമായി ഒഴിവാക്കുന്നു"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> എന്നതിൽ നിന്ന് IP വിലാസം നേടുന്നു..."</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> എന്നതിൽ കണക്‌റ്റുചെയ്‌തു"</item>
+    <item msgid="1330262655415760617">"താൽക്കാലികമായി നിർത്തി"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> എന്നതിൽ നിന്ന് വിച്‌ഛേദിക്കുന്നു..."</item>
+    <item msgid="197508606402264311">"വിച്ഛേദിച്ചു"</item>
+    <item msgid="8578370891960825148">"പരാജയപ്പെട്ടു"</item>
+    <item msgid="5660739516542454527">"തടഞ്ഞിരിക്കുന്നു"</item>
+    <item msgid="1805837518286731242">"മോശം കണക്ഷൻ താൽക്കാലികമായി ഒഴിവാക്കുന്നു"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ml-rIN/cm_strings.xml b/packages/SettingsLib/res/values-ml-rIN/cm_strings.xml
new file mode 100644
index 0000000..b4ba826
--- /dev/null
+++ b/packages/SettingsLib/res/values-ml-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">അപ്ലിക്കേഷനുകൾ</string>
+  <string name="picker_activities">പ്രവർത്തനങ്ങൾ</string>
+  <string name="select_custom_app_title">കസ്റ്റം അപ്ലിക്കേഷൻ തിരഞ്ഞെടുക്കുക</string>
+  <string name="select_custom_activity_title">കസ്റ്റം പ്രവർത്തനം തിരഞ്ഞെടുക്കുക</string>
+  <string name="lockscreen_targets_message">ലോക്ക് സ്ക്രീൻ കുറുക്കുവഴികൾ</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ml-rIN/strings.xml b/packages/SettingsLib/res/values-ml-rIN/strings.xml
new file mode 100644
index 0000000..44a3501
--- /dev/null
+++ b/packages/SettingsLib/res/values-ml-rIN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"നെ‌റ്റ്‌വർക്കുകൾക്കായി സ്കാൻ ചെയ്യാനായില്ല"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ഒന്നുമില്ല"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"സംരക്ഷിച്ചു"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"പ്രവർത്തനരഹിതമാക്കി"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP കോൺഫിഗറേഷൻ പരാജയം"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi കണക്ഷൻ പരാജയം"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ആധികാരികമാക്കുന്നതിലെ പ്രശ്‌നം"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"പരിധിയിലില്ല"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ഇന്റർനെറ്റ് ആക്സസ്സൊന്നും കണ്ടെത്താത്തതിനാൽ സ്വയം വീണ്ടും കണക്‌റ്റുചെയ്യില്ല."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> സംരക്ഷിച്ചത്"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"വൈഫൈ അസിസ്റ്റന്റ് മുഖേന കണക്‌റ്റുചെയ്തു"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s വഴി ബന്ധിപ്പിച്ചു"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s വഴി ലഭ്യം"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"കണക്റ്റുചെയ്തിരിക്കുന്നു, ഇന്റർനെറ്റില്ല"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"വിച്ഛേദിച്ചു"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"വിച്‌ഛേദിക്കുന്നു..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"കണക്‌റ്റുചെയ്യുന്നു..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"കണക്റ്റുചെയ്‌തു"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"ജോടിയാക്കുന്നു…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"കണ‌ക്റ്റുചെയ്‌തു (ഫോൺ ഇല്ല)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"കണക്‌റ്റുചെയ്‌തു (മീഡിയ ഇല്ല)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"കണക്റ്റുചെയ്‌തു (സന്ദേശ ആക്‌സസ്സില്ല)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"കണ‌ക്റ്റുചെ‌യ്തു (ഫോണോ മീഡിയയോ അല്ല)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"മീഡിയ ഓഡിയോ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ഫോൺ ഓഡിയോ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ഫയൽ കൈമാറൽ"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ഇൻപുട്ട് ഉപകരണം"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ഇന്റർനെറ്റ് ആക്‌സസ്സ്"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"കോൺടാക്‌റ്റ് പങ്കിടൽ"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"കോൺടാക്‌റ്റ് പങ്കിടലിനായി ഉപയോഗിക്കുക"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടൽ"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"ആക്‌സസ്സ് നിയന്ത്രിക്കുക"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ആക്സസ്"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"മീഡിയ ഓഡിയോയിലേക്ക് കണ‌ക്റ്റുചെയ്‌തു"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ഫോൺ ഓഡിയോയിൽ കണ‌ക്റ്റുചെ‌യ്‌തു"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ഫയൽ കൈമാറ്റ സെർവറിലേക്ക് കണ‌ക്റ്റുചെ‌യ്‌തു"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"മാപ്പിലേക്ക് കണക്റ്റുചെയ്‌തു"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP-യിലേക്ക് ബന്ധിപ്പിച്ചു"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ഫയൽ കൈമാറ്റ സെർവറിൽ കണ‌ക്റ്റുചെയ്‌തിട്ടില്ല"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ഇൻപുട്ട് ഉപകരണത്തിൽ കണക്റ്റുചെയ്‌തു"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ഇന്റ‌ർനെറ്റ് ആക്‌‌സസ്സിനായി ഉപകരണത്തിൽ കണ‌ക്‌റ്റുചെയ്‌തു"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ഉപകരണവുമായി പ്രദേശിക ഇന്റ‌ർനെറ്റ്‌ കണക്ഷൻ പങ്കിടുന്നു"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ഇന്റ‌ർനെറ്റ് ആക്‌‌സസ്സിനായി ഉപയോഗിക്കുന്നു"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"മാപ്പിനായി ഉപയോഗിക്കുക"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM ആക്സസിന് ഉപയോഗിക്കുക"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"മീഡിയ ഓഡിയോയ്ക്കായി ഉപയോഗിക്കുക"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ഫോൺ ഓഡിയോയ്ക്കായി ഉപയോഗിക്കുക"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ഫയൽ കൈമാറ്റത്തിനായി ഉപയോഗിക്കുന്നു"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> എന്നതുമായി ആശയവിനിമയം നടത്താനായില്ല."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>, ജോടിയാക്കൽ നിരസിച്ചു."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"വൈഫൈ ഓഫാണ്."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"വൈഫൈ വിച്ഛേദിച്ചു."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"വൈഫൈ സിഗ്നൽ ഒരു ബാർ."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"വൈഫൈ സിഗ്നൽ രണ്ട് ബാറുകൾ."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"വൈഫൈ സിഗ്നൽ മൂന്ന് ബാറുകൾ."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"വൈഫൈ മികച്ച സിഗ്‌നൽ."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-mn-rMN/arrays.xml b/packages/SettingsLib/res/values-mn-rMN/arrays.xml
new file mode 100644
index 0000000..2849b51
--- /dev/null
+++ b/packages/SettingsLib/res/values-mn-rMN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Скан хийж байна…"</item>
+    <item msgid="8513729475867537913">"Холбогдож байна..."</item>
+    <item msgid="515055375277271756">"Гэрчлэж байна"</item>
+    <item msgid="1943354004029184381">"IP хаягийг авч байна…"</item>
+    <item msgid="4221763391123233270">"Холбогдсон"</item>
+    <item msgid="624838831631122137">"Түр хаасан"</item>
+    <item msgid="7979680559596111948">"Салгаж байна…"</item>
+    <item msgid="1634960474403853625">"Салгагдсан"</item>
+    <item msgid="746097431216080650">"Амжилтгүй"</item>
+    <item msgid="6367044185730295334">"Хориглогдсон"</item>
+    <item msgid="503942654197908005">"Муу холболтоос түр зайлсхийж байна"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-с IP хаягийг авч байна…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> руу холбогдсон"</item>
+    <item msgid="1330262655415760617">"Түр хаасан"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>-с салгагдаж байна…"</item>
+    <item msgid="197508606402264311">"Салгагдсан"</item>
+    <item msgid="8578370891960825148">"Амжилтгүй"</item>
+    <item msgid="5660739516542454527">"Хориглогдсон"</item>
+    <item msgid="1805837518286731242">"Муу холболтоос түр зайлсхийж байна"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-mn-rMN/strings.xml b/packages/SettingsLib/res/values-mn-rMN/strings.xml
new file mode 100644
index 0000000..968ca1c
--- /dev/null
+++ b/packages/SettingsLib/res/values-mn-rMN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Сүлжээнүүдийг скан хийх боломжгүй"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Байхгүй"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Хадгалагдсан"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Идэвхгүйжүүлсэн"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP тохируулга амжилтгүй"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi холболт амжилтгүй"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Гэрчлэлийн асуудал"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Хүрээнд байхгүй"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Интернэт холболт илэрсэнгүй, автоматаар дахин холболт хийгдэхгүй"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> хадгалсан"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi-Fi туслагчаар дамжуулан холбогдлоо"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s-р холбогдсон"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s-р боломжтой"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Холбогдсон, интернэт байхгүй байна"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Салгагдсан"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Салгаж байна…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Холбогдож байна..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Холбогдсон"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Хослуулж байна…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Холбогдсон (утас байхгүй)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Холбогдсон (медиа байхгүй)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Холбогдсон (зурвас хандалт байхгүй)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Холбогдсон (утас буюу медиа байхгүй)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Медиа аудио"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Утасны аудио"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Файл дамжуулалт"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Оруулах төхөөрөмж"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернэт хандалт"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Харилцагч хуваалцах"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Харилцагч хуваалцахад ашиглах"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернэт холболтыг хуваалцах"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Зурвас хандалт"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Хандалт"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиод холбогдсон"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Утасны аудид холбогдсон"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл дамжуулах серверт холбогдсон"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Газрын зурагтай холбогдсон"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP-д холбогдсон"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Файл дамжуулах серверт холбогдоогүй"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Оруулах төхөөрөмжтэй холбогдсон"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Интернетэд хандахын тулд төхөөрөмжтэй холбогдсон"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Төхөөрөмжтэй локал Интернет холболтыг хуваалцаж байна"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Интернет хандалтанд ашиглах"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Газрын зурагт ашиглах"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM хандалтад ашиглах"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Медиа аудиод ашиглах"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Утасны аудиод ашиглах"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Файл дамжуулахад ашиглах"</string>
+    <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_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">"Буруу PIN эсхүл дамжих түлхүүрээс шалтгаалан <xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тай хослуулж чадсангүй."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>-тай холбоо барих боломжгүй."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Хослуулахаас <xliff:g id="DEVICE_NAME">%1$s</xliff:g> татгалзсан."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi унтраалттай байна."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi холбогдоогүй байна."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi сүлжээний дохио нэг баганатай байна."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi сүлжээний дохио хоёр баганатай байна."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi сүлжээний дохио гурван баганатай байна."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wifi-н дохио дүүрэн байна."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-mr-rIN/arrays.xml b/packages/SettingsLib/res/values-mr-rIN/arrays.xml
new file mode 100644
index 0000000..db21ccc
--- /dev/null
+++ b/packages/SettingsLib/res/values-mr-rIN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"स्कॅन करत आहे…"</item>
+    <item msgid="8513729475867537913">"कनेक्ट करत आहे..."</item>
+    <item msgid="515055375277271756">"प्रमाणीकरण करत आहे…"</item>
+    <item msgid="1943354004029184381">"IP पत्ता प्राप्त करत आहे…"</item>
+    <item msgid="4221763391123233270">"कनेक्ट केले"</item>
+    <item msgid="624838831631122137">"निलंबित"</item>
+    <item msgid="7979680559596111948">"डिस्कनेक्ट करत आहे..."</item>
+    <item msgid="1634960474403853625">"डिस्कनेक्ट केले"</item>
+    <item msgid="746097431216080650">"अयशस्वी"</item>
+    <item msgid="6367044185730295334">"अवरोधित"</item>
+    <item msgid="503942654197908005">"तात्पुरते खराब कनेक्शन टाळत आहे"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून IP पत्ता प्राप्त करत आहे…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वर कनेक्ट केले आहे"</item>
+    <item msgid="1330262655415760617">"निलंबित"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> वरून डिस्कनेक्ट करत आहे…"</item>
+    <item msgid="197508606402264311">"डिस्कनेक्ट केले"</item>
+    <item msgid="8578370891960825148">"अयशस्वी"</item>
+    <item msgid="5660739516542454527">"अवरोधित"</item>
+    <item msgid="1805837518286731242">"तात्पुरते खराब कनेक्शन टाळत आहे"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-mr-rIN/cm_strings.xml b/packages/SettingsLib/res/values-mr-rIN/cm_strings.xml
new file mode 100644
index 0000000..32c3597
--- /dev/null
+++ b/packages/SettingsLib/res/values-mr-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">अॅप्स</string>
+  <string name="picker_activities">क्रियाकलाप</string>
+  <string name="select_custom_app_title">सानुकूल अॅप निवडा</string>
+  <string name="select_custom_activity_title">सानुकूल कार्यकलाप निवडा</string>
+  <string name="lockscreen_targets_message">लॉक स्क्रीन शॉर्टकट</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-mr-rIN/strings.xml b/packages/SettingsLib/res/values-mr-rIN/strings.xml
new file mode 100644
index 0000000..e9eb637
--- /dev/null
+++ b/packages/SettingsLib/res/values-mr-rIN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"नेटवर्कसाठी स्कॅन करू शकत नाही"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"काहीही नाही"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"जतन केले"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"अक्षम"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP कॉन्फिगरेशन अयशस्वी"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi कनेक्शन अयशस्वी"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"परिक्षेत्रामध्ये नाही"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"कोणताही इंटरनेट प्रवेश आढळला नाही, स्वयंचलितपणे रीकनेक्ट करणार नाही."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> द्वारे जतन केले"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi सहाय्यक द्वारे कनेक्ट केले"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s द्वारे कनेक्‍ट केले"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s द्वारे उपलब्‍ध"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"कनेक्‍ट केले, इंटरनेट नाही"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"डिस्कनेक्ट केले"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"डिस्कनेक्ट करत आहे..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"कनेक्ट करीत आहे..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"कनेक्ट केले"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"जोडत आहे…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"कनेक्ट केले (फोन नाही)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"कनेक्ट केले (मीडिया नाही)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"कनेक्ट केलेले आहे (कोणत्याही संदेशामध्ये प्रवेश नाही)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"कनेक्ट केले (फोन किंवा मीडिया नाही)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"मीडिया ऑडिओ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"फोन ऑडिओ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"फाइल स्थानांतरण"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"इनपुट डिव्हाइस"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"इंटरनेट प्रवेश"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"संपर्क सामायिकरण"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"संपर्क सामायिकरणासाठी वापरा"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इंटरनेट कनेक्शन सामायिकरण"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"संदेशात प्रवेश"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"सिम प्रवेश"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"मीडिया ऑडिओवर कनेक्ट केले"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फोन ऑडिओ वर कनेक्ट केले"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फाईल स्थानांतर सर्व्हरवर कनेक्ट केले"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"नकाशाशी कनेक्ट केले"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP शी कनेक्‍ट केले"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"फाइल स्थानांतर सर्व्हरशी कनेक्ट केले नाही"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"इनपुट डिव्हाइसवर कनेक्ट केले"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"इंटरनेट प्रवेशासाठी डिव्हाइसवर कनेक्ट केले"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"डिव्हाइससह स्थानिक इंटरनेट कनेक्शन सामायिक करत आहे"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"इंटरनेट प्रवेशासाठी वापरा"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"नकाशासाठी वापरा"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM प्रवेशासाठी वापरा"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"मीडिया ऑडिओसाठी वापरा"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"फोन ऑडिओसाठी वापरा"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"फाईल स्थानांतरणासाठी वापरा"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> शी संप्रेषण करू शकत नाही."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारे जोडणी नाकारली."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"वाय फाय बंद."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"वाय फाय डिस्कनेक्ट झाले."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"वाय फाय एक बार."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"वाय फाय दोन बार."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"वाय फाय तीन बार."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"वाय फाय सिग्नल संपूर्ण आहे."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ms-rMY/arrays.xml b/packages/SettingsLib/res/values-ms-rMY/arrays.xml
new file mode 100644
index 0000000..15cd7ba
--- /dev/null
+++ b/packages/SettingsLib/res/values-ms-rMY/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Mengimbas..."</item>
+    <item msgid="8513729475867537913">"Menyambung..."</item>
+    <item msgid="515055375277271756">"Mengesahkan..."</item>
+    <item msgid="1943354004029184381">"Mendapatkan alamat IP..."</item>
+    <item msgid="4221763391123233270">"Disambungkan"</item>
+    <item msgid="624838831631122137">"Digantung"</item>
+    <item msgid="7979680559596111948">"Memutuskan sambungan..."</item>
+    <item msgid="1634960474403853625">"Diputuskan sambungan"</item>
+    <item msgid="746097431216080650">"Tidak berjaya"</item>
+    <item msgid="6367044185730295334">"Disekat"</item>
+    <item msgid="503942654197908005">"Mengelakkan sambungan lemah buat sementara"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Mengimbas..."</item>
+    <item msgid="355508996603873860">"Menyambung kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Mengesahkan dengan <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Mendapatkan alamat IP dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Disambungkan kepada <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Digantung"</item>
+    <item msgid="7698638434317271902">"Memutuskan sambungan dari <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Diputuskan sambungan"</item>
+    <item msgid="8578370891960825148">"Tidak berjaya"</item>
+    <item msgid="5660739516542454527">"Disekat"</item>
+    <item msgid="1805837518286731242">"Mengelakkan sambungan lemah buat sementara"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ms-rMY/strings.xml b/packages/SettingsLib/res/values-ms-rMY/strings.xml
new file mode 100644
index 0000000..af2e234
--- /dev/null
+++ b/packages/SettingsLib/res/values-ms-rMY/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tidak boleh mengimbas untuk rangkaian"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Tiada"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Disimpan"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dinyahdayakan"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Kegagalan Konfigurasi IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kegagalan Sambungan WiFi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Masalah pengesahan"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Tidak dalam liputan"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Tiada Akses Internet Dikesan, tidak akan menyambung secara automatik."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Diselamatkan oleh <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Disambungkan melalui Pembantu Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Disambungkan melalui %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Tersedia melalui %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Disambungkan, tiada Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Diputuskan sambungan"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Memutuskan sambungan..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Menyambung..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Bersambung"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Memasangkan..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Disambungkan (tiada telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Disambungkan (tiada media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Disambungkan (tiada akses mesej)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Disambungkan (tiada telefon atau media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio media"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio telefon"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Pemindahan fail"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Peranti input"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Akses Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Perkongsian kenalan"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gunakan untuk perkongsian kenalan"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Perkongsian sambungan Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Akses Mesej"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Akses SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Disambungkan ke audio media"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Disambungkan ke audio telefon"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Bersambung ke pelayan pemindahan fail"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Disambungkan ke peta"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Disambungkan ke SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Tidak bersambung kepada pelayan pemindahan fail"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Disambungkan ke peranti input"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Sbg ke pranti utk aks Int"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Kgsi sbgn Int dgn peranti"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gunakan untuk akses Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gunakan untuk peta"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Gunakan untuk akses SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gunakan untuk audio media"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gunakan untuk audio telefon"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gunakan untuk pemindahan fail"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gunakan untuk input"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Jadikan pasangan"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"JADIKAN PASANGAN"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Batal"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Berpasangan memberi anda akses kepada kenalan dan sejarah panggilan apabila disambungkan."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Tidak dapat berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Tidak dapat berpasangan dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kerana PIN atau kunci laluan yang salah."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Tidak boleh berkomunikasi dengan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Pasangan ditolak oleh <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi dimatikan."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi diputuskan sambungannya."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi satu bar."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi dua bar."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi tiga bar."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Isyarat Wi-Fi penuh."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-my-rMM/arrays.xml b/packages/SettingsLib/res/values-my-rMM/arrays.xml
new file mode 100644
index 0000000..82f2ded
--- /dev/null
+++ b/packages/SettingsLib/res/values-my-rMM/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"စကင်ပြုလုပ်နေပြီ"</item>
+    <item msgid="8513729475867537913">"ချိတ်ဆက်နေသည်"</item>
+    <item msgid="515055375277271756">"စစ်မှန်ကြောင်းအတည်ပြုနေသည်"</item>
+    <item msgid="1943354004029184381">"အိုင်ပီလိပ်စာရယူနေသည်"</item>
+    <item msgid="4221763391123233270">"ဆက်သွယ်ထားပြီး"</item>
+    <item msgid="624838831631122137">"ဆိုင်းငံ့ထားသည်"</item>
+    <item msgid="7979680559596111948">"အဆက်အသွယ်ဖြတ်တောက်နေသည်"</item>
+    <item msgid="1634960474403853625">"ချိတ်ဆက်မှုပြတ်တောက်သည်"</item>
+    <item msgid="746097431216080650">"မအောင်မြင်ပါ"</item>
+    <item msgid="6367044185730295334">"ပိတ်ထားသည်"</item>
+    <item msgid="503942654197908005">"နှေးကွေးသောဆက်သွယ်မှုကို ယာယီရှောင်ရှားထားသည်"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> မှ IPလိပ်စာရယူနေသည်"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> နှင့် ဆက်သွယ်ထားပြီး"</item>
+    <item msgid="1330262655415760617">"ဆိုင်းငံ့ထားသည်"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>မှ ဆက်သွယ်မှုဖြတ်တောက်သွားသည်"</item>
+    <item msgid="197508606402264311">"ချိတ်ဆက်မှုပြတ်တောက်သည်"</item>
+    <item msgid="8578370891960825148">"မအောင်မြင်ပါ"</item>
+    <item msgid="5660739516542454527">"ပိတ်ထားသည်"</item>
+    <item msgid="1805837518286731242">"နှေးကွေးသောဆက်သွယ်မှုကို ယာယီရှောင်ရှားထားသည်"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-my-rMM/strings.xml b/packages/SettingsLib/res/values-my-rMM/strings.xml
new file mode 100644
index 0000000..32d31ca
--- /dev/null
+++ b/packages/SettingsLib/res/values-my-rMM/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ကွန်ယက်များကို စကင်မလုပ်နိုင်ပါ"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"တစ်ခုမှမဟုတ်ပါ"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"သိမ်းဆည်းပြီး"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"သုံးမရအောင် ပိတ်ထားသည်"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP ပြုပြင်ခြင်း မအောင်မြင်ပါ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi ချိတ်ဆက်မှု မအောင်မြင်ပါ"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"စစ်မှန်ကြောင်းအတည်ပြုရန်၌ ပြသနာရှိခြင်း"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"စက်ကွင်းထဲတွင် မဟုတ်ပါ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"မည်သည့် အင်တာနက်မျှမရှိပါ၊ အလိုအလျောက် ပြန်လည်မချိတ်ဆက်ပါ။"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> မှသိမ်းဆည်းခဲ့သည်"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"ကြိုးမဲ့ကူညီသူမှတဆင့် ချိတ်ဆက်၏"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s မှတစ်ဆင့် ချိတ်ဆက်ထားသည်"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s မှတစ်ဆင့်ရနိုင်သည်"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"ချိတ်ဆက်ထားသည်၊ အင်တာနက်မရှိ"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ချိတ်ဆက်မှုပြတ်တောက်သည်"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"အဆက်အသွယ်ဖြတ်တောက်သည်"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"ချိတ်ဆက်နေသည်"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"ချိတ်ဆက်ထားပြီး"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"တွဲချိတ်ပါ"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ချိတ်ဆက်ထားပြီး (ဖုန်းမရှိ)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ချိတ်ဆက်ထားပြီး (မီဒီယာမရှိ)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ချိတ်ဆက်မိသည် (သတင်းရယူမှုမရှိ)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ချိတ်ဆက်ပြီး (ဖုန်း သို့ မီဒီယာမဟုတ်ပါ)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"မီဒီယာ အသံ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ဖုန်းအသံ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ဖိုင်လွဲပြောင်းခြင်း"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ထည့်သွင်းသော စက်"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"အင်တာနက်ချိတ်ဆက်ခြင်း"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"အဆက်အသွယ်ကို မျှဝေရန်"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"အဆက်အသွယ်ကို မျှဝေရန် အတွက် သုံးရန်"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"အင်တာနက်ဆက်သွယ်မှု မျှဝေခြင်း"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"သတင်းရယူမှု"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM အသုံးပြုခြင်း"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"မီဒီယာအသံအား ချိတ်ဆက်ရန်"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ဖုန်းအသံအား ချိတ်ဆက်ရန်"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်ထားပြီး"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"မြေပုံနှင့် ချိတ်ဆက်ရန်"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP သို့ချိတ်ဆက်ထားသည်"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်မထားပါ"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ထည့်သွင်းထားသောစက်ကို ချိတ်ဆက်မည်"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"အင်တာနက်ဆက်သွယ်မှုရရန် စက်နှင်ချိတ်ဆက်မည်"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"စက်နှင့် ပုံမှန်အင်တာနက်ဆက်သွယ်မှုအား မျှဝေစေရန်"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"အင်တာနက်ချိတ်ဆက်ရန်အသုံးပြုသည်"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"မြေပုံအတွက်သုံးရန်"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM အသုံးပြုမှုအတွက် အသုံးပြုမည်"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"မီဒီယာအသံအတွက်အသုံးပြုရန်"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ဖုန်းအသံအားအသုံးပြုရန်"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ဖိုင်လွဲပြောင်းရန်အတွက်အသုံးပြုရန်"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်ဆက်သွယ်မရပါ"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>နှင့်တွဲချိတ်ရန် ပယ်ချခံရသည်"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"ဝိုင်ဖိုင် မရှိ"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"ဝိုင်ဖိုင် ချိတ်ဆက်ထားမှု မရှိပါ"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"ဝိုင်ဖိုင် ၁ ဘားရှိ"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"ဝိုင်ဖိုင် ၂ ဘား"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"ဝိုင်ဖိုင် ၃ ဘား"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"ဝိုင်ဖိုင် အပြည့်ရှိ"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-nb/arrays.xml b/packages/SettingsLib/res/values-nb/arrays.xml
new file mode 100644
index 0000000..af7c0b1
--- /dev/null
+++ b/packages/SettingsLib/res/values-nb/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Skanner ..."</item>
+    <item msgid="8513729475867537913">"Kobler til …"</item>
+    <item msgid="515055375277271756">"Autentiserer ..."</item>
+    <item msgid="1943354004029184381">"Henter IP-adresse …"</item>
+    <item msgid="4221763391123233270">"Tilkoblet"</item>
+    <item msgid="624838831631122137">"Avsluttet"</item>
+    <item msgid="7979680559596111948">"Kobler fra ..."</item>
+    <item msgid="1634960474403853625">"Frakoblet"</item>
+    <item msgid="746097431216080650">"Mislyktes"</item>
+    <item msgid="6367044185730295334">"Blokkert"</item>
+    <item msgid="503942654197908005">"Unngår dårlig tilkobling midlertidig"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Skanner ..."</item>
+    <item msgid="355508996603873860">"Kobler til <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="554971459996405634">"Autentiserer med <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="7928343808033020343">"Henter IP-adresse fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="8937994881315223448">"Koblet til <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Avsluttet"</item>
+    <item msgid="7698638434317271902">"Kobler fra <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="197508606402264311">"Frakoblet"</item>
+    <item msgid="8578370891960825148">"Mislyktes"</item>
+    <item msgid="5660739516542454527">"Blokkert"</item>
+    <item msgid="1805837518286731242">"Unngår dårlig tilkobling midlertidig"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml
new file mode 100644
index 0000000..e1ad3a2
--- /dev/null
+++ b/packages/SettingsLib/res/values-nb/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan ikke søke etter nettverk"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Lagret"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Slått av"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurasjonsfeil"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-tilkoblingsfeil"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Utenfor område"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ingen Internett-tilgang ble funnet. Kan ikke koble til på nytt automatisk."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Lagret av <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Koblet til via en Wi-Fi-assistent"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Tilkoblet via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Tilgjengelig via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Tilkoblet – ingen Internett-forbindelse"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Frakoblet"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kobler fra…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Kobler til…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Tilkoblet"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Sammenkobles …"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Tilkobling (ingen telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Tilkoblet (ingen medier)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Tilkoblet (ingen meldingstilgang)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Tilkoblet (ingen telefon eller media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medielyd"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonlyd"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filoverføring"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Inndataenhet"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internett-tilgang"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktdeling"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Bruk til kontaktdeling"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling av Internett-tilkobling"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Meldingstilgang"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Tilgang til SIM-kortet"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Koblet til medielyd"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Koblet til telefonlyd"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Koblet til tjener for filoverføring"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Koblet til kart"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Koblet til SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ikke koblet til tjener for filoverføring"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Koblet til inndataenhet"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Koblet til enhet for Internett-tilgang"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Deler lokal Internett-tilkobling med enhet"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Bruk for Internett-tilgang"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Bruk for kart"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Bruk for tilgang til SIM-kortet"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Bruk for medielyd"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Bruk for telefonlyd"</string>
+    <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_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>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kan ikke koble til <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grunn av feil personlig kode eller passord."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan ikke kommunisere med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> avslo paring."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi er av."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi er frakoblet."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi-signal med én stolpe."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi-signal med to stolper."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi-signal med tre stolper."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi-signalet er ved full styrke."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ne-rNP/arrays.xml b/packages/SettingsLib/res/values-ne-rNP/arrays.xml
new file mode 100644
index 0000000..7cb9ceb
--- /dev/null
+++ b/packages/SettingsLib/res/values-ne-rNP/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"स्क्यान गरिँदै..."</item>
+    <item msgid="8513729475867537913">"जडान हुँदै..."</item>
+    <item msgid="515055375277271756">"प्रमाणित गर्दै ..."</item>
+    <item msgid="1943354004029184381">"IP ठेगाना पत्ता लगाउँदै ..."</item>
+    <item msgid="4221763391123233270">"जडान गरिएको"</item>
+    <item msgid="624838831631122137">"निलम्बित"</item>
+    <item msgid="7979680559596111948">"विच्छेदन गर्दै..."</item>
+    <item msgid="1634960474403853625">"विच्छेदन भएको"</item>
+    <item msgid="746097431216080650">"असफल"</item>
+    <item msgid="6367044185730295334">"रोक्का गरियो"</item>
+    <item msgid="503942654197908005">"अस्थायी रूपमा कमजोर जडान बेवास्ता गर्दै"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>बाट IP ठेगाना प्राप्त गर्दै…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>सँग जडित"</item>
+    <item msgid="1330262655415760617">"निलम्बित"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>बाट विच्छेदन गर्दै..."</item>
+    <item msgid="197508606402264311">"विच्छेदन भएको"</item>
+    <item msgid="8578370891960825148">"असफल"</item>
+    <item msgid="5660739516542454527">"रोकियो"</item>
+    <item msgid="1805837518286731242">"अस्थायी रूपमा कमजोर जडान हटाइँदै"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ne-rNP/strings.xml b/packages/SettingsLib/res/values-ne-rNP/strings.xml
new file mode 100644
index 0000000..6add87d
--- /dev/null
+++ b/packages/SettingsLib/res/values-ne-rNP/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"सञ्जालका लागि स्क्यान गर्न सक्दैन"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"कुनै पनि होइन"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"बचत गरियो"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"असक्षम पारियो"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP विन्यास असफल"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"वाईफाई जडान असफल"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"प्रमाणीकरण समस्या"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"दायराभित्र छैन"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"कुनै इन्टरनेट पहुँच पाईएन, स्वचालित रूपमा पुन: जडान छैन।"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> द्वारा सुरक्षित गरियो"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi-Fi सहायक द्वारा जोडिएको"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s मार्फत जडित"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s मार्फत उपलब्ध"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"जडित, इन्टरनेट चलेको छैन"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"विच्छेदन गरियो"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"जडान हटाइँदै ..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"जडान हुँदै..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"जडान गरिएको"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"जोडा बाँध्दै..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"जडान (कुनै फोन छैन)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"जडित (कुनै पनि मिडिया छैन)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"जडित छ (सन्देशमा पहुँच छैन)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"जडित (फोन वा मिडिया छैन)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"मिडिया अडियो"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"फोन अडियो"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"फाइल स्थानान्तरण"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"इनपुट उपकरण"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"इन्टरनेट पहुँच"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"सम्पर्क साझेदारी"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"सम्पर्क साझेदारीका लागि प्रयोग"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इन्टरनेट जडान साझेदारी गर्दै"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"सन्देश पहुँच"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM पहुँच"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"मिडिया अडियोसँग जडित"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फोन अडियोमा जडान गरियो"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फाइल ट्रान्सफर सर्भरमा जडान गरियो"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"नक्सासँग जडित"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP मा जडित"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"फाइल ट्रान्सफर सर्भरसँग जडान गरिएको छैन"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"इनपुट उपकरणसँग जोडिएको छ"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"इन्टरनेट पहुँचका लागि उपकरणसँग जडित"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"उपकरणसँग स्थानीय इन्टरनेट जडान साझेदारी गर्दै"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"इन्टर्नेट पहुँचका लागि प्रयोग गर्नुहोस्"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"नक्साको लागि प्रयोग गर्नुहोस्"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM मा पहुँचका लागि प्रयोग गर्नुहोस्"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"मिडिया अडियोका लागि प्रयोग गर्नुहोस्"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"फोन अडियोको लागि प्रयोग गर्नुहोस्"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"फाइल ट्रान्सफरका लागि प्रयोग गर्नुहोस्"</string>
+    <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_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>गलत PIN वा पासकिका कारण सँग जोडा बाँध्न सक्दैन।"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> सँग कुराकानी हुन सक्दैन।"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> द्वारा जोडा बाँध्ने कार्य अस्वीकृत"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi बन्द।"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi जडान विच्छेद भयो।"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi एक पट्टि।"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi दुई पट्टि।"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi तीन बारहरू।"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"पूर्ण Wi-Fi सिंग्नल।"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-nl/arrays.xml b/packages/SettingsLib/res/values-nl/arrays.xml
new file mode 100644
index 0000000..ab72b67
--- /dev/null
+++ b/packages/SettingsLib/res/values-nl/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Scannen..."</item>
+    <item msgid="8513729475867537913">"Verbinding maken..."</item>
+    <item msgid="515055375277271756">"Verifiëren..."</item>
+    <item msgid="1943354004029184381">"IP-adres ophalen…"</item>
+    <item msgid="4221763391123233270">"Verbonden"</item>
+    <item msgid="624838831631122137">"Opgeschort"</item>
+    <item msgid="7979680559596111948">"Verbinding verbreken..."</item>
+    <item msgid="1634960474403853625">"Verbinding verbroken"</item>
+    <item msgid="746097431216080650">"Mislukt"</item>
+    <item msgid="6367044185730295334">"Geblokkeerd"</item>
+    <item msgid="503942654197908005">"Slechte verbinding tijdelijk vermijden"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Scannen..."</item>
+    <item msgid="355508996603873860">"Verbinding maken met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Verifiëren met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"IP-adres ophalen van <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Verbonden met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Opgeschort"</item>
+    <item msgid="7698638434317271902">"Verbinding verbreken met <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Verbinding verbroken"</item>
+    <item msgid="8578370891960825148">"Mislukt"</item>
+    <item msgid="5660739516542454527">"Geblokkeerd"</item>
+    <item msgid="1805837518286731242">"Slechte verbinding tijdelijk vermijden"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml
new file mode 100644
index 0000000..3c06985
--- /dev/null
+++ b/packages/SettingsLib/res/values-nl/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Kan niet scannen naar netwerken"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Opgeslagen"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Uitgeschakeld"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-configuratie mislukt"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wifi-verbinding mislukt"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Authenticatieprobleem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Niet binnen bereik"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Geen internettoegang gevonden. Er wordt niet automatisch opnieuw verbinding gemaakt."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Opgeslagen door <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Verbonden via wifi-assistent"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Verbonden via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Beschikbaar via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Verbonden, geen internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Verbinding verbroken"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Verbinding verbreken..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Verbinding maken..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Verbonden"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Koppelen..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Gekoppeld (geen telefoon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Gekoppeld (geen media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Verbonden (geen toegang tot berichten)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Gekoppeld (geen telefoon of media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media-audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefoonaudio"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Bestandsoverdracht"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Invoerapparaat"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internettoegang"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Contacten delen"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gebruiken voor contacten delen"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetverbinding delen"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Toegang tot berichten"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Sim-toegang"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbonden met audio van medium"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbonden met audio van telefoon"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Verbonden met server voor bestandsoverdracht"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Verbonden met kaart"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Verbonden via SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Niet verbonden met server voor bestandsoverdracht"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Verbonden met invoerapparaat"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Verbonden met apparaat voor internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Lokale internetverbinding delen met apparaat"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gebruik voor internettoegang"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gebruiken voor kaart"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Gebruiken voor sim-toegang"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gebruiken voor audio van medium"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Gebruiken voor audio van telefoon"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Gebruiken voor bestandsoverdracht"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gebruiken voor invoer"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Koppelen"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"KOPPELEN"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Annuleren"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Koppelen verleent toegang tot je contacten en oproepgeschiedenis wanneer de apparaten zijn verbonden."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Kan niet koppelen aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Kan niet koppelen aan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> vanwege een onjuiste pincode of toegangscode."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Kan niet communiceren met <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Koppeling geweigerd door <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi: uitgeschakeld."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi-verbinding verbroken."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi: één streepje."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi: twee streepjes."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi: drie streepjes."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wifii-signaal is op volledige sterkte."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-oc-rFR/arrays.xml b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-oc-rFR/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-oc-rFR/strings.xml b/packages/SettingsLib/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-oc-rFR/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-or-rIN/arrays.xml b/packages/SettingsLib/res/values-or-rIN/arrays.xml
new file mode 100644
index 0000000..c46bb71
--- /dev/null
+++ b/packages/SettingsLib/res/values-or-rIN/arrays.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-or-rIN/cm_strings.xml b/packages/SettingsLib/res/values-or-rIN/cm_strings.xml
new file mode 100644
index 0000000..34cee36
--- /dev/null
+++ b/packages/SettingsLib/res/values-or-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">ଆପ୍ଲିକେସନଗୁଡିକ</string>
+  <string name="picker_activities">କାର୍ଯ୍ୟକଳାପଗୁଡିକ</string>
+  <string name="select_custom_app_title">କଷ୍ଟମ୍‍ ଆପ୍ଲିକେସନ୍‍ ଚୟନ କରନ୍ତୁ</string>
+  <string name="select_custom_activity_title">କଷ୍ଟମ୍‍ ସଂଚାଳନ ଚୟନ କରନ୍ତୁ</string>
+  <string name="lockscreen_targets_message">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ସର୍ଟ୍‍କଟ୍‍ଗୁଡିକ</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-or-rIN/strings.xml b/packages/SettingsLib/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..710bdcf
--- /dev/null
+++ b/packages/SettingsLib/res/values-or-rIN/strings.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-pa-rIN/arrays.xml b/packages/SettingsLib/res/values-pa-rIN/arrays.xml
new file mode 100644
index 0000000..a03f17e
--- /dev/null
+++ b/packages/SettingsLib/res/values-pa-rIN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"ਸਕੈਨ ਕਰ ਰਿਹਾ ਹੈ..."</item>
+    <item msgid="8513729475867537913">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
+    <item msgid="515055375277271756">"ਪ੍ਰਮਾਣਿਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
+    <item msgid="1943354004029184381">"IP ਪਤਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ..."</item>
+    <item msgid="4221763391123233270">"ਕਨੈਕਟ ਕੀਤਾ"</item>
+    <item msgid="624838831631122137">"ਮੁਅੱਤਲ ਕੀਤਾ"</item>
+    <item msgid="7979680559596111948">"ਡਿਸਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ..."</item>
+    <item msgid="1634960474403853625">"ਡਿਸਕਨੈਕਟ ਕੀਤਾ"</item>
+    <item msgid="746097431216080650">"ਅਸਫਲ"</item>
+    <item msgid="6367044185730295334">"ਬਲੌਕ ਕੀਤਾ"</item>
+    <item msgid="503942654197908005">"ਅਸਥਾਈ ਤੌਰ ਤੇ ਖ਼ਰਾਬ ਕਨੈਕਸ਼ਨ ਤੋਂ ਬਚਣ ਲਈ"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ IP ਪਤਾ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ ਹੈ…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</item>
+    <item msgid="1330262655415760617">"ਮੁਅੱਤਲ ਕੀਤਾ"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ਤੋਂ ਡਿਸਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</item>
+    <item msgid="197508606402264311">"ਡਿਸਕਨੈਕਟ ਕੀਤਾ"</item>
+    <item msgid="8578370891960825148">"ਅਸਫਲ"</item>
+    <item msgid="5660739516542454527">"ਬਲੌਕ ਕੀਤਾ"</item>
+    <item msgid="1805837518286731242">"ਅਸਥਾਈ ਤੌਰ ਤੇ ਖ਼ਰਾਬ ਕਨੈਕਸ਼ਨ ਤੋਂ ਬਚਣ ਲਈ"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-pa-rIN/strings.xml b/packages/SettingsLib/res/values-pa-rIN/strings.xml
new file mode 100644
index 0000000..2a6e456
--- /dev/null
+++ b/packages/SettingsLib/res/values-pa-rIN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ਨੈਟਵਰਕਾਂ ਲਈ ਸਕੈਨ ਨਹੀਂ ਕਰ ਸਕਦਾ"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ਕੋਈ ਨਹੀਂ"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"ਸੁਰੱਖਿਅਤ ਕੀਤਾ"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ਅਸਮਰੱਥ ਬਣਾਇਆ"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP ਕੌਂਫਿਗਰੇਸ਼ਨ ਅਸਫਲਤਾ"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi ਕਨੈਕਸ਼ਨ ਅਸਫਲਤਾ"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ਪ੍ਰਮਾਣੀਕਰਨ ਸਮੱਸਿਆ"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"ਰੇਂਜ ਵਿੱਚ ਨਹੀਂ ਹੈ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ਕੋਈ ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਨਹੀਂ ਮਿਲੀ, ਆਟੋਮੈਟਿਕਲੀ ਰੀਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾਏਗਾ।"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> ਵੱਲੋਂ ਸੁਰੱਖਿਅਤ ਕੀਤਾ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi ਸਹਾਇਕ ਰਾਹੀਂ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s ਰਾਹੀਂ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s ਰਾਹੀਂ ਉਪਲਬਧ"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"ਕਨੈਕਟ ਕੀਤਾ, ਕੋਈ ਇੰਟਰਨੈਟ ਨਹੀਂ"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ਡਿਸਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"ਡਿਸਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"ਕਨੈਕਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"ਪੇਅਰ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"ਕਨੈਕਟ ਕੀਤਾ (ਕੋਈ ਫੋਨ ਨਹੀਂ)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"ਕਨੈਕਟ ਕੀਤਾ (ਕੋਈ ਮੀਡੀਆ ਨਹੀਂ)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"ਕਨੈਕਟ ਕੀਤਾ (ਕੋਈ ਸੁਨੇਹਾ ਪਹੁੰਚ ਨਹੀਂ)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"ਕਨੈਕਟ ਕੀਤਾ (ਕੋਈ ਫੋਨ ਜਾਂ ਮੀਡੀਆ ਨਹੀਂ)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"ਮੀਡੀਆ ਔਡੀਓ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ਫੋਨ ਔਡੀਓ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ਇਨਪੁਟ ਡਿਵਾਈਸ"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ਇੰਟਰਨੈਟ ਪਹੁੰਚ"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"ਸੰਪਰਕ ਸ਼ੇਅਰਿੰਗ"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"ਸੰਪਰਕ ਸ਼ੇਅਰਿੰਗ ਲਈ ਵਰਤੋ"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰਿੰਗ"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"ਸੁਨੇਹਾ ਪਹੁੰਚ"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ਪਹੁੰਚ"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ਮੀਡੀਆ ਔਡੀਓ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ਫੋਨ ਔਡੀਓ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਸਰਵਰ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"ਨਕਸ਼ੇ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਸਰਵਰ ਨਾਲ ਕਨੈਕਟ ਨਹੀਂ ਕੀਤਾ"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ਇਨਪੁਟ ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਲਈ ਡਿਵਾਈਸ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ਡਿਵਾਈਸ ਨਾਲ ਸਥਾਨਕ ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰ ਕਰ ਰਿਹਾ ਹੈ"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ਇੰਟਰਨੈਟ ਪਹੁੰਚ ਲਈ ਵਰਤੋ"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ਨਕਸ਼ੇ ਲਈ ਵਰਤੋ"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM ਪਹੁੰਚ ਲਈ ਵਰਤੋ"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ਮੀਡੀਆ ਔਡੀਓ ਲਈ ਵਰਤੋ"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ਫੋਨ ਔਡੀਓ ਲਈ ਵਰਤੋ"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਲਈ ਵਰਤੋ"</string>
+    <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_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">"ਇੱਕ ਗ਼ਲਤ PIN ਜਾਂ ਪਾਸਕੁੰਜੀ ਦੇ ਕਾਰਨ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਪੇਅਰ ਨਹੀਂ ਕਰ ਸਕਿਆ।"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨਾਲ ਸੰਚਾਰ ਨਹੀਂ ਕਰ ਸਕਦਾ।"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ਪੇਅਰਿੰਗ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਵੱਲੋਂ ਰੱਦ ਕੀਤੀ ਗਈ।"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi ਬੰਦ।"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi ਡਿਸਕਨੈਕਟ ਕੀਤਾ।"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi ਇੱਕ ਬਾਰ।"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi ਦੋ ਬਾਰ।"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi ਤਿੰਨ ਬਾਰ।"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wifi ਸਿਗਨਲ ਪੂਰਾ।"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-pl/arrays.xml b/packages/SettingsLib/res/values-pl/arrays.xml
new file mode 100644
index 0000000..d2cbe24
--- /dev/null
+++ b/packages/SettingsLib/res/values-pl/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Trwa skanowanie..."</item>
+    <item msgid="8513729475867537913">"Trwa łączenie..."</item>
+    <item msgid="515055375277271756">"Trwa uwierzytelnianie..."</item>
+    <item msgid="1943354004029184381">"Uzyskiwanie adresu IP..."</item>
+    <item msgid="4221763391123233270">"Połączono"</item>
+    <item msgid="624838831631122137">"Zawieszona"</item>
+    <item msgid="7979680559596111948">"Trwa rozłączanie..."</item>
+    <item msgid="1634960474403853625">"Rozłączona"</item>
+    <item msgid="746097431216080650">"Niepowodzenie"</item>
+    <item msgid="6367044185730295334">"Zablokowana"</item>
+    <item msgid="503942654197908005">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Trwa skanowanie..."</item>
+    <item msgid="355508996603873860">"Trwa łączenie z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Trwa uwierzytelnianie w sieci <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Uzyskiwanie adresu IP z sieci <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Połączono z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Zawieszona"</item>
+    <item msgid="7698638434317271902">"Trwa rozłączanie z siecią <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Rozłączona"</item>
+    <item msgid="8578370891960825148">"Niepowodzenie"</item>
+    <item msgid="5660739516542454527">"Zablokowana"</item>
+    <item msgid="1805837518286731242">"Tymczasowo, by uniknąć połączenia o niskiej jakości"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml
new file mode 100644
index 0000000..a89e958
--- /dev/null
+++ b/packages/SettingsLib/res/values-pl/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nie można wyszukać sieci."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Brak"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Zapisana"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Wyłączona"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Błąd konfiguracji IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Błąd połączenia Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem z uwierzytelnianiem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Poza zasięgiem"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nie wykryto dostępu do internetu. Nie można automatycznie przywrócić połączenia."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Zapisane przez: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Połączono przez Asystenta Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Połączono przez %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Dostępne przez %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Połączono, brak internetu"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Rozłączona"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Rozłączanie..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Łączenie..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Połączony"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parowanie..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Połączono (bez telefonu)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Połączono (bez multimediów)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Połączono (brak dostępu do wiadomości)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Połączono (bez telefonu ani multimediów)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Dźwięk multimediów"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Dźwięk telefonu"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Przesyłanie pliku"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Urządzenie wejściowe"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Dostęp do internetu"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Udostępnianie kontaktów"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Używaj do udostępniania kontaktów"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Udostępnianie połączenia internetowego"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Dostęp do wiadomości"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Dostęp do karty SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Połączono z funkcją audio multimediów"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Połączono z funkcją audio telefonu"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Połączono z serwerem transferu plików"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Połączono z mapą"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Połączono z PDU"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Brak połączenia z serwerem transferu plików"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Podłączono do urządzenia wejściowego"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Połączone w celu dostępu do internetu"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Udostępnianie połączenia internetowego"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Użyj na potrzeby dostępu do internetu"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Używaj dla mapy"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Używaj, by uzyskać dostęp do karty SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Użyj dla funkcji audio multimediów"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Użyj dla funkcji audio telefonu"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Użyj do transferu plików"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Użyj do wprowadzania"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Powiąż"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SPARUJ"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anuluj"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Parowanie spowoduje przyznanie dostępu do historii połączeń i Twoich kontaktów w trakcie połączenia."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nie można sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nie można sparować z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ze względu na błędny kod PIN lub klucz."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nie można skomunikować się z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Powiązanie odrzucone przez urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi wyłączone."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi odłączone."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi: jeden pasek."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi: dwa paski."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi: trzy paski."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi: pełna moc sygnału."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-pt-rBR/arrays.xml b/packages/SettingsLib/res/values-pt-rBR/arrays.xml
new file mode 100644
index 0000000..cea70da
--- /dev/null
+++ b/packages/SettingsLib/res/values-pt-rBR/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Procurando…"</item>
+    <item msgid="8513729475867537913">"Conectando..."</item>
+    <item msgid="515055375277271756">"Autenticando..."</item>
+    <item msgid="1943354004029184381">"Obtendo endereço IP…"</item>
+    <item msgid="4221763391123233270">"Conectado"</item>
+    <item msgid="624838831631122137">"Suspenso"</item>
+    <item msgid="7979680559596111948">"Desconectando…"</item>
+    <item msgid="1634960474403853625">"Desconectado"</item>
+    <item msgid="746097431216080650">"Falha"</item>
+    <item msgid="6367044185730295334">"Bloqueado"</item>
+    <item msgid="503942654197908005">"Temporariamente evitando uma conexão ruim"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Procurando…"</item>
+    <item msgid="355508996603873860">"Conectando-se a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Autenticando com a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obtendo endereço IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspenso"</item>
+    <item msgid="7698638434317271902">"Desconectando da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Desconectado"</item>
+    <item msgid="8578370891960825148">"Falha"</item>
+    <item msgid="5660739516542454527">"Bloqueado"</item>
+    <item msgid="1805837518286731242">"Temporariamente evitando uma conexão ruim"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-pt-rBR/cm_strings.xml b/packages/SettingsLib/res/values-pt-rBR/cm_strings.xml
index 29ecbff..02b6e96 100644
--- a/packages/SettingsLib/res/values-pt-rBR/cm_strings.xml
+++ b/packages/SettingsLib/res/values-pt-rBR/cm_strings.xml
@@ -19,9 +19,9 @@
 */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="profile_applist_title">Apps</string>
+  <string name="profile_applist_title">Aplicativos</string>
   <string name="picker_activities">Atividades</string>
-  <string name="select_custom_app_title">Selecione o app personalizado</string>
+  <string name="select_custom_app_title">Selecione aplicativo personalizado</string>
   <string name="select_custom_activity_title">Selecione a atividade personalizada</string>
   <string name="lockscreen_targets_message">Atalhos da tela de bloqueio</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..480e457
--- /dev/null
+++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Não é possível verificar a existência de redes"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Salva"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Falha de configuração de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Falha de conexão Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenhum acesso à Internet detectado. O dispositivo não conectará automaticamente."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Salvas por <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado via assistente de Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Conectado via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponível via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Conectada, sem Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pareando…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sem telefone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sem mídia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sem acesso a mensagens)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sem telefone ou mídia)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Áudio da mídia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Áudio do telefone"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferência de arquivo"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartilhamento de contatos"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Usar para compartilhamento de contatos"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartilhamento de conexão à Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acesso SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado ao mapa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Conectado a SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não está conectado ao servidor de transferência de arquivo"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado ao dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado ao dispositivo para acesso à Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compart. conexão local de Intern. com disp."</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acesso à Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Use para acesso SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usar para áudio de mídia"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usar para áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usado para transferência de arquivo"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parear"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAREAR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"O pareamento dá acesso a seus contatos e ao histórico de chamadas quando estiver conectado."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Não foi possível parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Não foi possível parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> por causa de um PIN ou senha incorretos."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Não é possível se comunicar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi desligado."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi desconectado"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Uma barra de Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Duas barras de Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Três barras de Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Sinal Wi-Fi cheio."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-pt-rPT/arrays.xml b/packages/SettingsLib/res/values-pt-rPT/arrays.xml
new file mode 100644
index 0000000..37bd52a
--- /dev/null
+++ b/packages/SettingsLib/res/values-pt-rPT/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"A procurar..."</item>
+    <item msgid="8513729475867537913">"A ligar..."</item>
+    <item msgid="515055375277271756">"A autenticar..."</item>
+    <item msgid="1943354004029184381">"A obter endereço IP..."</item>
+    <item msgid="4221763391123233270">"Ligado"</item>
+    <item msgid="624838831631122137">"Suspenso"</item>
+    <item msgid="7979680559596111948">"A desligar..."</item>
+    <item msgid="1634960474403853625">"Desligado"</item>
+    <item msgid="746097431216080650">"Sem sucesso"</item>
+    <item msgid="6367044185730295334">"Bloqueado"</item>
+    <item msgid="503942654197908005">"A evitar temporariamente uma ligação fraca"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"A procurar..."</item>
+    <item msgid="355508996603873860">"A ligar a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"A autenticar com <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"A obter endereço IP de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Ligado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspenso"</item>
+    <item msgid="7698638434317271902">"A desligar de <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Desligado"</item>
+    <item msgid="8578370891960825148">"Sem sucesso"</item>
+    <item msgid="5660739516542454527">"Bloqueado"</item>
+    <item msgid="1805837518286731242">"A evitar temporariamente uma ligação fraca"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml
new file mode 100644
index 0000000..85a775c
--- /dev/null
+++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Não é possível verificar redes"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Guardada"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Falha de configuração de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Falha de ligação Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenhum acesso à Internet detetado; não será efetuada uma nova ligação automaticamente."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Guardada por <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ligado através do Assistente de Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Ligado através de %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponível através de %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Ligado, sem Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desligado"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"A desligar..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"A ligar..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Ligado"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"A emparelhar..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ligado (sem telefone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ligado (sem multimédia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ligado (sem acesso a mensagens)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ligado (sem telefone ou multimédia)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Áudio de multimédia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Áudio do telemóvel"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferência do ficheiro"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Partilha de contactos"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utilizar para a partilha de contactos"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partilha da ligação à internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acesso ao SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ligado ao áudio de multimédia"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ligado ao áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ligado ao servidor de transferência de ficheiros"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ligado ao mapa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Ligado ao SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não ligado ao servidor de transferência de ficheiros"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ligado a um dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ligado ao aparelho para acesso à internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"A partilhar a ligação à internet local com o aparelho"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizar para acesso à internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilizar para o mapa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Utilizar para acesso ao SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizar para áudio de multimédia"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizar para áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizar para transferência de ficheiros"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizar para entrada"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Par"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SINCRONIZAR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"A sincronização concede acesso aos seus contactos e ao histórico de chamadas quando tem uma ligação estabelecida."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Não foi possível sincronizar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Não foi possível sincronizar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> devido a PIN ou chave de acesso incorreto."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Não é possível comunicar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi desativado."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi desligado."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Uma barra de Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Duas barras de Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Três barras de Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Sinal de Wi-Fi completo."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-pt/arrays.xml b/packages/SettingsLib/res/values-pt/arrays.xml
new file mode 100644
index 0000000..cea70da
--- /dev/null
+++ b/packages/SettingsLib/res/values-pt/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Procurando…"</item>
+    <item msgid="8513729475867537913">"Conectando..."</item>
+    <item msgid="515055375277271756">"Autenticando..."</item>
+    <item msgid="1943354004029184381">"Obtendo endereço IP…"</item>
+    <item msgid="4221763391123233270">"Conectado"</item>
+    <item msgid="624838831631122137">"Suspenso"</item>
+    <item msgid="7979680559596111948">"Desconectando…"</item>
+    <item msgid="1634960474403853625">"Desconectado"</item>
+    <item msgid="746097431216080650">"Falha"</item>
+    <item msgid="6367044185730295334">"Bloqueado"</item>
+    <item msgid="503942654197908005">"Temporariamente evitando uma conexão ruim"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Procurando…"</item>
+    <item msgid="355508996603873860">"Conectando-se a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Autenticando com a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Obtendo endereço IP da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Conectado a <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspenso"</item>
+    <item msgid="7698638434317271902">"Desconectando da <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Desconectado"</item>
+    <item msgid="8578370891960825148">"Falha"</item>
+    <item msgid="5660739516542454527">"Bloqueado"</item>
+    <item msgid="1805837518286731242">"Temporariamente evitando uma conexão ruim"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml
new file mode 100644
index 0000000..480e457
--- /dev/null
+++ b/packages/SettingsLib/res/values-pt/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Não é possível verificar a existência de redes"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Salva"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Desativado"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Falha de configuração de IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Falha de conexão Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema de autenticação"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Fora do alcance"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenhum acesso à Internet detectado. O dispositivo não conectará automaticamente."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Salvas por <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conectado via assistente de Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Conectado via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponível via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Conectada, sem Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Desconectado"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Desconectando…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Conectando..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectado"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pareando…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectado (sem telefone)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectado (sem mídia)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectado (sem acesso a mensagens)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectado (sem telefone ou mídia)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Áudio da mídia"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Áudio do telefone"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferência de arquivo"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispositivo de entrada"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acesso à Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Compartilhamento de contatos"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Usar para compartilhamento de contatos"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartilhamento de conexão à Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acesso SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectado ao mapa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Conectado a SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Não está conectado ao servidor de transferência de arquivo"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectado ao dispositivo de entrada"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectado ao dispositivo para acesso à Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Compart. conexão local de Intern. com disp."</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Usar para acesso à Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Usar para mapa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Use para acesso SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Usar para áudio de mídia"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Usar para áudio do telefone"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Usado para transferência de arquivo"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Usar para entrada"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parear"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PAREAR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Cancelar"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"O pareamento dá acesso a seus contatos e ao histórico de chamadas quando estiver conectado."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Não foi possível parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Não foi possível parear com <xliff:g id="DEVICE_NAME">%1$s</xliff:g> por causa de um PIN ou senha incorretos."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Não é possível se comunicar com <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Emparelhamento rejeitado por <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi desligado."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi desconectado"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Uma barra de Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Duas barras de Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Três barras de Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Sinal Wi-Fi cheio."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ro/arrays.xml b/packages/SettingsLib/res/values-ro/arrays.xml
new file mode 100644
index 0000000..c4b3b34
--- /dev/null
+++ b/packages/SettingsLib/res/values-ro/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"În curs de scanare..."</item>
+    <item msgid="8513729475867537913">"Se conectează..."</item>
+    <item msgid="515055375277271756">"În curs de autentificare…"</item>
+    <item msgid="1943354004029184381">"Se obține adresa IP..."</item>
+    <item msgid="4221763391123233270">"Conectată"</item>
+    <item msgid="624838831631122137">"Suspendată"</item>
+    <item msgid="7979680559596111948">"În curs de deconectare..."</item>
+    <item msgid="1634960474403853625">"Deconectată"</item>
+    <item msgid="746097431216080650">"Nereușit"</item>
+    <item msgid="6367044185730295334">"Blocat"</item>
+    <item msgid="503942654197908005">"Evitarea temporară a conexiunii slabe"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"În curs de scanare..."</item>
+    <item msgid="355508996603873860">"Se conectează la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Se autentifică cu <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Se obține adresa IP de la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Conectat la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspendată"</item>
+    <item msgid="7698638434317271902">"În curs de deconectare de la <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Deconectată"</item>
+    <item msgid="8578370891960825148">"Nereușit"</item>
+    <item msgid="5660739516542454527">"Blocat"</item>
+    <item msgid="1805837518286731242">"Evitarea temporară a conexiunii slabe"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ro/cm_strings.xml b/packages/SettingsLib/res/values-ro/cm_strings.xml
index 26f8836..0c87c44 100644
--- a/packages/SettingsLib/res/values-ro/cm_strings.xml
+++ b/packages/SettingsLib/res/values-ro/cm_strings.xml
@@ -23,4 +23,5 @@
   <string name="picker_activities">Activități</string>
   <string name="select_custom_app_title">Selectați aplicație personalizată</string>
   <string name="select_custom_activity_title">Selectați activitate personalizată</string>
+  <string name="lockscreen_targets_message">Comenzi rapide ale ecranului de blocare</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml
new file mode 100644
index 0000000..e6f9728
--- /dev/null
+++ b/packages/SettingsLib/res/values-ro/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nu se poate scana pentru rețele"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Niciuna"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Salvată"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Dezactivată"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Eroare de configurație IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Eroare de conexiune Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problemă la autentificare"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"În afara ariei de acoperire"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nu s-a detectat acces la internet, nu se va efectua reconectarea automată."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Salvată de <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Conexiune realizată printr-un asistent Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Conectată prin %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Disponibilă prin %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Conectată, fără internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Deconectat"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"În curs de deconectare..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Se conectează..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Conectat"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Se conectează…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Conectat (fără telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Conectat (fără conținut media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Conectat (fără acces la mesaje)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Conectat (fără telefon sau conț. media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Conținut media audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Componenta audio a telefonului"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transfer de fișiere"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Dispozitiv de intrare"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Acces internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Acces la Agendă"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Utilizați pentru a permite accesul la Agendă"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Distribuirea conexiunii la internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acces la mesaje"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acces la SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectat la profilul pentru conținut media audio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectat la componenta audio a telefonului"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectat la serverul de transfer de fișiere"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Conectat la hartă"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Conectat la SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Neconectat la serverul de transfer de fișiere"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Conectat la dispozitivul de intrare"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Conectat la dispoz. pt. acces internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Se permite dispoz. acces la internet local"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Utilizați pentru acces internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Utilizați pentru hartă"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Folosiți pentru acces la SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Utilizați pentru profilul pentru conținut media audio"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Utilizați pentru componenta audio a telefonului"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Utilizați pentru transferul de fișiere"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Utilizați pentru introducere date"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Asociați"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"CONECTAȚI"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anulați"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Asocierea dispozitivelor vă permite accesul la persoanele de contact și la istoricul apelurilor când dispozitivul este conectat."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nu s-a putut împerechea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nu s-a putut împerechea cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> din cauza unui cod PIN sau al unei chei de acces incorecte."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nu se poate comunica cu <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Împerechere respinsă de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi dezactivat."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi deconectat."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Semnal Wi-Fi: o bară."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Semnal Wi-Fi: două bare."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Semnal Wi-Fi: trei bare."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Semnal Wi-Fi: complet."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ru/arrays.xml b/packages/SettingsLib/res/values-ru/arrays.xml
new file mode 100644
index 0000000..5f50648
--- /dev/null
+++ b/packages/SettingsLib/res/values-ru/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Поиск..."</item>
+    <item msgid="8513729475867537913">"Подключение..."</item>
+    <item msgid="515055375277271756">"Аутентификация..."</item>
+    <item msgid="1943354004029184381">"Получение IP-адреса..."</item>
+    <item msgid="4221763391123233270">"Подключено"</item>
+    <item msgid="624838831631122137">"Приостановлено"</item>
+    <item msgid="7979680559596111948">"Отключение..."</item>
+    <item msgid="1634960474403853625">"Нет подключения"</item>
+    <item msgid="746097431216080650">"Сбой"</item>
+    <item msgid="6367044185730295334">"Заблокировано"</item>
+    <item msgid="503942654197908005">"Временно избегать плохого соединения"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"Отключение от <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Нет подключения"</item>
+    <item msgid="8578370891960825148">"Сбой"</item>
+    <item msgid="5660739516542454527">"Заблокировано"</item>
+    <item msgid="1805837518286731242">"Временно избегать плохого соединения"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml
new file mode 100644
index 0000000..738c7ca
--- /dev/null
+++ b/packages/SettingsLib/res/values-ru/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не удалось начать поиск сетей."</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Нет"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Сохранено"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Отключено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ошибка IP-конфигурации"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ошибка подключения Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Ошибка аутентификации"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Недоступна"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Подключение к Интернету отсутствует и не будет восстановлено автоматически."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Кто сохранил: <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Установлено подключение через Ассистента Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Подключено к %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Доступно через %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Подключено, без Интернета"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Отключено"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Отключение..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Подключение..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Подключено"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Сопряжение..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Подключено (кроме HSP/HFP)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Подключено (кроме A2DP)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Подключено (нет доступа к сообщениям)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Подключено (кроме HSP/HFP/A2DP)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Профиль A2DP"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Профиль HSP/HFP"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Профиль OPP"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Профиль HID"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Интернет-доступ"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Обмен контактами"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Использовать для обмена контактами"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Профиль PAN"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Доступ к сообщениям"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Доступ к SIM-карте"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Подключено к мультимедийному аудиоустройству"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Подключено к аудиоустройству телефона"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установлено подключение к серверу передачи файлов"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Доступ к сообщениям"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Подключено к точке доступа"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Нет подключения к серверу передачи файлов"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Подключено к устройству ввода"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Используется интернет-подключение другого устройства"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Устройство работает в режиме модема"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Использовать для доступа к Интернету"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Использовать для доступа к сообщениям"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Использовать для доступа к SIM-карте"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Использовать для мультимедийного аудиоустройства"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Использовать для аудиоустройства телефона"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Используется для передачи файлов"</string>
+    <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_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>\", так как введен неверный PIN-код или пароль."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Не удается установить соединение с устройством \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> не разрешает сопряжение."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi выключен"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi отключен"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi: одно деление"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi: два деления"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi: три деления"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi: надежный сигнал"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-si-rLK/arrays.xml b/packages/SettingsLib/res/values-si-rLK/arrays.xml
new file mode 100644
index 0000000..225ea36
--- /dev/null
+++ b/packages/SettingsLib/res/values-si-rLK/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"පරිලෝකනය කරමින්…"</item>
+    <item msgid="8513729475867537913">"සම්බන්ධ වෙමින්…"</item>
+    <item msgid="515055375277271756">"සත්‍යාපනය වෙමින්…"</item>
+    <item msgid="1943354004029184381">"IP ලිපිනය ලබාගනිමින්…"</item>
+    <item msgid="4221763391123233270">"සම්බන්ධිතයි"</item>
+    <item msgid="624838831631122137">"අත්හිටුවන ලදි"</item>
+    <item msgid="7979680559596111948">"විසන්ධි වෙමින්…"</item>
+    <item msgid="1634960474403853625">"විසන්ධි වුණි"</item>
+    <item msgid="746097431216080650">"අසාර්ථකයි"</item>
+    <item msgid="6367044185730295334">"අවහිර කරන ලදි"</item>
+    <item msgid="503942654197908005">"දුර්වල සම්බන්ධතාවය තාවකාලිකව මඟහරිමින්"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> මගින් IP ලිපිනය ලබා ගනිමින්"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙත සම්බන්ධ වුණි"</item>
+    <item msgid="1330262655415760617">"අත්හිටුවන ලදි"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> වෙතින් විසන්ධි වෙමින්…"</item>
+    <item msgid="197508606402264311">"විසන්ධි විය"</item>
+    <item msgid="8578370891960825148">"අසාර්ථකයි"</item>
+    <item msgid="5660739516542454527">"අවහිර කරන ලදි"</item>
+    <item msgid="1805837518286731242">"දුර්වල සම්බන්ධතාවය තාවකාලිකව මඟහරිමින්"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-si-rLK/strings.xml b/packages/SettingsLib/res/values-si-rLK/strings.xml
new file mode 100644
index 0000000..cb4bf86
--- /dev/null
+++ b/packages/SettingsLib/res/values-si-rLK/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ජාල සඳහා පරිලෝකනය කළ නොහැක"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"කිසිවක් නැත"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"සුරකින ලදි"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"අබලයි"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP වින්‍යාස කිරීම අසාර්ථකයි"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi සම්බන්ධතාව අසාර්ථකයි"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"සත්‍යාපනයේ ගැටලුවකි"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"පරාසයේ නැත"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"අන්තර්ජාල ප්‍රවේශය අනාවරණය වුයේ නැත, ස්වයංක්‍රිය නැවත සම්බන්ධ වීම වූ නැත"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> විසින් සුරකින ලදී"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi සහායක හරහා සම්බන්ධ කරන ලදි"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s හරහා සම්බන්ධ විය"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s හරහා ලබා ගැනීමට හැකිය"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"සම්බන්ධයි, අන්තර්ජාලය නැත"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"විසන්ධි වුණි"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"විසන්ධි වෙමින්…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"සම්බන්ධ වෙමින්…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"සම්බන්ධිතයි"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"යුගල කරමින්…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"සම්බන්ධයි (දුරකථන නැත)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"සම්බන්ධිතයි (මාධ්‍යයක් නොමැත)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"සම්බන්ධිතයි (පණිවිඩ ප්‍රවේශ නොමැත)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"සම්බන්ධිතයි (දුරකතනයක් හෝ මාධ්‍යයක් නැත)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"මාධ්‍ය ශ්‍රව්‍ය"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"දුරකථන ශ්‍රව්‍ය"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ගොනු හුවමාරුව"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ආදාන උපාංගය"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"අන්තර්ජාල ප්‍රවේශය"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"සම්බන්ධතා බෙදාගැනීම"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"සම්බන්ධතා බෙදාගැනීම සඳහා භාවිතා කිරීම"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"අන්තර්ජාල සම්බන්ධතා බෙදාගැනීම"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"පණිවිඩ ප්‍රවේශය"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ප්‍රවේශය"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"මාධ්‍ය ශ්‍රව්‍යට සම්බන්ධ විය"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"දුරකතනයේ ශ්‍රව්‍යට සම්බන්ධ විය"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ගොනු හුවමාරු සේවාදායකය සමග සම්බන්ධ විය"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"සිතියම වෙත සම්බන්ධිතයි"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP වෙත සම්බන්ධ විය"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ගොනු හුවමාරු සේවාදායකය වෙත සම්බන්ධ වී නොමැත"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ආදාන උපාංග වෙත සම්බන්ධිතයි"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"අන්තර්ජාල ප්‍රවේශය සඳහා උපාංගය වෙත සම්බන්ධ වුණි"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"මෙම උපාංගය සමඟ පෙදෙසි අන්තර්ජාල සම්බන්ධතාවය බෙදාගනිමින්"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"අන්තර්ජාල ප්‍රවේශය සඳහා භාවිතා කරන්න"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"සිතියම සඳහා භාවිතා කරන්න"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM ප්‍රවේශය සඳහා භාවිත කරන්න"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"මාධ්‍ය ශ්‍රව්‍ය සඳහා භාවිතා කරන්න"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"දුරකථන ශ්‍රව්‍ය සඳහා භාවිතා කෙරේ"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ගොනු හුවමාරුව සඳහා භාවිතා කරන්න"</string>
+    <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_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">"වැරදි PIN එකක් හෝ පාස් යතුරක් නිසා <xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමඟ යුගල කිරීමට නොහැකිය."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> සමඟ සන්නිවේදනය කළ නොහැක."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> විසින් යුගල කිරීම ප්‍රතික්ෂේප කරන ලදි."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi අක්‍රියයි."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi සම්බන්ධ කර නොමැත."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi තීරු එකයි."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi තීරු දෙකයි."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"WiFi තීරු තුනයි."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wifi සංඥාව පිරී ඇත."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sk/arrays.xml b/packages/SettingsLib/res/values-sk/arrays.xml
new file mode 100644
index 0000000..6cab133
--- /dev/null
+++ b/packages/SettingsLib/res/values-sk/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Prebieha vyhľadávanie..."</item>
+    <item msgid="8513729475867537913">"Prebieha pripájanie…"</item>
+    <item msgid="515055375277271756">"Prebieha overovanie…"</item>
+    <item msgid="1943354004029184381">"Získava sa adresa IP…"</item>
+    <item msgid="4221763391123233270">"Pripojené"</item>
+    <item msgid="624838831631122137">"Pozastavená"</item>
+    <item msgid="7979680559596111948">"Prebieha odpájanie..."</item>
+    <item msgid="1634960474403853625">"Odpojený"</item>
+    <item msgid="746097431216080650">"Neúspešné"</item>
+    <item msgid="6367044185730295334">"Blokované"</item>
+    <item msgid="503942654197908005">"Dočasne bolo zabránené slabému pripojeniu"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Prebieha vyhľadávanie..."</item>
+    <item msgid="355508996603873860">"Prebieha pripájanie k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Prebieha overovanie v sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Získava sa adresa IP zo siete <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Pripojené k sieti <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Pozastavená"</item>
+    <item msgid="7698638434317271902">"Prebieha odpájanie od siete <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="197508606402264311">"Odpojený"</item>
+    <item msgid="8578370891960825148">"Neúspešné"</item>
+    <item msgid="5660739516542454527">"Blokované"</item>
+    <item msgid="1805837518286731242">"Dočasne bolo zabránené slabému pripojeniu"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml
new file mode 100644
index 0000000..eec73a1
--- /dev/null
+++ b/packages/SettingsLib/res/values-sk/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Siete sa nedajú vyhľadávať"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Žiadne"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Uložené"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Zakázané"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Zlyhanie konfigurácie adresy IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Zlyhanie pripojenia Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problém s overením totožnosti"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Mimo dosah"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nenašiel sa žiadny prístup k internetu, preto nedôjde k automatickému opätovnému pripojeniu"</string>
+    <string name="saved_network" msgid="4352716707126620811">"Uložil(a) <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Pripojené pomocou Asistenta Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Pripojené prostredníctvom %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"K dispozícii prostredníctvom %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Pripojené, žiadny internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Odpojený"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prebieha odpájanie..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Prebieha pripájanie…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Pripojené"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Párovanie..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Pripojené (bez telefónu)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Pripojené (bez média)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Pripojené (bez prístupu ku správam)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Pripojené (bez telefónu alebo média)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvuk medií"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvuk telefónu"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prenos súborov"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vstupné zariadenie"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Prístup na Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Zdieľanie kontaktov"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Použiť na zdieľanie kontaktov"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Zdieľanie pripojenia na Internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Prístup ku správam"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Prístup k SIM karte"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Pripojené ku zvukovému médiu"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Pripojené ku zvuku telefónu"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Pripojené na server pre prenos údajov"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Pripojené k mape"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Pripojené k systému SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nepripojené k serveru pre prenos súborov"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Pripojené na vstupné zariadenie"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Pripoj. k zariad. s príst. na Internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Zdieľa miestne internet. pripoj. so zariad"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Použiť na prístup k Internetu"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Použiť pre mapu"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Použiť na pristupovanie k SIM karte"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Umožňuje pripojenie zvukového média"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Použiť pre zvuk telefónu"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Použiť na prenos súborov"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Použiť pre vstup"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Párovať"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"PÁROVAŤ"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Zrušiť"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Párovaním udelíte zariadeniam po pripojení prístup k svojim kontaktom a histórii hovorov."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nepodarilo sa spárovať so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nepodarilo sa spárovať so zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>, pretože ste zadali nesprávny kód PIN alebo prístupový kľúč."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"So zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nie je možné komunikovať."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Párovanie odmietnuté zariadením <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Sieť Wi-Fi je vypnutá."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Sieť Wi-Fi je odpojená."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Jedna čiarka signálu Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Dve čiarky signálu Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Tri čiarky signálu Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Plný signál Wi-Fi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sl/arrays.xml b/packages/SettingsLib/res/values-sl/arrays.xml
new file mode 100644
index 0000000..fef1fdd
--- /dev/null
+++ b/packages/SettingsLib/res/values-sl/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Iskanje …"</item>
+    <item msgid="8513729475867537913">"Vzpostavljanje povezave ..."</item>
+    <item msgid="515055375277271756">"Preverjanje pristnosti ..."</item>
+    <item msgid="1943354004029184381">"Pridobivanje naslova IP …"</item>
+    <item msgid="4221763391123233270">"Povezava je vzpostavljena"</item>
+    <item msgid="624838831631122137">"Odloženo"</item>
+    <item msgid="7979680559596111948">"Prekinjanje povezave ..."</item>
+    <item msgid="1634960474403853625">"Prekinjena povezava"</item>
+    <item msgid="746097431216080650">"Ni uspelo"</item>
+    <item msgid="6367044185730295334">"Blokirano"</item>
+    <item msgid="503942654197908005">"Začasno izogibanje slabi povezavi"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Iskanje …"</item>
+    <item msgid="355508996603873860">"Vzpostavljanje povezave z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="554971459996405634">"Preverjanje pristnosti v omrežju <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="7928343808033020343">"Pridobivanje naslova IP od <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="8937994881315223448">"Povezava z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g> je vzpostavljena"</item>
+    <item msgid="1330262655415760617">"Začasno ustavljeno"</item>
+    <item msgid="7698638434317271902">"Prekinjanje povezave z omrežjem <xliff:g id="NETWORK_NAME">%1$s</xliff:g> …"</item>
+    <item msgid="197508606402264311">"Prekinjena povezava"</item>
+    <item msgid="8578370891960825148">"Ni uspelo"</item>
+    <item msgid="5660739516542454527">"Blokirano"</item>
+    <item msgid="1805837518286731242">"Začasno izogibanje slabi povezavi"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-sl/cm_strings.xml b/packages/SettingsLib/res/values-sl/cm_strings.xml
index 4a66c17..8b2f8b0 100644
--- a/packages/SettingsLib/res/values-sl/cm_strings.xml
+++ b/packages/SettingsLib/res/values-sl/cm_strings.xml
@@ -23,5 +23,5 @@
   <string name="picker_activities">Dejavnosti</string>
   <string name="select_custom_app_title">Izberite aplikacijo po meri</string>
   <string name="select_custom_activity_title">Izberite dejavnost po meri</string>
-  <string name="lockscreen_targets_message">Bližnjice zaslona za zaklepanje</string>
+  <string name="lockscreen_targets_message">Bližnjice zaklenjenega zaslona</string>
 </resources>
diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml
new file mode 100644
index 0000000..3b589a5
--- /dev/null
+++ b/packages/SettingsLib/res/values-sl/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ni mogoče iskati omrežij"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Brez"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Shranjeno"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Onemogočeno"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Konfiguracija IP-ja ni uspela"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Povezava prek Wi-Fi-ja ni uspela"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Težava s preverjanjem pristnosti"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ni v obsegu"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ni zaznanega dostopa do interneta; samodejna vnovična vzpostavitev povezave se ne bo izvedla."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Shranil(-a): <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Povezava vzpostavljena prek pomočnika za Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Vzpostavljena povezava prek: %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Na voljo prek: %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Vzpostavljena povezava, brez interneta"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Prekinjena povezava"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Prekinjanje povezave ..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Vzpostavljanje povezave ..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Povezava je vzpostavljena"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Seznanjanje ..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Povezava vzpostavljena (brez telefona)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Povezava vzpostavljena (brez predstavnosti)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Povezava vzp. (ni dostopa do sporočil)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Povezava vzpostavljena (brez telefona ali predstavnosti)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Zvok predstavnosti"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Zvok telefona"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Prenos datoteke"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Vnosna naprava"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetni dostop"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Dajanje stikov v skupno rabo"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Uporabi za dajanje stikov v skupno rabo"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Skupna raba internetne povezave"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Dostop do sporočil"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Dostop do kartice SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezan s profilom za predstavnostni zvok"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezava s profilom za zvok telefona vzpostavljena"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezava s strežnikom za prenos datotek je vzpostavljena"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Povezava je vzpostavljena z zemljevidom"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Vzpostavljena povezava s profilom SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Povezava s strežnikom za prenos datotek ni vzpostavljena"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Povezava z vnosno napravo je vzpostavljena"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Povezava z napravo za internetni dostop"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Skupna raba lok. internetne povezave z napravo"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Uporabi za dostop do interneta"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Uporabi za zemljevid"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Uporablja se za dostop do kartice SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Uporabi za zvok predstavnosti"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Uporabi za zvok telefona"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Uporabi za prenos datotek"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Uporabi za vnos"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Seznani"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"SEZNANI"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Prekliči"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Seznanjanje pri vzpostavljeni povezavi omogoči dostop do vaših stikov in zgodovine klicev."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ni bilo mogoče vzpostaviti povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Zaradi nepravilne kode PIN ali gesla ni mogoče vzpostaviti povezave z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Z napravo <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ni mogoče vzpostaviti povezave."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Naprava <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je zavrnila seznanitev."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi je izklopljen."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Povezava Wi-Fi je prekinjena."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Ena črtica signala Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Dve črtici signala Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Tri črtice signala Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Poln signal Wi-Fi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sq-rAL/arrays.xml b/packages/SettingsLib/res/values-sq-rAL/arrays.xml
new file mode 100644
index 0000000..5aceb09
--- /dev/null
+++ b/packages/SettingsLib/res/values-sq-rAL/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Po skanon..."</item>
+    <item msgid="8513729475867537913">"Po lidhet..."</item>
+    <item msgid="515055375277271756">"Po vërteton…"</item>
+    <item msgid="1943354004029184381">"Po merr adresën IP…"</item>
+    <item msgid="4221763391123233270">"I lidhur"</item>
+    <item msgid="624838831631122137">"I pezulluar"</item>
+    <item msgid="7979680559596111948">"Po shkëputet..."</item>
+    <item msgid="1634960474403853625">"I shkëputur"</item>
+    <item msgid="746097431216080650">"I pasuksesshëm"</item>
+    <item msgid="6367044185730295334">"I bllokuar"</item>
+    <item msgid="503942654197908005">"Po shmang përkohësisht lidhje të dobët"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Po skanon..."</item>
+    <item msgid="355508996603873860">"Po lidhet me <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Po kryen vërtetimin me <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Po merr adresën IP nga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"I lidhur me <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"I pezulluar"</item>
+    <item msgid="7698638434317271902">"I shkëputur nga <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="197508606402264311">"I shkëputur"</item>
+    <item msgid="8578370891960825148">"I pasuksesshëm"</item>
+    <item msgid="5660739516542454527">"I bllokuar"</item>
+    <item msgid="1805837518286731242">"Përkohësisht duke shmangur një lidhje të dobët"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-sq-rAL/strings.xml b/packages/SettingsLib/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..1936f4e
--- /dev/null
+++ b/packages/SettingsLib/res/values-sq-rAL/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Nuk mund të skanojë për rrjete"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Asnjë"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"U ruajt"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Të çaktivizuara"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Dështim në konfigurimin e IP-së"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Dështim i lidhjes WiFi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problem me vërtetimin"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Nuk është brenda rrezes"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Nuk u diktua qasje në internet. Lidhja nuk do të realizohet automatikisht."</string>
+    <string name="saved_network" msgid="4352716707126620811">"E ruajtur nga <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"I lidhur nëpërmjet ndihmësit të Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"E lidhur përmes %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"E mundshme përmes %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"U lidh, nuk ka internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Shkëputur"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Po shkëputet..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Po lidhet..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"U lidh"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Po çiftohet..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"U lidh (pa telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"U lidh (nuk ka media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"U lidh (pa qasje te mesazhet)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"I lidhur (pa telefon apo media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audioja e klipit \"media\""</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audioja e telefonit"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Transferimi i skedarëve"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Pajisja e hyrjes"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Qasja në internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Ndarja e kontakteve"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Përdore për ndarjen e kontakteve"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ndarja e lidhjes së internetit"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Qasja në mesazhe"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Qasje në kartën SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"U lidh me audion e medias"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"U lidh me audion e telefonit"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"U lidh me serverin e transferimit të skedarëve"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"U lidh me hartën"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Lidhur me SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Nuk u lidh me serverin e transferimit të skedarëve"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"U lidh me pajisjen e hyrjes"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Lidhur me pajisjen për qasje në internet"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Po ndan lidhjen lokale të internetit me pajisjen"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Përdor për qasje në internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Përdore për hartën"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Përdor për qasje në kartën SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Përdor për audion e medias"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Përdor për audion e telefonit"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Përdor për transferimin e skedarëve"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Përdore për hyrjen"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Çifto"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ÇIFTO"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Anulo"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Çiftimi lejon qasjen te kontaktet dhe historiku yt i telefonatave."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Nuk mundi të çiftohej me <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Nuk mundi të çiftohej me <xliff:g id="DEVICE_NAME">%1$s</xliff:g> për shkak të një kodi PIN ose një kodi të pasaktë."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Nuk mund të komunikohet me <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Çiftimi u refuzua nga <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi është çaktivizuar."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi është i shkëputur."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi ka një vijë."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi ka dy vija."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi: tre vija."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi ka sinjal të plotë."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sr/arrays.xml b/packages/SettingsLib/res/values-sr/arrays.xml
new file mode 100644
index 0000000..cc60251
--- /dev/null
+++ b/packages/SettingsLib/res/values-sr/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Скенирање..."</item>
+    <item msgid="8513729475867537913">"Повезивање…"</item>
+    <item msgid="515055375277271756">"Потврђује се аутентичност..."</item>
+    <item msgid="1943354004029184381">"Преузимање IP адресе..."</item>
+    <item msgid="4221763391123233270">"Повезано"</item>
+    <item msgid="624838831631122137">"Обустављено"</item>
+    <item msgid="7979680559596111948">"Прекидање везе..."</item>
+    <item msgid="1634960474403853625">"Веза је прекинута"</item>
+    <item msgid="746097431216080650">"Неуспешно"</item>
+    <item msgid="6367044185730295334">"Блокирано"</item>
+    <item msgid="503942654197908005">"Привремено избегавање лоше везе"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"Прекидање везе са мрежом <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Веза је прекинута"</item>
+    <item msgid="8578370891960825148">"Неуспешно"</item>
+    <item msgid="5660739516542454527">"Блокирано"</item>
+    <item msgid="1805837518286731242">"Привремено избегавање лоше везе"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml
new file mode 100644
index 0000000..3a7adbc
--- /dev/null
+++ b/packages/SettingsLib/res/values-sr/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Није могуће скенирати мреже"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Нема"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Сачувано"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Онемогућено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP конфигурација је отказала"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi веза је отказала"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблем са потврдом аутентичности"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Није у опсегу"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Приступ интернету није откривен, аутоматско повезивање није могуће."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Сачувао/ла је <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Повезано преко Wi‑Fi помоћника"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Веза је успостављена преко приступне тачке %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Доступна је преко приступне тачке %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Веза је успостављена, нема интернета"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Веза је прекинута"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Прекидање везе..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Повезивање…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Повезано"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Упаривање..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Повезано (без телефона)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Повезано (без медија)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Повезано је (нема приступа порукама)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Повезано (без телефона или медија)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Звук медија"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук телефона"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Пренос датотеке"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Улазни уређај"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Приступ Интернету"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Дељење контаката"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Користите за дељење контаката"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Дељење интернет везе"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Приступ порукама"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Приступ SIM картици"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Повезано са звуком медија"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Повезано са звуком телефона"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Повезано са сервером за пренос датотека"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Повезано је са мапом"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Веза са тачком приступа услугама је успостављена"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Није повезано са сервером за пренос датотека"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Повезан са улазним уређајем"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Повез. са уређ. ради приступа Интернету"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Локална интернет веза се дели са уређајем"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Користи за приступ Интернету"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Користи се за мапу"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Користи за приступ SIM картици"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Коришћење за звук медија"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Коришћење за аудио телефона"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Коришћење за пренос датотека"</string>
+    <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_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> није могуће због нетачног PIN-а или приступног кода."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Није могуће комуницирати са уређајем <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> је одбио/ла упаривање"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi је искључен."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi веза је прекинута."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi сигнал има једну црту."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi сигнал има две црте."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi сигнал има три црте."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi сигнал је најјачи."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sv/arrays.xml b/packages/SettingsLib/res/values-sv/arrays.xml
new file mode 100644
index 0000000..02b352c
--- /dev/null
+++ b/packages/SettingsLib/res/values-sv/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Skannar…"</item>
+    <item msgid="8513729475867537913">"Ansluter…"</item>
+    <item msgid="515055375277271756">"Autentiserar…"</item>
+    <item msgid="1943354004029184381">"Erhåller IP-adress…"</item>
+    <item msgid="4221763391123233270">"Ansluten"</item>
+    <item msgid="624838831631122137">"Pausad"</item>
+    <item msgid="7979680559596111948">"Kopplar ifrån…"</item>
+    <item msgid="1634960474403853625">"Frånkopplad"</item>
+    <item msgid="746097431216080650">"Misslyckades"</item>
+    <item msgid="6367044185730295334">"Blockerat"</item>
+    <item msgid="503942654197908005">"Undviker just nu dålig anslutning"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Skannar…"</item>
+    <item msgid="355508996603873860">"Ansluter till <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Autentiserar med <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Hämtar IP-adress från <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Ansluten till: <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Pausad"</item>
+    <item msgid="7698638434317271902">"Kopplar ifrån <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Frånkopplad"</item>
+    <item msgid="8578370891960825148">"Misslyckades"</item>
+    <item msgid="5660739516542454527">"Blockerat"</item>
+    <item msgid="1805837518286731242">"Undviker just nu dålig anslutning"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml
new file mode 100644
index 0000000..ba07656
--- /dev/null
+++ b/packages/SettingsLib/res/values-sv/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Det går inte att söka efter nätverk"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Sparat"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Inaktiverad"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP-konfigurationsfel"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi-anslutningsfel"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Autentiseringsproblem"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Utom räckhåll"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ingen internetåtkomst hittades. Det går inte att återansluta automatiskt."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Sparades av <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ansluten via Wi-Fi-assistent"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Anslutet via %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Tillgängligt via %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Ansluten, inget internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Kopplas ifrån"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Kopplar ifrån…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Ansluter…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Ansluten"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Parkoppling…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ansluten (ingen telefon)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ansluten (inga media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ansluten (ingen meddelandeåtkomst)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ansluten (ingen telefon och inga media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medialjud"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefonljud"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Filöverföring"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Indataenhet"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetåtkomst"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktdelning"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Använd för kontaktdelning"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Delning av Internetanslutning"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Meddelandeåtkomst"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-åtkomst"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ansluten till medialjud"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ansluten till telefonens ljud"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ansluten till filöverföringsserver"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ansluten till MAP"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Ansluten till SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Inte ansluten till filöverföringsserver"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ansluten till indataenhet"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ansluten för Internetåtkomst"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Dela lokal Internetanslutning med enhet"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Använd för Internetåtkomst"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Använd för MAP"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Använd för SIM-åtkomst"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Använd för medialjud"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Använd för telefonens ljud"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Använd för filöverföring"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Använd för inmatning"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Parkoppling"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"KOPPLA"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Avbryt"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Om du kopplar enheten får du tillgång till dina kontakter och din samtalshistorik när du är ansluten."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Det gick inte att koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Det gick inte att koppla till <xliff:g id="DEVICE_NAME">%1$s</xliff:g> på grund av en felaktig PIN-kod eller nyckel."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Det går inte att kommunicera med <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Parkoppling avvisad av <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi är inaktiverat."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Ingen Wi-Fi-anslutning."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi: en stapel."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi: två staplar."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi: tre staplar."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Full signalstyrka för Wi-Fi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-sw/arrays.xml b/packages/SettingsLib/res/values-sw/arrays.xml
new file mode 100644
index 0000000..cbd906d
--- /dev/null
+++ b/packages/SettingsLib/res/values-sw/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Inasafisha..."</item>
+    <item msgid="8513729475867537913">"Inaunganisha…"</item>
+    <item msgid="515055375277271756">"Inathibitisha..."</item>
+    <item msgid="1943354004029184381">"Inapata anwani ya Ip..."</item>
+    <item msgid="4221763391123233270">"Umeunganishwa"</item>
+    <item msgid="624838831631122137">"Imesimamishwa"</item>
+    <item msgid="7979680559596111948">"Inakatisha muunganisho..."</item>
+    <item msgid="1634960474403853625">"Muunganisho Umekatika"</item>
+    <item msgid="746097431216080650">"Haijafanikiwa"</item>
+    <item msgid="6367044185730295334">"Imezuiwa"</item>
+    <item msgid="503942654197908005">"Inaepuka kwa muda muunganisho mbovu"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Inasafisha..."</item>
+    <item msgid="355508996603873860">"Inaunganisha kwa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Uhalalishaji kwa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Inamiliki anwani ya IP kutoka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">" Umeunganishwa kwa<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Imesimamishwa"</item>
+    <item msgid="7698638434317271902">"inakatisha muunganisho kutoka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Muunganisho Umekatika"</item>
+    <item msgid="8578370891960825148">"Haijafanikiwa"</item>
+    <item msgid="5660739516542454527">"Imezuiwa"</item>
+    <item msgid="1805837518286731242">"Inaepuka kwa muda muunganisho mbovu"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml
new file mode 100644
index 0000000..5573518
--- /dev/null
+++ b/packages/SettingsLib/res/values-sw/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Haiwezi kutambaza mitandao"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Hamna"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Imehifadhiwa"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Imelemazwa"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Haikuweza Kusanidi IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Haikuweza Kuunganisha kwenye WiFi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tatizo la uthibitishaji"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Haiko karibu"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Hakuna Ufikiaji kwa Intaneti Uliogunduliwa, haitaweza kuunganisha kiotomatiki."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Ilihifadhiwa na <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Imeunganishwa kupitia Kisaidizi cha Wi-Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Imeunganishwa kupitia %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Inapatikana kupitia %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Imeunganishwa, hakuna Intaneti"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Imetenganishwa"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inatenganisha..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Inaunganisha…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Umeunganishwa"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Inaoanisha..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Imeunganishwa (hakuna simu)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Imeunganishwa(hakuna vyombo vya habari)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Imeunganishwa (hakuna ufikiaji kwa ujumbe)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Imeunganishwa(hakuna simu au vyombo vya habari)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media ya sauti"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Sauti ya simu"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Uhamishaji wa faili"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Kifaa cha kuingiza"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ufikivu wa mtandao"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kushiriki anwani"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Tumia kwa kushiriki anwani"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Kushiriki muunganisho wa tovuti"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Ufikiaji wa Ujumbe"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Ufikiaji wa SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Imeunganishwa kwenye sikika ya njia ya mawasiliano"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Imeunganishwa kwenye sauti ya simu"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Imeunganishwa kwenye seva ya kuhamisha faili"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Imeunganishwa kwenye ramani"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Imeunganishwa kwenye SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Haijaunganishwa kwenye seva ya kuhamisha faili"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Umeunganishwa kwa kifaa cha kuingiza"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Umeunganishwa kwa kifaa cha ufikia Mtandao"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Kushiriki muunganisho wa mtandao wa nyumbani na kifaa"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Tumia kwa ufikiaji mtandao"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Tumia kwa ramani"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Tumia kwa ufikiaji wa SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Tumia kwa sauti ya media"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Tumia kwa sauti ya simu"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Tumia kwa hali faili"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Tumia kwa kuingiza"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Oanisha"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"OANISHA"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Ghairi"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Kuoanisha hutoa ruhusa ya kufikiwa kwa unaowasiliana nao na rekodi ya simu zilizopigwa unapounganishwa."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Haikuwezakulinganisha na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Haikuweza kulingana na <xliff:g id="DEVICE_NAME">%1$s</xliff:g> kwa sababu ya PIN isiyo sahihi au msimbo ya kuingia."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Haiwezi kuanzisha mawasiliano na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ulinganishaji umekataliwa na <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi imezimwa."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi imeondolewa."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Kipima mtandao kimoja cha Wifi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Vipima mtandao viwili vya Wifi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Vipima mtandao vitatu vya Wifi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Nguvu kamili ya mtandao wa Wifi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ta-rIN/arrays.xml b/packages/SettingsLib/res/values-ta-rIN/arrays.xml
new file mode 100644
index 0000000..c554fea
--- /dev/null
+++ b/packages/SettingsLib/res/values-ta-rIN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"ஸ்கேன் செய்கிறது…"</item>
+    <item msgid="8513729475867537913">"இணைக்கிறது..."</item>
+    <item msgid="515055375277271756">"அங்கீகரிக்கிறது..."</item>
+    <item msgid="1943354004029184381">"IP முகவரியைப் பெறுகிறது…"</item>
+    <item msgid="4221763391123233270">"இணைக்கப்பட்டது"</item>
+    <item msgid="624838831631122137">"இடைநீக்கப்பட்டது"</item>
+    <item msgid="7979680559596111948">"துண்டிக்கிறது..."</item>
+    <item msgid="1634960474403853625">"தொடர்பு துண்டிக்கப்பட்டது"</item>
+    <item msgid="746097431216080650">"தோல்வி"</item>
+    <item msgid="6367044185730295334">"தடுக்கப்பட்டது"</item>
+    <item msgid="503942654197908005">"வேகம் குறைந்த இணைப்பைத் தற்காலிகமாகத் தவிர்க்கிறது"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> இலிருந்து IP முகவரியைப் பெறுகிறது…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> உடன் இணைக்கப்பட்டது"</item>
+    <item msgid="1330262655415760617">"இடைநீக்கப்பட்டது"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> இலிருந்து தொடர்பு துண்டிக்கப்படுகிறது…"</item>
+    <item msgid="197508606402264311">"தொடர்பு துண்டிக்கப்பட்டது"</item>
+    <item msgid="8578370891960825148">"தோல்வி"</item>
+    <item msgid="5660739516542454527">"தடுக்கப்பட்டது"</item>
+    <item msgid="1805837518286731242">"வேகம் குறைந்த இணைப்பைத் தற்காலிகமாகத் தவிர்க்கிறது"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ta-rIN/cm_strings.xml b/packages/SettingsLib/res/values-ta-rIN/cm_strings.xml
new file mode 100644
index 0000000..7011fca
--- /dev/null
+++ b/packages/SettingsLib/res/values-ta-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">பயன்பாடுகள்</string>
+  <string name="picker_activities">செயல்பாடுகள்</string>
+  <string name="select_custom_app_title">தனிப்பயனாக்கப்பட்ட ஆப்-ஐ தேர்ந்தெடு</string>
+  <string name="select_custom_activity_title">தனிப்பயனாக்கப்பட்ட செயல்பாட்டை தேர்ந்தெடு</string>
+  <string name="lockscreen_targets_message">திரை குறுக்குவழிகளை லாக் செய்க</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ta-rIN/strings.xml b/packages/SettingsLib/res/values-ta-rIN/strings.xml
new file mode 100644
index 0000000..9b6ea75
--- /dev/null
+++ b/packages/SettingsLib/res/values-ta-rIN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"நெட்வொர்க்குகளுக்கு ஸ்கேன் செய்யப்படவில்லை"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ஏதுமில்லை"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"சேமிக்கப்பட்டது"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"முடக்கப்பட்டது"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP உள்ளமைவில் தோல்வி"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"வைஃபை இணைப்பில் தோல்வி"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"அங்கீகரிப்புச் சிக்கல்"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"தொடர்பு எல்லையில் இல்லை"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"இணைய அணுகல் இல்லை, மீண்டும் தானாக இணையாது."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> சேமித்தது"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"வைஃபை அசிஸ்டண்ட் மூலம் இணைக்கப்பட்டது"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s வழியாக இணைக்கப்பட்டது"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s வழியாகக் கிடைக்கிறது"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"இணைக்கப்பட்டது, இணையம் இல்லை"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"தொடர்பு துண்டிக்கப்பட்டது"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"துண்டிக்கிறது..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"இணைக்கிறது..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"இணைக்கிறது..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"இணைக்கப்பட்டது (மொபைல் இல்லை)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"இணைக்கப்பட்டது (மீடியா இல்லை)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"இணைக்கப்பட்டது (செய்திக்கான அணுகல் இல்லை)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"இணைக்கப்பட்டது (மொபைல் அல்லது மீடியாவுடன் அல்ல)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"மீடியா ஆடியோ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"மொபைல் ஆடியோ"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"கோப்பு இடமாற்றம்"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"உள்ளீட்டுச் சாதனம்"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"இணைய அணுகல்"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"தொடர்புப் பகிர்தல்"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"தொடர்புப் பகிர்தலுக்குப் பயன்படுத்து"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"இணைய இணைப்பு பகிர்தல்"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"செய்திக்கான அணுகல்"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"சிம் அணுகல்"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"மீடியா ஆடியோவுடன் இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"மொபைல் ஆடியோவுடன் இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"கோப்பைப் பரிமாற்றும் சேவையகத்துடன் இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"வரைபடத்துடன் இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP உடன் இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"கோப்பு இடமாற்றும் சேவையகத்துடன் இணைக்கப்படவில்லை"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"உள்ளீட்டுச் சாதனத்துடன் இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"இணைய அணுகலுக்காகச் சாதனம் இணைக்கப்பட்டது"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"சாதனத்துடன் அக இணைய இணைப்பைப் பகிர்கிறது"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"இணைய அணுகலுக்காகப் பயன்படுத்து"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"வரைபடத்திற்குப் பயன்படுத்து"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"சிம் அணுகலுக்குப் பயன்படுத்தும்"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"மீடியாவின் ஆடியோவிற்குப் பயன்படுத்து"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"மொபைல் ஆடியோவைப் பயன்படுத்து"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"கோப்பு பரிமாற்றத்திற்காகப் பயன்படுத்து"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> உடன் இணைக்க முடியவில்லை."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> இணைப்பதை நிராகரித்தது."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"வைஃபை முடக்கப்பட்டது."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"வைஃபை துண்டிக்கப்பட்டது."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"வைஃபை சிக்னல்: ஒரு கோடு."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"வைஃபை சிக்னல்: இரண்டு கோடுகள்."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"வைஃபை சிக்னல்: மூன்று கோடுகள்."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"வைஃபை சிக்னல் முழுமையாக உள்ளது."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-te-rIN/arrays.xml b/packages/SettingsLib/res/values-te-rIN/arrays.xml
new file mode 100644
index 0000000..e21a5f4
--- /dev/null
+++ b/packages/SettingsLib/res/values-te-rIN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"స్కాన్ చేస్తోంది…"</item>
+    <item msgid="8513729475867537913">"కనెక్ట్ చేస్తోంది..."</item>
+    <item msgid="515055375277271756">"ప్రామాణీకరిస్తోంది…"</item>
+    <item msgid="1943354004029184381">"IP చిరునామాను పొందుతోంది…"</item>
+    <item msgid="4221763391123233270">"కనెక్ట్ చేయబడింది"</item>
+    <item msgid="624838831631122137">"తాత్కాలికంగా రద్దు చేయబడింది"</item>
+    <item msgid="7979680559596111948">"డిస్‌కనెక్ట్ చేస్తోంది..."</item>
+    <item msgid="1634960474403853625">"డిస్‌కనెక్ట్ చేయబడింది"</item>
+    <item msgid="746097431216080650">"విఫలమైంది"</item>
+    <item msgid="6367044185730295334">"బ్లాక్ చేయబడింది"</item>
+    <item msgid="503942654197908005">"బలహీన కనెక్షన్‌ను తాత్కాలికంగా నివారిస్తోంది"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> నుండి IP చిరునామాను పొందుతోంది…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g>కి కనెక్ట్ చేయబడింది"</item>
+    <item msgid="1330262655415760617">"తాత్కాలికంగా రద్దు చేయబడింది"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> నుండి డిస్‌కనెక్ట్ చేస్తోంది…"</item>
+    <item msgid="197508606402264311">"డిస్‌కనెక్ట్ చేయబడింది"</item>
+    <item msgid="8578370891960825148">"విఫలమైంది"</item>
+    <item msgid="5660739516542454527">"బ్లాక్ చేయబడింది"</item>
+    <item msgid="1805837518286731242">"బలహీన కనెక్షన్‌ను తాత్కాలికంగా నివారిస్తోంది"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-te-rIN/cm_strings.xml b/packages/SettingsLib/res/values-te-rIN/cm_strings.xml
new file mode 100644
index 0000000..99cac22
--- /dev/null
+++ b/packages/SettingsLib/res/values-te-rIN/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">అనువర్తనాలు</string>
+  <string name="picker_activities">కార్యాచరణలు</string>
+  <string name="select_custom_app_title">అనుకూలిత అనువర్తనాన్ని ఎంపిక చేయుము</string>
+  <string name="select_custom_activity_title">అనుకూలిత కార్యాచరణను ఎంపిక చేయుము</string>
+  <string name="lockscreen_targets_message">లాక్ స్క్రీన్ సత్వరమార్గాలు</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-te-rIN/strings.xml b/packages/SettingsLib/res/values-te-rIN/strings.xml
new file mode 100644
index 0000000..291e7b1
--- /dev/null
+++ b/packages/SettingsLib/res/values-te-rIN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"నెట్‌వర్క్‌ల కోసం స్కాన్ చేయడం సాధ్యపడదు"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ఏదీ లేదు"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"సేవ్ చేయబడింది"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"నిలిపివేయబడింది"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP కాన్ఫిగరేషన్ వైఫల్యం"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi కనెక్షన్ వైఫల్యం"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ప్రామాణీకరణ సమస్య"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"పరిధిలో లేదు"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ఇంటర్నెట్ ప్రాప్యత కనుగొనబడలేదు, స్వయంచాలకంగా మళ్లీ కనెక్ట్ చేయబడదు."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> ద్వారా సేవ్ చేయబడింది"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi సహాయకం ద్వారా కనెక్ట్ చేయబడింది"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s ద్వారా కనెక్ట్ చేయబడింది"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s ద్వారా అందుబాటులో ఉంది"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"కనెక్ట్ చేయబడింది, ఇంటర్నెట్ లేదు"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"డిస్‌కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"డిస్‌కనెక్ట్ చేస్తోంది..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"కనెక్ట్ చేస్తోంది..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"జత చేస్తోంది..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"కనెక్ట్ చేయబడింది (ఫోన్‌ కాదు)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"కనెక్ట్ చేయబడింది (మీడియా కాదు)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"కనెక్ట్ చేయబడింది (సందేశ ప్రాప్యత లేదు)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"కనెక్ట్ చేయబడింది (ఫోన్ లేదా మీడియా కాకుండా)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"మీడియా ఆడియో"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"ఫోన్ ఆడియో"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"ఫైల్ బదిలీ"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ఇన్‌పుట్ పరికరం"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"ఇంటర్నెట్ ప్రాప్యత"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"పరిచయ భాగస్వామ్యం"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"పరిచయ భాగస్వామ్యం కోసం ఉపయోగించు"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"సందేశ ప్రాప్యత"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ప్రాప్యత"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"మీడియా ఆడియోకు కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ఫోన్ ఆడియోకు కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ఫైల్ బదిలీ సర్వర్‌కు కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"మ్యాప్‌కు కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAPకి కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ఫైల్ బదిలీ సర్వర్‌కు కనెక్ట్ చేయబడలేదు"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ఇన్‌పుట్ పరికరానికి కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ఇంటర్నెట్ ప్రాప్యత కోసం పరికరానికి కనెక్ట్ చేయబడింది"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"స్థానిక ఇంటర్నెట్ కనెక్షన్‌ను పరికరంతో భాగస్వామ్యం చేయడం"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ఇంటర్నెట్ ప్రాప్యత కోసం ఉపయోగించు"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"మ్యాప్ కోసం ఉపయోగించు"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM ప్రాప్యత కోసం ఉపయోగించబడుతుంది"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"మీడియా ఆడియో కోసం ఉపయోగించు"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ఫోన్ ఆడియో కోసం ఉపయోగించు"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ఫైల్ బదిలీ కోసం ఉపయోగించు"</string>
+    <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_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>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>తో కమ్యూనికేట్ చేయడం సాధ్యపడదు."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> జత చేయడాన్ని తిరస్కరించింది."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wifi ఆఫ్‌లో ఉంది."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wifi డిస్‌కనెక్ట్ చేయబడింది."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wifi సిగ్నల్ ఒక బార్ ఉంది."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wifi సిగ్నల్ రెండు బార్‌లు ఉంది."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wifi సిగ్నల్ మూడు బార్‌లు ఉంది."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wifi సిగ్నల్ పూర్తిగా ఉంది."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-th/arrays.xml b/packages/SettingsLib/res/values-th/arrays.xml
new file mode 100644
index 0000000..190a37d
--- /dev/null
+++ b/packages/SettingsLib/res/values-th/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"กำลังสแกน..."</item>
+    <item msgid="8513729475867537913">"กำลังเชื่อมต่อ…"</item>
+    <item msgid="515055375277271756">"กำลังตรวจสอบความถูกต้อง…"</item>
+    <item msgid="1943354004029184381">"กำลังรับที่อยู่ IP…"</item>
+    <item msgid="4221763391123233270">"เชื่อมต่อแล้ว"</item>
+    <item msgid="624838831631122137">"ระงับไว้"</item>
+    <item msgid="7979680559596111948">"กำลังตัดการเชื่อมต่อ..."</item>
+    <item msgid="1634960474403853625">"ตัดการเชื่อมต่อ"</item>
+    <item msgid="746097431216080650">"ไม่สำเร็จ"</item>
+    <item msgid="6367044185730295334">"ถูกบล็อก"</item>
+    <item msgid="503942654197908005">"หลีกเลี่ยงการเชื่อมต่อกับสัญญาณที่ไม่แรงพอชั่วคราว"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="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>
+    <item msgid="7698638434317271902">"กำลังตัดการเชื่อมต่อจาก <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="197508606402264311">"ตัดการเชื่อมต่อ"</item>
+    <item msgid="8578370891960825148">"ไม่สำเร็จ"</item>
+    <item msgid="5660739516542454527">"ถูกบล็อก"</item>
+    <item msgid="1805837518286731242">"หลีกเลี่ยงการเชื่อมต่อกับสัญญาณที่ไม่แรงพอชั่วคราว"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-th/cm_strings.xml b/packages/SettingsLib/res/values-th/cm_strings.xml
new file mode 100644
index 0000000..6fa5d9f
--- /dev/null
+++ b/packages/SettingsLib/res/values-th/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">แอป</string>
+  <string name="picker_activities">กิจกรรม</string>
+  <string name="select_custom_app_title">เลือกแอปเอง</string>
+  <string name="select_custom_activity_title">เลือกกิจกรรมเอง</string>
+  <string name="lockscreen_targets_message">ปุ่มลัดหน้าจอล็อค</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml
new file mode 100644
index 0000000..a8c874c
--- /dev/null
+++ b/packages/SettingsLib/res/values-th/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"ไม่สามารถสแกนหาเครือข่าย"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"ไม่มี"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"บันทึกแล้ว"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"ปิดอยู่"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"การกำหนดค่า IP ล้มเหลว"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"การเชื่อมต่อ Wi-Fi ล้มเหลว"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"ปัญหาในการตรวจสอบสิทธิ์"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"ไม่อยู่ในพื้นที่ให้บริการ"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"ไม่พบการเข้าถึงอินเทอร์เน็ต ระบบจะไม่เชื่อมต่อใหม่โดยอัตโนมัติ"</string>
+    <string name="saved_network" msgid="4352716707126620811">"บันทึกโดย <xliff:g id="NAME">%1$s</xliff:g> แล้ว"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"เชื่อมต่อผ่านตัวช่วย Wi-Fi อยู่"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"เชื่อมต่อผ่าน %1$s แล้ว"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"พร้อมใช้งานผ่านทาง %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"เชื่อมต่อแล้ว ไม่พบอินเทอร์เน็ต"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"ตัดการเชื่อมต่อ"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"กำลังตัดการเชื่อมต่อ..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"กำลังเชื่อมต่อ…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"เชื่อมต่อแล้ว"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"กำลังกำหนดค่าอุปกรณ์ให้ตรงกัน..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"เชื่อมต่อแล้ว (ยกเว้นเสียงโทรศัพท์)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"เชื่อมต่อแล้ว (ยกเว้นเสียงสื่อ)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"เชื่อมต่อแล้ว (ไม่มีการเข้าถึงข้อความ)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"เชื่อมต่อ (ยกเว้นเสียงโทรศัพท์หรือสื่อ)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"เสียงสื่อ"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"เสียงโทรศัพท์"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"การถ่ายโอนไฟล์"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"อุปกรณ์อินพุต"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"การเข้าถึงอินเทอร์เน็ต"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"การแชร์รายชื่อผู้ติดต่อ"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"ใช้สำหรับการแชร์รายชื่อผู้ติดต่อ"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"การแชร์การเชื่อมต่ออินเทอร์เน็ต"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"การเข้าถึงข้อความ"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"การเข้าถึงซิม"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"เชื่อมต่อกับระบบเสียงของสื่อแล้ว"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"เชื่อมต่อกับระบบเสียงของโทรศัพท์แล้ว"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"เชื่อมต่อกับเซิร์ฟเวอร์สำหรับโอนไฟล์แล้ว"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"เชื่อมต่อกับแผนที่แล้ว"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"เชื่อมต่อ SAP แล้ว"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"ไม่ได้เชื่อมต่อกับเซิร์ฟเวอร์สำหรับโอนไฟล์"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"เชื่อมต่อกับอุปกรณ์อินพุตแล้ว"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"เชื่อมต่อกับอุปกรณ์สำหรับการเข้าถึงอินเทอร์เน็ต"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"กำลังแชร์อินเทอร์เน็ตกับอุปกรณ์"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"ใช้การเข้าถึงอินเทอร์เน็ต"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"ใช้สำหรับแผนที่"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"ใช้สำหรับการเข้าถึงซิม"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"ใช้สำหรับระบบเสียงของสื่อ"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"ใช้สำหรับระบบเสียงของโทรศัพท์"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"ใช้สำหรับการโอนไฟล์"</string>
+    <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_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> ได้เพราะ PIN หรือรหัสผ่านไม่ถูกต้อง"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"ไม่สามารถเชื่อมต่อกับ <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"การกำหนดค่าอุปกรณ์ให้ตรงกันถูกปฏิเสธโดย <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi ปิดอยู่"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"ไม่ได้เชื่อมต่อ Wi-Fi"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"สัญญาณ Wi-Fi 1 ขีด"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"สัญญาณ Wi-Fi 2 ขีด"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"สัญญาณ Wi-Fi 3 ขีด"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"สัญญาณ Wi-Fi เต็ม"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-tl/arrays.xml b/packages/SettingsLib/res/values-tl/arrays.xml
new file mode 100644
index 0000000..35c9724
--- /dev/null
+++ b/packages/SettingsLib/res/values-tl/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Nag-i-scan…"</item>
+    <item msgid="8513729475867537913">"Kumukonekta…"</item>
+    <item msgid="515055375277271756">"Pinapatunayan…"</item>
+    <item msgid="1943354004029184381">"Kumukuha ng IP address…"</item>
+    <item msgid="4221763391123233270">"Konektado"</item>
+    <item msgid="624838831631122137">"Suspendido"</item>
+    <item msgid="7979680559596111948">"Nadidiskonekta…"</item>
+    <item msgid="1634960474403853625">"Hindi nakakonekta"</item>
+    <item msgid="746097431216080650">"Hindi tagumpay"</item>
+    <item msgid="6367044185730295334">"Naka-block"</item>
+    <item msgid="503942654197908005">"Pansamantalang iniiwasan ang mabagal na koneksyon"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Nag-ii-scan…"</item>
+    <item msgid="355508996603873860">"Kumukonekta sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="554971459996405634">"Nagpapatotoo sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Pagkuha ng IP address mula sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Nakakonekta sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Suspendido"</item>
+    <item msgid="7698638434317271902">"Inaalis sa pagkakakonekta mula sa <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Hindi nakakonekta"</item>
+    <item msgid="8578370891960825148">"Hindi tagumpay"</item>
+    <item msgid="5660739516542454527">"Naka-block"</item>
+    <item msgid="1805837518286731242">"Pansamantalang iniiwasan ang mabagal na koneksyon"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml
new file mode 100644
index 0000000..1ff256d
--- /dev/null
+++ b/packages/SettingsLib/res/values-tl/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Hindi makapag-scan ng mga network"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Wala"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Na-save"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Hindi Pinagana"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Pagkabigo ng Configuration ng IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Pagkabigo ng Koneksyon sa WiFi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Problema sa pagpapatotoo"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Wala sa sakop"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Walang Natukoy na Access sa Internet, hindi awtomatikong muling kumonekta."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Na-save ni <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Nakakonekta sa pamamagitan ng Wi‑Fi assistant"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Nakakonekta sa pamamagitan ng %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Available sa pamamagitan ng %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Nakakonekta, walang Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Hindi nakakonekta"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Nadidiskonekta..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Kumukonekta…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Konektado"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Pinapares…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Nakakonekta (walang telepono)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Nakakonekta (walang media)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Nakakonekta (walang access sa mensahe)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Nakakonekta (walang telepono o media)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Audio ng media"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Audio ng telepono"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Paglilipat ng file"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Device sa pag-input"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Access sa internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Pagbabahagi ng contact"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Gamitin para sa pagbabahagi ng contact"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Pagbabahagi ng koneksyon sa internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Access sa Mensahe"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Access sa SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Konektado sa media audio"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Nakakonekta sa audio ng telepono"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Nakakonekta sa server sa paglilipat ng file"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Nakakonekta sa mapa"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Nakakonekta sa SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Hindi konektado sa server ng paglipat ng file"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Nakakonekta sa device ng input"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Konektado sa device sa Internet access"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Pagbahagi lokal koneksyon sa Internet sa device"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Gamitin para sa pag-access sa Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Gamitin para sa mapa"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Gamitin para sa pag-access sa SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Gamitin para sa media audio"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Ginagamit para sa audio ng telepono"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Ginagamit para sa paglilipat ng file"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Gamitin para sa input"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Pares"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"IPARES"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Kanselahin"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Nagbibigay ang pagpapares ng access sa iyong mga contact at history ng tawag kapag nakakonekta."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Hindi maipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Hindi maipares sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g> dahil sa maling PIN o passkey."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Hindi magawang makipag-ugnay sa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Tinanggihan ng <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ang pagpapares."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Naka-off ang Wifi."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Nakadiskonekta ang Wifi."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"May isang bar ang Wifi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"May dalawang bar ang Wifi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"May tatlong bar ang Wifi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Puno ang signal ng Wifi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-tr/arrays.xml b/packages/SettingsLib/res/values-tr/arrays.xml
new file mode 100644
index 0000000..49d6839
--- /dev/null
+++ b/packages/SettingsLib/res/values-tr/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Taranıyor…"</item>
+    <item msgid="8513729475867537913">"Bağlanıyor…"</item>
+    <item msgid="515055375277271756">"Kimlik doğrulanıyor…"</item>
+    <item msgid="1943354004029184381">"IP adresi alınıyor..."</item>
+    <item msgid="4221763391123233270">"Bağlandı"</item>
+    <item msgid="624838831631122137">"Askıya alındı"</item>
+    <item msgid="7979680559596111948">"Bağlantı kesiliyor…"</item>
+    <item msgid="1634960474403853625">"Bağlantı kesildi"</item>
+    <item msgid="746097431216080650">"Başarısız"</item>
+    <item msgid="6367044185730295334">"Engellendi"</item>
+    <item msgid="503942654197908005">"Kötü bağlantıdan geçici olarak kaçınılıyor"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Taranıyor…"</item>
+    <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlanılıyor…"</item>
+    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> üzerinde kimlik doğrulanıyor…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağından IP adresi alınıyor…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> ağına bağlandı"</item>
+    <item msgid="1330262655415760617">"Askıya alındı"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> bağlantısı kesiliyor…"</item>
+    <item msgid="197508606402264311">"Bağlantı kesildi"</item>
+    <item msgid="8578370891960825148">"Başarısız"</item>
+    <item msgid="5660739516542454527">"Engellendi"</item>
+    <item msgid="1805837518286731242">"Kötü bağlantıdan geçici olarak kaçınılıyor"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-tr/cm_strings.xml b/packages/SettingsLib/res/values-tr/cm_strings.xml
new file mode 100644
index 0000000..aa76305
--- /dev/null
+++ b/packages/SettingsLib/res/values-tr/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Uygulamalar</string>
+  <string name="picker_activities">Etkinlikler</string>
+  <string name="select_custom_app_title">Özel uygulama seç</string>
+  <string name="select_custom_activity_title">Özel etkinlik seç</string>
+  <string name="lockscreen_targets_message">Kilit ekranı kısayolları</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml
new file mode 100644
index 0000000..258c03c
--- /dev/null
+++ b/packages/SettingsLib/res/values-tr/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ağlar taranamıyor"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Yok"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Kaydedildi"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Devre dışı"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP Yapılandırması Hatası"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Kablosuz Bağlantı Hatası"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Kimlik doğrulama sorunu"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Kapsama alanı dışında"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"İnternet Erişimi algılanmadı, otomatik olarak tekrar bağlanmayacak."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> tarafından kaydedildi"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Kablosuz bağlantı yardımcısıyla bağlandı"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s üzerinden bağlı"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s üzerinden kullanılabilir"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Bağlı, İnternet yok"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Bağlantı kesildi"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Bağlantı kesiliyor…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Bağlanıyor…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Bağlandı"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Eşleştiriliyor…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Bağlandı (telefon yok)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Bağlandı (medya yok)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Bağlı (mesaj erişimi yok)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Bağlandı (telefon veya medya yok)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Medya sesi"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon sesi"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dosya aktarımı"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Giriş cihazı"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"İnternet erişimi"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kişi paylaşma"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Kişi paylaşmak için kullan"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"İnternet bağlantısı paylaşımı"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mesaj Erişimi"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Erişimi"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Medya sesine bağlanıldı"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon sesine bağlandı"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Dosya aktarım sunucusuna bağlandı"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"MAP\'ye bağlı"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"SAP\'ye bağlı"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Dosya aktarım sunucusuna bağlanmadı"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Giriş cihazına bağlı"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"İnternet erişimi için cihaza bağlandı"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Cihazla yerel Intrnt bağlantısını paylaşıyor"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"İnternet erişimi için kullan"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"MAP için kullan"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM erişimi için kullan"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Medya sesi için kullan"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Telefon sesi için kullan"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Dosya aktarımı için kullan"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Giriş için kullan"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Eşleştir"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"EŞLEŞTİR"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"İptal"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Eşleme işlemi, bağlantı kurulduğunda kişilerinize ve çağrı geçmişine erişim izni verir."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirilemedi."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN veya parola yanlış olduğundan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşleştirilemedi"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile iletişim kurulamıyor."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Eşleştirme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> tarafından reddedildi."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Kablosuz kapalı."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Kablosuz bağlantı kesildi."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Kablosuz sinyal gücü tek çubuk."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Kablosuz sinyal gücü iki çubuk."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Kablosuz sinyal gücü üç çubuk."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Kablosuz sinyal gücü tam."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ug/arrays.xml b/packages/SettingsLib/res/values-ug/arrays.xml
new file mode 100644
index 0000000..584305e
--- /dev/null
+++ b/packages/SettingsLib/res/values-ug/arrays.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Wi-Fi settings -->
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is unknown. -->
+  <string-array name="wifi_status">
+    <!-- Status message of Wi-Fi when it is idle. -->
+    <item/>
+    <!-- Status message of Wi-Fi when it is scanning. -->
+    <item>تەكشۈرۈۋاتىدۇ\u2026</item>
+    <!-- Status message of Wi-Fi when it is connecting. -->
+    <item>باغلىنىۋاتىدۇ\u2026</item>
+    <!-- Status message of Wi-Fi when it is authenticating. -->
+    <item>دەلىللەۋاتىدۇ\u2026</item>
+    <!-- Status message of Wi-Fi when it is obtaining IP address. -->
+    <item>IP ئادرېسقا ئېرىشىۋاتىدۇ\u2026</item>
+    <!-- Status message of Wi-Fi when it is connected. -->
+    <item>باغلاندى</item>
+    <!-- Status message of Wi-Fi when it is suspended. -->
+    <item>ۋاقىتلىق توختىتىلدى</item>
+    <!-- Status message of Wi-Fi when it is disconnecting. -->
+    <item>ئۈزۈۋاتىدۇ\u2026</item>
+    <!-- Status message of Wi-Fi when it is disconnected. -->
+    <item>Disconnected</item>
+    <!-- Status message of Wi-Fi when it is a failure. -->
+    <item>Unsuccessful</item>
+    <!-- Status message of Wi-Fi when it is blocked. -->
+    <item>Blocked</item>
+    <!-- Status message of Wi-Fi when connectiong is being verified. -->
+    <item>Temporarily avoiding poor connection</item>
+  </string-array>
+  <!-- Match this with the order of NetworkInfo.DetailedState. -->
+  <!-- Wi-Fi settings. The status messages when the network is known. -->
+</resources>
diff --git a/packages/SettingsLib/res/values-ug/cm_strings.xml b/packages/SettingsLib/res/values-ug/cm_strings.xml
new file mode 100644
index 0000000..ed72f15
--- /dev/null
+++ b/packages/SettingsLib/res/values-ug/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">ئەپلەر</string>
+  <string name="picker_activities">پائالىيەتلەر</string>
+  <string name="select_custom_app_title">ئىختىيارىي ئەپنى تاللاڭ</string>
+  <string name="select_custom_activity_title">ئىختىيارىي پائالىيەتنى تاللاڭ</string>
+  <string name="lockscreen_targets_message">ئېكران قۇلۇپ قىسقا يولى</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ug/strings.xml b/packages/SettingsLib/res/values-ug/strings.xml
new file mode 100644
index 0000000..b5f0c58
--- /dev/null
+++ b/packages/SettingsLib/res/values-ug/strings.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Toast message when Wi-Fi cannot scan for networks -->
+  <string name="wifi_fail_to_scan">تورنى تەكشۈرەلمەيدۇ</string>
+  <!-- Do not translate.  Concise terminology for wifi with WEP security -->
+  <string name="wifi_security_short_wep">WEP</string>
+  <!-- Do not translate.  Concise terminology for wifi with WPA security -->
+  <string name="wifi_security_short_wpa">WPA</string>
+  <!-- Do not translate.  Concise terminology for wifi with WPA2 security -->
+  <string name="wifi_security_short_wpa2">WPA2</string>
+  <!-- Do not translate.  Concise terminology for wifi with both WPA/WPA2 security -->
+  <string name="wifi_security_short_wpa_wpa2">WPA/WPA2</string>
+  <!-- Do not translate.  Concise terminology for wifi with unknown PSK type -->
+  <string name="wifi_security_short_psk_generic">@string/wifi_security_short_wpa_wpa2</string>
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <string name="wifi_security_short_eap">802.1x</string>
+  <!-- Used in Wi-Fi settings dialogs when Wi-Fi does not have any security. -->
+  <string name="wifi_security_none">يوق</string>
+  <!-- Do not translate.  Terminology for wifi with WEP security -->
+  <!-- Do not translate.  Terminology for wifi with WPA security -->
+  <!-- Do not translate.  Terminology for wifi with WPA2 security -->
+  <!-- Do not translate.  Terminology for wifi with both WPA/WPA2 security, or unknown -->
+  <!-- Do not translate.  Terminology for wifi with unknown PSK type -->
+  <!-- Do not translate.  Concise terminology for wifi with 802.1x EAP security -->
+  <!-- Do not translate.  Concise terminology for Passpoint network -->
+  <!-- Summary for the remembered network. -->
+  <!-- Status for networks disabled for unknown reason -->
+  <!-- Status for networked disabled from a DNS or DHCP failure -->
+  <!-- Status for networked disabled from a wifi association failure -->
+  <!-- Status for networks disabled from authentication failure (wrong password
+         or certificate). -->
+  <!-- Summary for the remembered network but currently not in range. -->
+  <!-- Summary for the remembered network but no internet connection was detected. -->
+  <!-- Summary for saved networks -->
+  <!-- Status message of Wi-Fi when it is connected by a Wi-Fi assistant application. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
+  <!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
+  <!-- Package name for Settings app-->
+  <!-- Package name for Certinstaller app-->
+  <!-- Summary for Connected wifi network without internet -->
+  <!-- Bluetooth settings.  Message when a device is disconnected -->
+  <!-- Bluetooth settings.  Message when disconnecting from a device -->
+  <!-- Bluetooth settings.  Message when connecting to a device -->
+  <!-- Bluetooth settings.  Message when connected to a device. [CHAR LIMIT=40] -->
+  <!--Bluetooth settings screen, summary text under individual Bluetooth devices when pairing -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for map. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  Message when connected to a device, except for phone/media audio. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the A2DP profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the headset or handsfree profile. -->
+  <!-- Bluetooth settings.  The user-visible string that is used whenever referring to the OPP profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the HID profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (accessing Internet through remote device). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PBAP profile. [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible summary string that is used whenever referring to the PBAP profile (sharing contacts). [CHAR LIMIT=60] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the PAN profile (sharing this device's Internet connection). [CHAR LIMIT=40] -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the map profile. -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the SAP profile (sharing SIM card). -->
+  <!-- Bluetooth settings. The user-visible string that is used whenever referring to the dun profile. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference when A2DP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference when headset is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the map checkbox preference when map is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference when SAP is connected. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference when OPP is not connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the HID checkbox preference when HID is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the DUN checkbox preference when DUN is connected. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the PAN checkbox preference that describes how checking it
+         will set the PAN profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the map checkbox preference that describes how checking it will set the map profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the sap checkbox preference that describes how checking it will set the sap profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the A2DP checkbox preference that describes how checking it will set the A2DP profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the headset checkbox preference that describes how checking it will set the headset profile as preferred. -->
+  <!-- Bluetooth settings.  Connection options screen.  The summary for the OPP checkbox preference that describes how checking it will set the OPP profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen. The summary
+         for the HID checkbox preference that describes how checking it
+         will set the HID profile as preferred. -->
+  <!-- Bluetooth settings. Connection options screen.  The summary for the dun checkbox preference that describes how checking it will set the dun profile as preferred. -->
+  <!-- Button text for accepting an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Button text for accepting an incoming pairing request in all caps. [CHAR LIMIT=20] -->
+  <!-- Button text for declining an incoming pairing request. [CHAR LIMIT=20] -->
+  <!-- Message in pairing dialogs.  [CHAR LIMIT=NONE] -->
+  <!-- Message for the error dialog when BT pairing fails generically. -->
+  <!-- Message for the error dialog when BT pairing fails because the PIN /
+    Passkey entered is incorrect. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device is down. -->
+  <!-- Message for the error dialog when BT pairing fails because the other device rejected the pairing. -->
+  <!-- Content description of the WIFI signal when WIFI is disabled for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WIFI signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Label for kernel threads in battery usage -->
+  <!-- Title of data usage item that represents all uninstalled applications. [CHAR LIMIT=48] -->
+  <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
+  <!-- Tethering controls, item title to go into the tethering settings -->
+  <!-- Tethering controls, item title to go into the tethering settings when only USB tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Wifi tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when only Bluetooth tethering is available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB and Bluetooth tethering are available [CHAR LIMIT=25]-->
+  <!-- Tethering controls, item title to go into the tethering settings when USB, Bluetooth and Wifi tethering are available [CHAR LIMIT=25]-->
+  <!-- Title for a work profile. [CHAR LIMIT=25] -->
+  <!-- Title for Guest user [CHAR LIMIT=35] -->
+  <!-- Manage apps, individual app screen, substituted for the application's label when the app's label CAN NOT be determined.-->
+  <!-- [CHAR LIMIT=NONE] Label of a running process that represents another user -->
+</resources>
diff --git a/packages/SettingsLib/res/values-uk/arrays.xml b/packages/SettingsLib/res/values-uk/arrays.xml
new file mode 100644
index 0000000..a5608b4
--- /dev/null
+++ b/packages/SettingsLib/res/values-uk/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Сканув-ня..."</item>
+    <item msgid="8513729475867537913">"Підключення…"</item>
+    <item msgid="515055375277271756">"Автентифікація…"</item>
+    <item msgid="1943354004029184381">"Отримання ІР-адреси…"</item>
+    <item msgid="4221763391123233270">"Підключено"</item>
+    <item msgid="624838831631122137">"Припинено"</item>
+    <item msgid="7979680559596111948">"Відключення..."</item>
+    <item msgid="1634960474403853625">"Роз’єднано"</item>
+    <item msgid="746097431216080650">"Помилка"</item>
+    <item msgid="6367044185730295334">"Заблоковано"</item>
+    <item msgid="503942654197908005">"Тимчасове уникнення слабкого з’єднання"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"Отримання ІР-адреси від <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>
+    <item msgid="7698638434317271902">"Відключення від <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Роз’єднано"</item>
+    <item msgid="8578370891960825148">"Помилка"</item>
+    <item msgid="5660739516542454527">"Заблоковано"</item>
+    <item msgid="1805837518286731242">"Тимчасове уникнення слабкого з’єднання"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml
new file mode 100644
index 0000000..3559d21
--- /dev/null
+++ b/packages/SettingsLib/res/values-uk/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Неможливо здійснити сканування мереж"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Немає"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Збережено"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Вимкнено"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Помилка конфігурації IP-адреси"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Помилка з’єднання Wi-Fi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Проблема з автентифікацією"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Не в діапазоні"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Немає доступу до Інтернету. Спроба під’єднання не здійснюватиметься автоматично."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Збережено додатком <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Під’єднано через Диспетчер Wi-Fi-з’єднання"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Під’єднано через %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Доступ через %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Під’єднано, але немає доступу до Інтернету"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Роз’єднано"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Відключення..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Підключення…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Підключено"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Підключення…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Під’єднано (без телефону)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Під’єднано (без медіа-файлів)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Під’єднано (без доступу до повідомлень)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Під’єднано (без телефону чи медіа)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Звук медіа-файлів"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Звук телефону"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Передавання файлів"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Пристрій введення"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Доступ до Інтернету"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Надсилання контактів"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Використовувати для надсилання контактів"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Надання доступу до Інтернету"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Доступ до повідомлень"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Доступ до SIM-карти"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Підключено до аудіоджерела"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Підключено до звуку телеф."</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Підключ. до сервера передачі файлів"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Під’єднано до карти"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Під’єднано до точки доступу"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Не підключ. до сервера передачі файлів"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Підключено до пристрою введ."</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Під’єдн. до пристр. для дост.до Інтерн."</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Доступ до локал.з’єдн. з Інтерн. ч-з пристрій"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Використовувати для доступу до Інтернету"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Використовувати для карти"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Використовувати для доступу до SIM-карти"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Викор. для аудіоджер."</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Викор. для звуку тел."</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Викор. для перед. файлів"</string>
+    <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_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> через неправильний PIN-код чи ключ доступу."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Неможливо зв’язатися з пристроєм <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Створ. пари відхилено <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi вимкнено."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi від’єднано."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Одна смужка сигналу Wi-Fi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Дві смужки сигналу Wi-Fi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Три смужки сигналу Wi-Fi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Максимальний сигнал Wi-Fi."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-ur-rPK/arrays.xml b/packages/SettingsLib/res/values-ur-rPK/arrays.xml
new file mode 100644
index 0000000..c58a4a7
--- /dev/null
+++ b/packages/SettingsLib/res/values-ur-rPK/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"اسکین کر رہا ہے…"</item>
+    <item msgid="8513729475867537913">"مربوط ہو رہا ہے…"</item>
+    <item msgid="515055375277271756">"توثیق ہو رہی ہے…"</item>
+    <item msgid="1943354004029184381">"‏IP پتہ حاصل کر رہا ہے…"</item>
+    <item msgid="4221763391123233270">"مربوط ہو گیا"</item>
+    <item msgid="624838831631122137">"معطل شدہ"</item>
+    <item msgid="7979680559596111948">"منقطع کیا جارہا ہے…"</item>
+    <item msgid="1634960474403853625">"منقطع ہو گیا"</item>
+    <item msgid="746097431216080650">"ناکام"</item>
+    <item msgid="6367044185730295334">"مسدود"</item>
+    <item msgid="503942654197908005">"عارضی طور پر خراب کنکشن سے اجتناب کر رہا ہے"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"‏<xliff:g id="NETWORK_NAME">%1$s</xliff:g> سے IP پتہ حاصل کر رہا ہے…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> سے مربوط ہو گیا"</item>
+    <item msgid="1330262655415760617">"معطل شدہ"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> سے منقطع ہو رہا ہے…"</item>
+    <item msgid="197508606402264311">"منقطع ہو گیا"</item>
+    <item msgid="8578370891960825148">"ناکام"</item>
+    <item msgid="5660739516542454527">"مسدود ہے"</item>
+    <item msgid="1805837518286731242">"عارضی طور پر خراب کنکشن سے اجتناب کر رہا ہے"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-ur-rPK/strings.xml b/packages/SettingsLib/res/values-ur-rPK/strings.xml
new file mode 100644
index 0000000..b9e72d2
--- /dev/null
+++ b/packages/SettingsLib/res/values-ur-rPK/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"نیٹ ورکس کیلئے اسکین نہيں کر سکتے ہیں"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"کوئی نہیں"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"محفوظ کردیا گیا"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"غیر فعال"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"‏IP کنفیگریشن کی ناکامی"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"‏WiFi کنکشن کی ناکامی"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"توثیق کا مسئلہ"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"رینج میں نہیں ہے"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"انٹرنیٹ تک کسی رسائی کا پتہ نہیں چلا، خود بخود دوبارہ منسلک نہیں ہوگا۔"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> کی جانب سے محفوظ کردہ"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"‏Wi‑Fi اسسٹنٹ کے ذریعے منسلک ہے"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"‏منسلک بذریعہ ‎%1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"‏دستیاب بذریعہ ‎%1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"منسلک، انٹرنیٹ نہیں ہے"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"منقطع"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"منقطع کیا جارہا ہے…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"مربوط ہو رہا ہے…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"مربوط"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"جوڑا بنایا جا رہا ہے…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"مربوط (کوئی فون نہیں ہے)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"مربوط (کوئی میڈیا نہیں ہے)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"مربوط (کسی پیغام تک رسائی نہیں ہے)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"مربوط (کوئی فون یا میڈیا نہیں ہے)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"میڈيا آڈیو"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"فون آڈیو"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"فائل کی منتقلی"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"ان پٹ آلہ"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"انٹرنیٹ تک رسائی"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"رابطہ کا اشتراک"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"رابطہ کے اشتراک کیلئے استعمال کریں"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"انٹرنیٹ کنکشن کا اشتراک کرنا"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"پیغام تک رسائی"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"‏SIM رسائی"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"میڈیا آڈیو سے مربوط"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"فون آڈیو سے مربوط"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"فائل منتقلی سرور سے مربوط ہو گیا ہے"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"نقشہ سے مربوط ہوگیا"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"‏SAP سے منسلک"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"فائل منتقلی سرور سے مربوط نہیں ہے"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"ان پٹ آلہ سے مربوط"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"انٹرنیٹ رسائی کیلئے آلہ سے مربوط ہو گیا"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"آلہ کے ساتھ مقامی انٹرنیٹ کنکشن کا اشتراک کر رہا ہے"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"انٹرنیٹ رسائی کیلئے استعمال"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"نقشہ کیلئے استعمال کریں"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"‏SIM رسائی کے لئے استعمال کریں"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"میڈیا آڈیو کیلئے استعمال کریں"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"فون آڈیو کیلئے استعمال کریں"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"فائل منتقل کرنے کیلئے استعمال کریں"</string>
+    <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_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">"‏غلط PIN یا پاس کلید کی وجہ سے <xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ جوڑا نہیں بنا سکا۔"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> کے ساتھ مواصلت نہیں ہو سکتی۔"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> نے جوڑا بنانے کو مسترد کر دیا۔"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"‏Wifi آف ہے۔"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"‏Wifi غیر منسلک ہو گیا۔"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"‏Wifi ایک بار۔"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"‏Wifi دو بارز۔"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"‏Wifi تین بارز۔"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"‏Wifi سگنل پورا ہے۔"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-uz-rUZ/arrays.xml b/packages/SettingsLib/res/values-uz-rUZ/arrays.xml
new file mode 100644
index 0000000..f2cae2c
--- /dev/null
+++ b/packages/SettingsLib/res/values-uz-rUZ/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Tekshirib chiqilmoqda…"</item>
+    <item msgid="8513729475867537913">"Ulanmoqda…"</item>
+    <item msgid="515055375277271756">"Tasdiqdan o‘tilmoqda…"</item>
+    <item msgid="1943354004029184381">"IP manzil o‘zlashtirilmoqda…"</item>
+    <item msgid="4221763391123233270">"Ulangan"</item>
+    <item msgid="624838831631122137">"Muzlatildi"</item>
+    <item msgid="7979680559596111948">"Uzilmoqda…"</item>
+    <item msgid="1634960474403853625">"Uzilgan"</item>
+    <item msgid="746097431216080650">"Muvaffaqiyatsiz"</item>
+    <item msgid="6367044185730295334">"To‘sib qo‘yilgan"</item>
+    <item msgid="503942654197908005">"Sifatsiz ulanishdan vaqtinchalik chetlashish"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Tekshirilmoqda…"</item>
+    <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> tarmog‘iga ulanilmoqda…"</item>
+    <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> bilan aloqa o‘rnatilyapti…"</item>
+    <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> IP manzil beryapti…"</item>
+    <item msgid="8937994881315223448">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> tarmog‘iga ulanildi"</item>
+    <item msgid="1330262655415760617">"Muzlatildi"</item>
+    <item msgid="7698638434317271902">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> tarmog‘idan uzilmoqda…"</item>
+    <item msgid="197508606402264311">"Uzildi"</item>
+    <item msgid="8578370891960825148">"Muvaffaqiyatsiz"</item>
+    <item msgid="5660739516542454527">"To‘sib qo‘yilgan"</item>
+    <item msgid="1805837518286731242">"Sifatsiz ulanishdan vaqtinchalik chetlashish"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-uz-rUZ/strings.xml b/packages/SettingsLib/res/values-uz-rUZ/strings.xml
new file mode 100644
index 0000000..ba33886
--- /dev/null
+++ b/packages/SettingsLib/res/values-uz-rUZ/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Tarmoqlarni tekshirib chiqishni iloji bo‘lmadi"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Yo‘q"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Saqlandi"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"O‘chiq"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP manzilini sozlab bo‘lmadi"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Wi-Fi ulanishini o‘rnatib bo‘lmadi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Tasdiqdan o‘tishda muammo"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Aloqada emas"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Internetga ulanish aniqlanmadi, avtomatik ravishda qayta ulana olmaydi."</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> tomonidan saqlangan"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Wi‑Fi yordamchisi orqali ulangan"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"%1$s orqali ulangan"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"%1$s orqali ishlaydi"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Ulangan, lekin internet aloqasi yo‘q"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Uzildi"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Uzilyapti…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Ulanmoqda…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Ulandi"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Biriktirilmoqda"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ulandi (telefondan tashqari)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ulanildi (mediadan tashqari)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Ulangan (xabarlarga kirib bo‘lmaydi)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ulangan (telefon yoki media qurilma emas)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Media audio"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Telefon audiosi"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Fayl o‘tkazish"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Kiritish qurilmasi"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Internetga kirish"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Kontaktlarni ulashish"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Kontaktlarni ulashish uchun ishlatilsin"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet aloqasi ulashmasi"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Xabarga kirish"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-kartaga kirish"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Audio qurilmasiga ulangan"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon karnayiga ulanildi"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Fayl almashinish serveriga ulanildi"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Xaritaga ulangan"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Ulanish nuqtasiga ulandi"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Fayl uzatish serveriga ulanmagan"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Kiritish qurilmasiga ulanildi"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Internet manbai qurilmasiga ulanildi"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Qurilmaga mahaliy internet aloqani tarqatish"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Internet manbai sifatida foydalanish"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Xaritada foydalanish"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"SIM-kartaga kirish uchun foydalanish"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Audio qurilma uchun foydalanish"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Dok’dan karnay sifatida foydalanish"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Fayl almashinish uchun foydalanish"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Kiritish qurilmasi sifatida foydalanish"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Biriktirish"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ULANISH"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Bekor qilish"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Agar ulanishga ruxsat bersangiz, ulangan vaqtda kontakt va qo‘ng‘iroqlaringiz tarixiga kirishi mumkin."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> bilan biriktirib bo‘lmadi."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasiga ulanib bo‘lmadi, chunki PIN-kod yoki parol noto‘g‘ri kiritildi."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Quyidagi qurilma javob bermayapti: <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> biriktirish so‘rovini rad qildi."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi o‘chiq."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi o‘chirilgan."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi: bitta ustun"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi: ikkita ustun"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi: uchta ustun"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi: signal to‘liq"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-vi/arrays.xml b/packages/SettingsLib/res/values-vi/arrays.xml
new file mode 100644
index 0000000..26d32a9
--- /dev/null
+++ b/packages/SettingsLib/res/values-vi/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Đang quét…"</item>
+    <item msgid="8513729475867537913">"Đang kết nối…"</item>
+    <item msgid="515055375277271756">"Đang xác thực…"</item>
+    <item msgid="1943354004029184381">"Đang lấy địa chỉ IP…"</item>
+    <item msgid="4221763391123233270">"Đã kết nối"</item>
+    <item msgid="624838831631122137">"Bị tạm ngưng"</item>
+    <item msgid="7979680559596111948">"Đang ngắt kết nối…"</item>
+    <item msgid="1634960474403853625">"Đã ngắt kết nối"</item>
+    <item msgid="746097431216080650">"Không thành công"</item>
+    <item msgid="6367044185730295334">"Bị chặn"</item>
+    <item msgid="503942654197908005">"Tạm thời tránh kết nối kém"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Đang quét…"</item>
+    <item msgid="355508996603873860">"Đang kết nối tới <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="554971459996405634">"Đang xác thực với <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="7928343808033020343">"Đang lấy địa chỉ IP từ <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="8937994881315223448">"Đã kết nối tới <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Bị tạm ngưng"</item>
+    <item msgid="7698638434317271902">"Đăng ngắt kết nối khỏi <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Đã ngắt kết nối"</item>
+    <item msgid="8578370891960825148">"Không thành công"</item>
+    <item msgid="5660739516542454527">"Bị chặn"</item>
+    <item msgid="1805837518286731242">"Tạm thời tránh kết nối kém"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-vi/cm_strings.xml b/packages/SettingsLib/res/values-vi/cm_strings.xml
new file mode 100644
index 0000000..a152e18
--- /dev/null
+++ b/packages/SettingsLib/res/values-vi/cm_strings.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/*
+**
+** Copyright 2015 The CyanogenMod 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.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="profile_applist_title">Ứ.dụng</string>
+  <string name="picker_activities">Hoạt động</string>
+  <string name="select_custom_app_title">Chọn ứng dụng tuỳ chỉnh</string>
+  <string name="select_custom_activity_title">Chọn hoạt động tuỳ chỉnh</string>
+  <string name="lockscreen_targets_message">Lối tắt màn hình khóa</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml
new file mode 100644
index 0000000..01236b0
--- /dev/null
+++ b/packages/SettingsLib/res/values-vi/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Không thể dò tìm mạng"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Không"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Đã lưu"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Đã tắt"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Lỗi cấu hình IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Lỗi kết nối WiFi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Sự cố xác thực"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ngoài vùng phủ sóng"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Không phát hiện thấy truy cập Internet nào, mạng sẽ không được tự động kết nối lại."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Được lưu bởi <xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Được kết nối qua trình hỗ trợ Wi‑Fi"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Được kết nối qua %1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Có sẵn qua %1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Đã kết nối, không có Internet"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Đã ngắt kết nối"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Đang ngắt kết nối…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Đang kết nối…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Đã kết nối"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Đang ghép nối…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Đã kết nối (không có điện thoại)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Đã kết nối (không có phương tiện)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Đã kết nối (không truy cập tin nhắn)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Đã k.nối (kg có ĐT hoặc p.tiện nào)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Âm thanh của phương tiện"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Âm thanh điện thoại"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Chuyển tệp"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Thiết bị đầu vào"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Truy cập Internet"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Chia sẻ liên hệ"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Sử dụng để chia sẻ liên hệ"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Chia sẻ kết nối internet"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Truy cập tin nhắn"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Quyền truy cập SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Đã kết nối với âm thanh phương tiện"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Đã kết nối với âm thanh điện thoại"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Đã kết nối với máy chủ chuyển tệp"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Đã kết nối với bản đồ"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Được kết nối với SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Chưa kết nối với máy chủ chuyển tệp"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Đã kết nối với thiết bị nhập"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Đã kết nối với thiết bị"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Chia sẻ kết nối Internet"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sử dụng để truy cập Internet"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Sử dụng cho bản đồ"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Sử dụng để truy cập SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Sử dụng cho âm thanh phương tiện"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Sử dụng cho âm thanh điện thoại"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sử dụng để chuyển tệp"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Sử dụng để nhập"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Ghép nối"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"GHÉP NỐI"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Hủy"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Ghép nối giúp bạn có thể truy cập danh bạ và nhật ký cuộc gọi của mình khi được kết nối."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Không thể ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Không thể ghép nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g> do mã PIN hoặc mã xác nhận không đúng."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Không thể kết nối với <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ghép nối bị <xliff:g id="DEVICE_NAME">%1$s</xliff:g> từ chối."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Đã tắt Wi-Fi."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Đã ngắt kết nối Wi-Fi."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Tín hiệu Wi-Fi một vạch."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Tín hiệu Wi-Fi hai vạch."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Tín hiệu Wi-Fi ba vạch."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Tín hiệu Wi-Fi đủ."</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-zh-rCN/arrays.xml b/packages/SettingsLib/res/values-zh-rCN/arrays.xml
new file mode 100644
index 0000000..b7d99a1
--- /dev/null
+++ b/packages/SettingsLib/res/values-zh-rCN/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"正在扫描..."</item>
+    <item msgid="8513729475867537913">"正在连接..."</item>
+    <item msgid="515055375277271756">"正在进行身份验证..."</item>
+    <item msgid="1943354004029184381">"正在获取IP地址..."</item>
+    <item msgid="4221763391123233270">"已连接"</item>
+    <item msgid="624838831631122137">"已暂停"</item>
+    <item msgid="7979680559596111948">"正在断开连接..."</item>
+    <item msgid="1634960474403853625">"已断开连接"</item>
+    <item msgid="746097431216080650">"失败"</item>
+    <item msgid="6367044185730295334">"已停用"</item>
+    <item msgid="503942654197908005">"暂时关闭（网络状况不佳）"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"正在从<xliff:g id="NETWORK_NAME">%1$s</xliff:g>获取IP地址..."</item>
+    <item msgid="8937994881315223448">"已连接到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"已暂停"</item>
+    <item msgid="7698638434317271902">"正在断开与 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 的连接..."</item>
+    <item msgid="197508606402264311">"已断开连接"</item>
+    <item msgid="8578370891960825148">"失败"</item>
+    <item msgid="5660739516542454527">"已停用"</item>
+    <item msgid="1805837518286731242">"暂时关闭（网络状况不佳）"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml
new file mode 100644
index 0000000..6d1717f
--- /dev/null
+++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"无法扫描网络"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"无"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"已保存"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 配置失败"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WLAN 连接失败"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"身份验证出现问题"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"不在范围内"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"未检测到任何互联网连接，因此不会自动重新连接。"</string>
+    <string name="saved_network" msgid="4352716707126620811">"已通过<xliff:g id="NAME">%1$s</xliff:g>保存"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"已连接（通过 WLAN 助手）"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"已通过%1$s连接"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"可通过%1$s连接"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"已连接，但无法访问互联网"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"已断开连接"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在断开连接..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"正在连接..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"已连接"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"正在配对..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已连接（无手机）"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已连接（无媒体）"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已连接（无消息权限）"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已连接（没有手机或媒体信号）"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒体音频"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手机音频"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"文件传输"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"输入设备"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"互联网连接"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"共享联系人"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"用于共享联系人"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"共享互联网连接"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"消息权限"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM 卡存取权限"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已连接到媒体音频"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已连接到手机音频"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已连接到文件传输服务器"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已连接到地图"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"已连接到 SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未连接到文件传输服务器"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已连接到输入设备"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"经由其他设备连接到互联网"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"与其他设备共享该设备的互联网连接"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用于连接互联网"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"用于地图"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"用于存取 SIM 卡"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"用于媒体音频"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用于手机音频"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用于文件传输"</string>
+    <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_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">"PIN码或配对密钥不正确，无法与<xliff:g id="DEVICE_NAME">%1$s</xliff:g>配对。"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"无法与“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>”进行通信。"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 已拒绝配对。"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"WLAN 已关闭。"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"WLAN 连接已断开。"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"WLAN 信号强度为一格。"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"WLAN 信号强度为两格。"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"WLAN 信号强度为三格。"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"WLAN 信号满格。"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-zh-rHK/arrays.xml b/packages/SettingsLib/res/values-zh-rHK/arrays.xml
new file mode 100644
index 0000000..b8a1ebb
--- /dev/null
+++ b/packages/SettingsLib/res/values-zh-rHK/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"掃瞄中…"</item>
+    <item msgid="8513729475867537913">"正在連線..."</item>
+    <item msgid="515055375277271756">"正在驗證…"</item>
+    <item msgid="1943354004029184381">"正在取得 IP 位址…"</item>
+    <item msgid="4221763391123233270">"已連線"</item>
+    <item msgid="624838831631122137">"已暫停"</item>
+    <item msgid="7979680559596111948">"正在中斷連線…"</item>
+    <item msgid="1634960474403853625">"已中斷連線"</item>
+    <item msgid="746097431216080650">"失敗"</item>
+    <item msgid="6367044185730295334">"已封鎖"</item>
+    <item msgid="503942654197908005">"目前正暫時避開欠佳的連線"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"正在從 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
+    <item msgid="8937994881315223448">"已連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"已暫停"</item>
+    <item msgid="7698638434317271902">"正在中斷 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 連線…"</item>
+    <item msgid="197508606402264311">"已中斷連線"</item>
+    <item msgid="8578370891960825148">"失敗"</item>
+    <item msgid="5660739516542454527">"已封鎖"</item>
+    <item msgid="1805837518286731242">"目前正暫時避開欠佳的連線"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml
new file mode 100644
index 0000000..bea3e21
--- /dev/null
+++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"無法掃瞄網絡"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 設定失敗"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi 連線失敗"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"超出可用範圍"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"未能偵測到互聯網連線，因此不會自動重新連線。"</string>
+    <string name="saved_network" msgid="4352716707126620811">"<xliff:g id="NAME">%1$s</xliff:g> 的儲存"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"已透過 Wi-Fi 小幫手連線"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"已透過 %1$s 連線"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"可透過 %1$s 連線"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"已連線，沒有互聯網"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在中斷連線..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"正在連線..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"已連結"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"正在配對..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已連線（無手機）"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已連結 (無訊息存取權)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒體音效"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手機音效"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"檔案傳輸"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"輸入裝置"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"互聯網連線"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"聯絡人共用"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"用於聯絡人共用"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"互聯網連線分享"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"訊息存取權"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM 卡存取"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已連接媒體音頻裝置"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已連接手機耳機"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線至檔案傳輸伺服器"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已連結地圖"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"已連接 SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"未連線至檔案傳輸伺服器"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已連線至輸入裝置"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"已連線至裝置並取得互聯網連線"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"與裝置分享本地互聯網連線"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用於上網"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"用於地圖"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"用來存取 SIM 卡"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"用於媒體音效"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用於手機音效"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用於傳輸檔案"</string>
+    <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_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> 配對，因為 PIN 碼或密鑰不正確。"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 通訊。"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」拒絕配對要求。"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi 已關閉。"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi 連線已中斷。"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi 訊號一格。"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi 訊號兩格。"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi 訊號三格。"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi 訊號滿格。"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-zh-rTW/arrays.xml b/packages/SettingsLib/res/values-zh-rTW/arrays.xml
new file mode 100644
index 0000000..ac1a5ad
--- /dev/null
+++ b/packages/SettingsLib/res/values-zh-rTW/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"掃描中…"</item>
+    <item msgid="8513729475867537913">"連線中…"</item>
+    <item msgid="515055375277271756">"驗證中…"</item>
+    <item msgid="1943354004029184381">"正在取得 IP 位址…"</item>
+    <item msgid="4221763391123233270">"已連線"</item>
+    <item msgid="624838831631122137">"已暫停"</item>
+    <item msgid="7979680559596111948">"中斷連線中…"</item>
+    <item msgid="1634960474403853625">"已中斷連線"</item>
+    <item msgid="746097431216080650">"失敗"</item>
+    <item msgid="6367044185730295334">"已封鎖"</item>
+    <item msgid="503942654197908005">"目前正暫時避開品質不佳的連線"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <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="7928343808033020343">"正在由 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 取得 IP 位址…"</item>
+    <item msgid="8937994881315223448">"已連線到 <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"已暫停"</item>
+    <item msgid="7698638434317271902">"正在中斷 <xliff:g id="NETWORK_NAME">%1$s</xliff:g> 連線…"</item>
+    <item msgid="197508606402264311">"已中斷連線"</item>
+    <item msgid="8578370891960825148">"失敗"</item>
+    <item msgid="5660739516542454527">"已封鎖"</item>
+    <item msgid="1805837518286731242">"目前正暫時避開品質不佳的連線"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..f9ed7ac
--- /dev/null
+++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"無法掃描網路"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"已儲存"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"已停用"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP 設定失敗"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi 連線失敗"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"驗證問題"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"不在有效範圍內"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"未偵測到可用的網際網路連線，系統無法為您自動重新連線。"</string>
+    <string name="saved_network" msgid="4352716707126620811">"由<xliff:g id="NAME">%1$s</xliff:g>儲存"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"已透過 Wi‑Fi 小幫手連線"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"已透過 %1$s 連線"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"可透過 %1$s 使用"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"已連線，沒有網際網路"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"已中斷連線"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"正在中斷連線…"</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"連線中…"</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"已連線"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"配對中…"</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"已連線 (無手機音訊)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"已連線 (無媒體音訊)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"已連線 (無訊息存取權)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"已連線 (無手機或媒體音訊)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"媒體音訊"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"手機音訊"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"檔案傳輸"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"輸入裝置"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"網際網路連線"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"聯絡人共用"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"用於聯絡人共用"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"網際網路連線分享"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"訊息存取權"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM 卡存取權"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"連接至媒體音訊"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"連接至電話音訊"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線到檔案傳輸伺服器"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"已連線至地圖"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"已連線到 SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"不要連線到檔案傳輸伺服器"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"已連線到輸入裝置"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"已連線至裝置並取得網際網路存取權"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"與裝置分享本地網際網路連線"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"用於網際網路連線"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"地圖使用偏好"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"用於 SIM 卡存取權"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"用於媒體音訊"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"用於電話音訊"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"用於傳輸檔案"</string>
+    <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_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> 配對，因為 PIN 或密碼金鑰不正確。"</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"無法與 <xliff:g id="DEVICE_NAME">%1$s</xliff:g> 通訊。"</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」拒絕配對要求。"</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"已關閉 Wi-Fi。"</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi 連線已中斷。"</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Wi-Fi 訊號強度一格。"</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Wi-Fi 訊號強度兩格。"</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Wi-Fi 訊號強度三格。"</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Wi-Fi 訊號強度滿格。"</string>
+</resources>
diff --git a/packages/SettingsLib/res/values-zu/arrays.xml b/packages/SettingsLib/res/values-zu/arrays.xml
new file mode 100644
index 0000000..3404563
--- /dev/null
+++ b/packages/SettingsLib/res/values-zu/arrays.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string-array name="wifi_status">
+    <item msgid="1922181315419294640"></item>
+    <item msgid="8934131797783724664">"Iyathwebula..."</item>
+    <item msgid="8513729475867537913">"Iyaxhuma kwi-inthanethi..."</item>
+    <item msgid="515055375277271756">"Iyaqinisekisa..."</item>
+    <item msgid="1943354004029184381">"Ithola ikheli le-IP..."</item>
+    <item msgid="4221763391123233270">"Ixhunyiwe kwi-inthanethi"</item>
+    <item msgid="624838831631122137">"Kumiswe okwesikhashana"</item>
+    <item msgid="7979680559596111948">"Inqamula uxhumano kwi-inthanethi..."</item>
+    <item msgid="1634960474403853625">"Ayixhunyiwe"</item>
+    <item msgid="746097431216080650">"Akuphumelelanga"</item>
+    <item msgid="6367044185730295334">"Uvinjelwe"</item>
+    <item msgid="503942654197908005">"Okwesikhashana ivikela ukuxhumana okungaqinile"</item>
+  </string-array>
+  <string-array name="wifi_status_with_ssid">
+    <item msgid="7714855332363650812"></item>
+    <item msgid="8878186979715711006">"Iyathwebula..."</item>
+    <item msgid="355508996603873860">"Ixhuma ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="554971459996405634">"Iqinisekisa nge <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="7928343808033020343">"Ithola ikheli le-IP kusuka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item>
+    <item msgid="8937994881315223448">"Ixhumeke ku-<xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item>
+    <item msgid="1330262655415760617">"Kumiswe okwesikhashana"</item>
+    <item msgid="7698638434317271902">"Inqamula kusuka <xliff:g id="NETWORK_NAME">%1$s</xliff:g>…"</item>
+    <item msgid="197508606402264311">"Ayixhunyiwe kwi-inthanethi"</item>
+    <item msgid="8578370891960825148">"Akuphumelelanga"</item>
+    <item msgid="5660739516542454527">"Uvinjelwe"</item>
+    <item msgid="1805837518286731242">"Okwesikhashana ivikela ukuxhumana okungaqinile"</item>
+  </string-array>
+</resources>
diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml
new file mode 100644
index 0000000..08d6506
--- /dev/null
+++ b/packages/SettingsLib/res/values-zu/strings.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+**
+** Copyright 2015 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.
+*/
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ayikwazi ukuhlola amanethiwekhi"</string>
+    <string name="wifi_security_none" msgid="7985461072596594400">"Lutho"</string>
+    <string name="wifi_remembered" msgid="4955746899347821096">"Kulondoloziwe"</string>
+    <string name="wifi_disabled_generic" msgid="4259794910584943386">"Akusebenzi"</string>
+    <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Ukwehluleka kokulungiswa kwe-IP"</string>
+    <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Ukwehlulekla koxhumo le-WiFi"</string>
+    <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Inkinga yokufakazela ubuqiniso"</string>
+    <string name="wifi_not_in_range" msgid="1136191511238508967">"Ayikho ebubanzini"</string>
+    <string name="wifi_no_internet" msgid="9151470775868728896">"Ukufinyeela okungekhona kwe-inthanethi kutholakele, ngeke kuxhumeke ngokuzenzakalelayo."</string>
+    <string name="saved_network" msgid="4352716707126620811">"Kulondolozwe ngu-<xliff:g id="NAME">%1$s</xliff:g>"</string>
+    <string name="connected_via_wfa" msgid="3805736726317410714">"Ixhunywe ngomsizi we-Wi-FI"</string>
+    <string name="connected_via_passpoint" msgid="2826205693803088747">"Kuxhumeke nge-%1$s"</string>
+    <string name="available_via_passpoint" msgid="1617440946846329613">"Iyatholakala nge-%1$s"</string>
+    <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Kuxhumekile, ayikho i-inthanethi"</string>
+    <string name="bluetooth_disconnected" msgid="6557104142667339895">"Ayixhunyiwe"</string>
+    <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Inqamula uxhumano kwi-inthanethi..."</string>
+    <string name="bluetooth_connecting" msgid="8555009514614320497">"Iyaxhuma..."</string>
+    <string name="bluetooth_connected" msgid="6038755206916626419">"Ixhunyiwe"</string>
+    <string name="bluetooth_pairing" msgid="1426882272690346242">"Iyabhangqa..."</string>
+    <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Ixhunyiwe (ayikho ifoni)"</string>
+    <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Ixhunyiwe (ayikho imidiya)"</string>
+    <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Kuxhunyiwe (akukho ukufinyelela umlayezo)"</string>
+    <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Ixhunyiwe (ayikho ifoni noma imidiya)"</string>
+    <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Umsindo wemidiya"</string>
+    <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Umsindo wefoni"</string>
+    <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Dlulisa ifayela"</string>
+    <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Idivaysi yokufakwayo"</string>
+    <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Ukufinyelela i-Inthanethi"</string>
+    <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Ukwabelana kokuxhumana"</string>
+    <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Sebenzisela ukwabelana kokuxhumana"</string>
+    <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ukwabelana ngoxhumano lwe-Inthanethi"</string>
+    <string name="bluetooth_profile_map" msgid="5465271250454324383">"Ukufinyelela umlayezo"</string>
+    <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Ukufinyelela kwe-SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ixhume emsindweni wemidiya"</string>
+    <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ixhunywe kumsindo wefoni"</string>
+    <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ixhunywe kwiseva yokudlulisa ifayela"</string>
+    <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Ixhumeke kumephu"</string>
+    <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Kuxhumeke ku-SAP"</string>
+    <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Ayixhunyiwe kwiseva sokudlulisa ifayela"</string>
+    <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Ixhunywe kwidivaysi yokufakwayo"</string>
+    <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Ixhunyiwe kwidivaysi yokufinyelela kwi-Inthanethi"</string>
+    <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Yabelana noxhumano lwe-Inthanethi kanye nedivaysi"</string>
+    <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Sebenzisa ukufinyelela i-Inthanethi"</string>
+    <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Sebenzisela imephu"</string>
+    <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Ukusebenzisa kokufinyelela kwe-SIM"</string>
+    <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Sebenzisela umsindo wemidiya"</string>
+    <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Sebenziselwa umsindo wefoni"</string>
+    <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Sebenziselwa ukudlulisa ifayela"</string>
+    <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Isetshenziselwa okufakwayo"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Bhangqa"</string>
+    <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"BHANQA"</string>
+    <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Khansela"</string>
+    <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Ukubhanqa kunika ukufinyelela koxhumana nabo nomlando wekholi uma uxhumekile."</string>
+    <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Ayikwazanga ukuhlangana ne <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"Ayikwazanga ukumataniswa ne <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ngenxa ye-PIN noma isihluthulelo sokungena okungafanele."</string>
+    <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ayaikwazi ukuxhumana ne- <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ukubhangqa kunqatshelwe i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="accessibility_wifi_off" msgid="1166761729660614716">"I-Wifi ivaliwe."</string>
+    <string name="accessibility_no_wifi" msgid="8834610636137374508">"I-Wifi inqanyuliwe."</string>
+    <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Ibha elilodwa le-Wifi."</string>
+    <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Amabha amabili we-Wifi."</string>
+    <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Amabha amathathu we-Wifi."</string>
+    <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Isiginali ye-Wifi igcwele."</string>
+</resources>
diff --git a/packages/SettingsLib/res/xml/timezones.xml b/packages/SettingsLib/res/xml/timezones.xml
index 4426495..147f263 100644
--- a/packages/SettingsLib/res/xml/timezones.xml
+++ b/packages/SettingsLib/res/xml/timezones.xml
@@ -47,6 +47,7 @@
     <timezone id="Africa/Harare"></timezone>
     <timezone id="Asia/Baghdad"></timezone>
     <timezone id="Europe/Moscow"></timezone>
+    <timezone id="Europe/Kiev" localizeInPicker="false"></timezone>
     <timezone id="Asia/Kuwait"></timezone>
     <timezone id="Africa/Nairobi"></timezone>
     <timezone id="Asia/Tehran"></timezone>
diff --git a/packages/SettingsLib/src/com/android/settingslib/cm/ShortcutPickHelper.java b/packages/SettingsLib/src/com/android/settingslib/cm/ShortcutPickHelper.java
index a18a7e9..8aa5671 100644
--- a/packages/SettingsLib/src/com/android/settingslib/cm/ShortcutPickHelper.java
+++ b/packages/SettingsLib/src/com/android/settingslib/cm/ShortcutPickHelper.java
@@ -83,6 +83,11 @@ public class ShortcutPickHelper {
     }
 
     public void pickShortcut(String[] names, ShortcutIconResource[] icons, int fragmentId) {
+        pickShortcut(names, icons, fragmentId, true);
+    }
+
+    public void pickShortcut(String[] names, ShortcutIconResource[] icons, int fragmentId,
+            boolean showActivityPicker) {
         Bundle bundle = new Bundle();
 
         ArrayList<String> shortcutNames = new ArrayList<String>();
@@ -92,7 +97,9 @@ public class ShortcutPickHelper {
             }
         }
         shortcutNames.add(mParent.getString(R.string.profile_applist_title));
-        shortcutNames.add(mParent.getString(R.string.picker_activities));
+        if (showActivityPicker) {
+            shortcutNames.add(mParent.getString(R.string.picker_activities));
+        }
         bundle.putStringArrayList(Intent.EXTRA_SHORTCUT_NAME, shortcutNames);
 
         ArrayList<ShortcutIconResource> shortcutIcons = new ArrayList<ShortcutIconResource>();
@@ -102,7 +109,10 @@ public class ShortcutPickHelper {
             }
         }
         shortcutIcons.add(ShortcutIconResource.fromContext(mParent, android.R.drawable.sym_def_app_icon));
-        shortcutIcons.add(ShortcutIconResource.fromContext(mParent, R.drawable.activities_icon));
+        if (showActivityPicker) {
+            shortcutIcons.add(
+                    ShortcutIconResource.fromContext(mParent, R.drawable.activities_icon));
+        }
         bundle.putParcelableArrayList(Intent.EXTRA_SHORTCUT_ICON_RESOURCE, shortcutIcons);
 
         Intent pickIntent = new Intent(Intent.ACTION_PICK_ACTIVITY);
diff --git a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
index 7b5bfb5..d4e09ca 100644
--- a/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
+++ b/packages/SettingsLib/src/com/android/settingslib/datetime/ZoneGetter.java
@@ -50,7 +50,8 @@ public class ZoneGetter {
     public static final String KEY_DISPLAYNAME = "name";  // value: String
     public static final String KEY_GMT = "gmt";  // value: String
     public static final String KEY_OFFSET = "offset";  // value: int (Integer)
-
+    private static final String XML_ATTR_ID = "id";
+    private static final String XML_ATTR_LOCALIZE_IN_PICKER = "localizeInPicker";
     private ZoneGetter() {}
 
     public static String getTimeZoneOffsetAndName(TimeZone tz, Date now) {
@@ -85,7 +86,7 @@ public class ZoneGetter {
         // selecting the wrong olson ids.
 
         // Get the list of olson ids to display to the user.
-        List<String> olsonIdsToDisplay = readTimezonesToDisplay(context);
+        List<ZoneInfo> olsonIdsToDisplay = readTimezonesToDisplay(context);
 
         // Create a lookup of local zone IDs.
         Set<String> localZoneIds = new TreeSet<String>();
@@ -97,9 +98,9 @@ public class ZoneGetter {
         // be ambiguous.
         Set<String> localZoneNames = new TreeSet<String>();
         boolean localLongNamesAreAmbiguous = false;
-        for (String olsonId : olsonIdsToDisplay) {
-            if (localZoneIds.contains(olsonId)) {
-                TimeZone tz = TimeZone.getTimeZone(olsonId);
+        for (ZoneInfo zoneInfo : olsonIdsToDisplay) {
+            if (localZoneIds.contains(zoneInfo.mOlsonId) && zoneInfo.mLocalizeInPicker) {
+                TimeZone tz = TimeZone.getTimeZone(zoneInfo.mOlsonId);
                 String zoneLongName = getZoneLongName(locale, tz, now);
                 boolean longNameIsUnique = localZoneNames.add(zoneLongName);
                 if (!longNameIsUnique) {
@@ -111,12 +112,13 @@ public class ZoneGetter {
 
         // Generate the list of zone entries to return.
         List<Map<String, Object>> zones = new ArrayList<Map<String, Object>>();
-        for (String olsonId : olsonIdsToDisplay) {
-            final TimeZone tz = TimeZone.getTimeZone(olsonId);
+        for (ZoneInfo zoneInfo: olsonIdsToDisplay) {
+            final TimeZone tz = TimeZone.getTimeZone(zoneInfo.mOlsonId);
             // Exemplar location display is the default. The only time we intend to display the long
             // name is when the olsonId is local AND long names are not ambiguous.
-            boolean isLocalZoneId = localZoneIds.contains(olsonId);
-            boolean preferLongName = isLocalZoneId && !localLongNamesAreAmbiguous;
+            boolean isLocalZoneId = localZoneIds.contains(zoneInfo.mOlsonId);
+            boolean preferLongName = isLocalZoneId && !localLongNamesAreAmbiguous
+                    && zoneInfo.mLocalizeInPicker;
             String displayName = getZoneDisplayName(locale, tz, now, preferLongName);
 
             String gmtOffsetString = getGmtOffsetString(locale, tz, now);
@@ -162,8 +164,8 @@ public class ZoneGetter {
         return TimeZoneNames.getExemplarLocation(locale.toString(), tz.getID());
     }
 
-    private static List<String> readTimezonesToDisplay(Context context) {
-        List<String> olsonIds = new ArrayList<String>();
+    private static List<ZoneInfo> readTimezonesToDisplay(Context context) {
+        List<ZoneInfo> olsonIds = new ArrayList<>();
         try (XmlResourceParser xrp = context.getResources().getXml(R.xml.timezones)) {
             while (xrp.next() != XmlResourceParser.START_TAG) {
                 continue;
@@ -177,8 +179,10 @@ public class ZoneGetter {
                     xrp.next();
                 }
                 if (xrp.getName().equals(XMLTAG_TIMEZONE)) {
-                    String olsonId = xrp.getAttributeValue(0);
-                    olsonIds.add(olsonId);
+                    String olsonId = xrp.getAttributeValue(null, XML_ATTR_ID);
+                    boolean localize = xrp.getAttributeBooleanValue(null,
+                            XML_ATTR_LOCALIZE_IN_PICKER, true);
+                    olsonIds.add(new ZoneInfo(olsonId, localize));
                 }
                 while (xrp.getEventType() != XmlResourceParser.END_TAG) {
                     xrp.next();
@@ -212,4 +216,19 @@ public class ZoneGetter {
                 isRtl ? TextDirectionHeuristics.RTL : TextDirectionHeuristics.LTR);
         return gmtString;
     }
+
+    private static class ZoneInfo {
+        String mOlsonId;
+        boolean mLocalizeInPicker;
+
+        public ZoneInfo(String olsonId) {
+            mOlsonId = olsonId;
+            mLocalizeInPicker = false;
+        }
+
+        public ZoneInfo(String olsonId, boolean localizeInPicker) {
+            mOlsonId = olsonId;
+            mLocalizeInPicker = localizeInPicker;
+        }
+    }
 }
diff --git a/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java b/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java
index 224b967..517075d 100644
--- a/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java
+++ b/packages/SettingsLib/src/com/android/settingslib/net/UidDetailProvider.java
@@ -166,13 +166,16 @@ public class UidDetailProvider {
                     final ApplicationInfo appInfo = ipm.getApplicationInfo(packageName,
                             0 /* no flags */, userId);
 
-                    if (appInfo != null) {
+                    if (appInfo != null && packageInfo != null) {
                         detail.detailLabels[i] = appInfo.loadLabel(pm).toString();
                         detail.detailContentDescriptions[i] = um.getBadgedLabelForUser(
                                 detail.detailLabels[i], userHandle);
                         if (packageInfo.sharedUserLabel != 0) {
-                            detail.label = pm.getText(packageName, packageInfo.sharedUserLabel,
-                                    packageInfo.applicationInfo).toString();
+                            CharSequence label = pm.getText(packageName,
+                                    packageInfo.sharedUserLabel, packageInfo.applicationInfo);
+                            if (label != null) {
+                                detail.label = label.toString();
+                            }
                             detail.icon = um.getBadgedIconForUser(appInfo.loadIcon(pm), userHandle);
                         }
                     }
diff --git a/packages/SettingsProvider/res/values-as-rIN/strings.xml b/packages/SettingsProvider/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-as-rIN/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-ast-rES/strings.xml b/packages/SettingsProvider/res/values-ast-rES/strings.xml
index e4b0106..fa15ee4 100644
--- a/packages/SettingsProvider/res/values-ast-rES/strings.xml
+++ b/packages/SettingsProvider/res/values-ast-rES/strings.xml
@@ -18,5 +18,6 @@
  */
 -->
 <resources>
+  <!-- Name of the activity for Settings storage. -->
   <string name="app_label">Axustes d\'almacenamientu</string>
 </resources>
diff --git a/packages/SettingsProvider/res/values-be/strings.xml b/packages/SettingsProvider/res/values-be/strings.xml
index 2c3d4d7..d25ca6e 100644
--- a/packages/SettingsProvider/res/values-be/strings.xml
+++ b/packages/SettingsProvider/res/values-be/strings.xml
@@ -18,5 +18,6 @@
  */
 -->
 <resources>
+  <!-- Name of the activity for Settings storage. -->
   <string name="app_label">Захоўванне налад</string>
 </resources>
diff --git a/packages/SettingsProvider/res/values-br-rFR/strings.xml b/packages/SettingsProvider/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-br-rFR/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-bs-rBA/strings.xml b/packages/SettingsProvider/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-bs-rBA/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-csb-rPL/strings.xml b/packages/SettingsProvider/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-csb-rPL/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-cy/strings.xml b/packages/SettingsProvider/res/values-cy/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-cy/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-en-rPT/strings.xml b/packages/SettingsProvider/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-en-rPT/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-eo/strings.xml b/packages/SettingsProvider/res/values-eo/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-eo/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-es-rCO/strings.xml b/packages/SettingsProvider/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-es-rCO/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-es-rMX/strings.xml b/packages/SettingsProvider/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-es-rMX/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-frp-rIT/strings.xml b/packages/SettingsProvider/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-frp-rIT/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-fy-rNL/strings.xml b/packages/SettingsProvider/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-fy-rNL/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-ga-rIE/strings.xml b/packages/SettingsProvider/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-ga-rIE/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-gd-rGB/strings.xml b/packages/SettingsProvider/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-gd-rGB/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-gu-rIN/strings.xml b/packages/SettingsProvider/res/values-gu-rIN/strings.xml
new file mode 100644
index 0000000..7241974
--- /dev/null
+++ b/packages/SettingsProvider/res/values-gu-rIN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/**
+ * Copyright (c) 2007, 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.
+ */
+ -->
+
+<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>
+</resources>
diff --git a/packages/SettingsProvider/res/values-ku/strings.xml b/packages/SettingsProvider/res/values-ku/strings.xml
index 097b8b7..9ae7925 100644
--- a/packages/SettingsProvider/res/values-ku/strings.xml
+++ b/packages/SettingsProvider/res/values-ku/strings.xml
@@ -18,5 +18,6 @@
  */
 -->
 <resources>
+  <!-- Name of the activity for Settings storage. -->
   <string name="app_label">ڕێکخستنی بیرگە</string>
 </resources>
diff --git a/packages/SettingsProvider/res/values-lb/strings.xml b/packages/SettingsProvider/res/values-lb/strings.xml
index c55b311..b553066 100644
--- a/packages/SettingsProvider/res/values-lb/strings.xml
+++ b/packages/SettingsProvider/res/values-lb/strings.xml
@@ -18,5 +18,6 @@
  */
 -->
 <resources>
+  <!-- Name of the activity for Settings storage. -->
   <string name="app_label">Astellungsspäicher</string>
 </resources>
diff --git a/packages/SettingsProvider/res/values-oc-rFR/strings.xml b/packages/SettingsProvider/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-oc-rFR/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-or-rIN/strings.xml b/packages/SettingsProvider/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..ce94a95
--- /dev/null
+++ b/packages/SettingsProvider/res/values-or-rIN/strings.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2007, 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.
+ */
+-->
+<resources>
+  <!-- Name of the activity for Settings storage. -->
+</resources>
diff --git a/packages/SettingsProvider/res/values-pt-rBR/strings.xml b/packages/SettingsProvider/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..ade1746
--- /dev/null
+++ b/packages/SettingsProvider/res/values-pt-rBR/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/**
+ * Copyright (c) 2007, 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.
+ */
+ -->
+
+<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">"Armazenamento de configurações"</string>
+</resources>
diff --git a/packages/SettingsProvider/res/values-pt-rPT/strings.xml b/packages/SettingsProvider/res/values-pt-rPT/strings.xml
index 6bd62e3..c7dc9e6 100644
--- a/packages/SettingsProvider/res/values-pt-rPT/strings.xml
+++ b/packages/SettingsProvider/res/values-pt-rPT/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">"Armazenamento de Definições"</string>
+    <string name="app_label" msgid="4567566098528588863">"Armazenamento de definições"</string>
 </resources>
diff --git a/packages/SettingsProvider/res/values-sq-rAL/strings.xml b/packages/SettingsProvider/res/values-sq-rAL/strings.xml
new file mode 100644
index 0000000..a8e66d5
--- /dev/null
+++ b/packages/SettingsProvider/res/values-sq-rAL/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/**
+ * Copyright (c) 2007, 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.
+ */
+ -->
+
+<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">"Hapësira ruajtëse e \"Cilësimeve\""</string>
+</resources>
diff --git a/packages/SettingsProvider/res/values-ug/strings.xml b/packages/SettingsProvider/res/values-ug/strings.xml
index 28b9541..e5a1177 100644
--- a/packages/SettingsProvider/res/values-ug/strings.xml
+++ b/packages/SettingsProvider/res/values-ug/strings.xml
@@ -18,5 +18,6 @@
  */
 -->
 <resources>
+  <!-- Name of the activity for Settings storage. -->
   <string name="app_label">ساقلىغۇچ تەڭشىكى</string>
 </resources>
diff --git a/packages/SettingsProvider/res/values-vi/strings.xml b/packages/SettingsProvider/res/values-vi/strings.xml
index 504479d..015fbfd 100644
--- a/packages/SettingsProvider/res/values-vi/strings.xml
+++ b/packages/SettingsProvider/res/values-vi/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">"Lưu trữ cài đặt"</string>
+    <string name="app_label" msgid="4567566098528588863">"Lưu trữ bộ nhớ"</string>
 </resources>
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml
index d9402fc..a3a5aaa 100644
--- a/packages/SettingsProvider/res/values/defaults.xml
+++ b/packages/SettingsProvider/res/values/defaults.xml
@@ -87,6 +87,7 @@
     <string name="def_unlock_sound" translatable="false">/system/media/audio/ui/Unlock.ogg</string>
     <string name="def_trusted_sound" translatable="false">/system/media/audio/ui/Trusted.ogg</string>
     <string name="def_wireless_charging_started_sound" translatable="false">/system/media/audio/ui/WirelessChargingStarted.ogg</string>
+    <bool name="def_volume_adjust_sounds_enabled">true</bool>
 
     <bool name="def_lockscreen_disabled">false</bool>
     <bool name="def_device_provisioned">false</bool>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 858baa5..68fde92 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -44,6 +44,12 @@ import android.provider.Settings.Secure;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.Log;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.content.res.AssetManager;
+import android.util.DisplayMetrics;
+import android.content.pm.PackageManager.NameNotFoundException;
+
 
 import com.android.ims.ImsConfig;
 import com.android.internal.content.PackageHelper;
@@ -102,6 +108,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
     private static final String TABLE_SYSTEM = "system";
     private static final String TABLE_SECURE = "secure";
     private static final String TABLE_GLOBAL = "global";
+    private String mPublicSrcDir;
 
     static {
         mValidTables.add(TABLE_SYSTEM);
@@ -133,6 +140,13 @@ class DatabaseHelper extends SQLiteOpenHelper {
         super(context, dbNameForUser(userHandle), null, DATABASE_VERSION);
         mContext = context;
         mUserHandle = userHandle;
+        try {
+            String packageName = mContext.getPackageName();
+            mPublicSrcDir = mContext.getPackageManager().getApplicationInfo(packageName, 0)
+                    .publicSourceDir;
+        } catch (NameNotFoundException e) {
+            e.printStackTrace();
+        }
     }
 
     public static boolean isValidTable(String name) {
@@ -2070,7 +2084,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
             }
 
             String[] systemToSecure = new String[] {
-                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR,
+                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR,
                     CMSettings.Secure.KEYBOARD_BRIGHTNESS,
                     CMSettings.Secure.BUTTON_BRIGHTNESS,
                     CMSettings.Secure.BUTTON_BACKLIGHT_TIMEOUT
@@ -2247,7 +2261,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
                 try {
                     LockPatternUtils lpu = new LockPatternUtils(mContext);
                     List<LockPatternView.Cell> cellPattern =
-                            LockPatternUtils.stringToPattern(lockPattern, lpu.getLockPatternSize());
+                            LockPatternUtils.stringToPattern(lockPattern, lpu.getLockPatternSize(mUserHandle));
                     lpu.saveLockPattern(cellPattern, null, UserHandle.USER_OWNER);
                 } catch (IllegalArgumentException e) {
                     // Don't want corrupted lock pattern to hang the reboot process
@@ -2617,6 +2631,8 @@ class DatabaseHelper extends SQLiteOpenHelper {
                 R.bool.def_sound_effects_enabled);
         loadBooleanSetting(stmt, Settings.System.HAPTIC_FEEDBACK_ENABLED,
                 R.bool.def_haptic_feedback);
+        loadBooleanSetting(stmt, CMSettings.System.VOLUME_ADJUST_SOUNDS_ENABLED,
+                R.bool.def_volume_adjust_sounds_enabled);
 
         loadIntegerSetting(stmt, Settings.System.LOCKSCREEN_SOUNDS_ENABLED,
             R.integer.def_lockscreen_sounds_enabled);
@@ -2838,7 +2854,7 @@ class DatabaseHelper extends SQLiteOpenHelper {
                     RILConstants.CDMA_CELL_BROADCAST_SMS_DISABLED);
 
             // Data roaming default, based on build
-            loadBooleanSetting(stmt, Settings.Global.DATA_ROAMING,
+            loadRegionLockedBooleanSetting(stmt, Settings.Global.DATA_ROAMING,
                     R.bool.def_enable_data_roaming);
 
             loadBooleanSetting(stmt, Settings.Global.DEVICE_PROVISIONED,
@@ -2859,20 +2875,10 @@ class DatabaseHelper extends SQLiteOpenHelper {
             }
 
             // Mobile Data default, based on build
-            loadBooleanSetting(stmt, Settings.Global.MOBILE_DATA,
+            loadRegionLockedBooleanSetting(stmt, Settings.Global.MOBILE_DATA,
                     R.bool.def_enable_mobile_data);
 
             int phoneCount = TelephonyManager.getDefault().getPhoneCount();
-            // SUB specific flags for Multisim devices
-            for (int phoneId = 0; phoneId < MAX_PHONE_COUNT; phoneId++) {
-                // Mobile Data default, based on build
-                loadBooleanSetting(stmt, Settings.Global.MOBILE_DATA + phoneId,
-                        R.bool.def_enable_mobile_data);
-
-                // Data roaming default, based on build
-                loadBooleanSetting(stmt, Settings.Global.DATA_ROAMING + phoneId,
-                        R.bool.def_enable_data_roaming);
-            }
 
             loadBooleanSetting(stmt, Settings.Global.NETSTATS_ENABLED,
                     R.bool.def_netstats_enabled);
@@ -2997,6 +3003,36 @@ class DatabaseHelper extends SQLiteOpenHelper {
         stmt.execute();
     }
 
+    private Resources getRegionLockedResources() {
+        Configuration tempConfiguration = new Configuration();
+        String mcc = SystemProperties.get("ro.prebundled.mcc");
+        Resources customResources = null;
+        if (!TextUtils.isEmpty(mcc)) {
+            tempConfiguration.mcc = Integer.parseInt(mcc);
+            AssetManager assetManager = new AssetManager();
+            assetManager.addAssetPath(mPublicSrcDir);
+            customResources = new Resources(assetManager, new DisplayMetrics(),
+                    tempConfiguration);
+        }
+
+        return customResources;
+    }
+
+    private void loadRegionLockedStringSetting(SQLiteStatement stmt, String key, int resid) {
+        Resources customResources = getRegionLockedResources();
+        loadSetting(stmt, key, customResources == null ? mContext.getResources().getString(resid)
+                : customResources.getString(resid));
+    }
+
+    private void loadRegionLockedBooleanSetting(SQLiteStatement stmt, String key, int resId) {
+        Resources customResources = getRegionLockedResources();
+        if (customResources == null) {
+            customResources = mContext.getResources();
+        }
+
+        loadSetting(stmt, key, customResources.getBoolean(resId) ? "1" : "0");
+    }
+
     private void loadStringSetting(SQLiteStatement stmt, String key, int resid) {
         loadSetting(stmt, key, mContext.getResources().getString(resid));
     }
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 5c871ca..c075e0b 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -2023,6 +2023,7 @@ public class SettingsProvider extends ContentProvider {
                 if ((oldVersion == newVersion || oldVersion == CM_SETTINGS_DB_VERSION)) {
                     if (oldVersion == CM_SETTINGS_DB_VERSION && !hasReplayedDefaultsFromL()) {
                         forceReplayAOSPDefaults(mUserId);
+                        forceMigrateProfilesEnabled(mUserId);
                         setDefaultsReplayedFromLFlag();
                     }
                     return;
@@ -2221,6 +2222,23 @@ public class SettingsProvider extends ContentProvider {
                 }
             }
 
+            private void forceMigrateProfilesEnabled(int userId) {
+                final SettingsState systemSettings = getSystemSettingsLocked(userId);
+                final Setting settingLocked = systemSettings.getSettingLocked(
+                        CMSettings.System.SYSTEM_PROFILES_ENABLED);
+                if (settingLocked != null) {
+                    final String value = settingLocked.getValue();
+                    if (value != null) {
+                        CMSettings.System.putStringForUser(getContext().getContentResolver(),
+                                CMSettings.System.SYSTEM_PROFILES_ENABLED,
+                                value,
+                                userId);
+                        systemSettings.deleteSettingLocked(
+                                CMSettings.System.SYSTEM_PROFILES_ENABLED);
+                    }
+                }
+            }
+
         }
     }
 }
diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index 3c90414..61504b3 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -91,7 +91,7 @@
     <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS" />
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL" />
-    <uses-permission android:name="android.permission.MANAGE_USERS" />
+    <uses-permission android:name="android.permission.CREATE_USERS" />
     <uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
     <uses-permission android:name="android.permission.BLUETOOTH_STACK" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
diff --git a/packages/Shell/res/values-as-rIN/strings.xml b/packages/Shell/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-as-rIN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-ast-rES/strings.xml b/packages/Shell/res/values-ast-rES/strings.xml
index 0590fbb..829ce93 100644
--- a/packages/Shell/res/values-ast-rES/strings.xml
+++ b/packages/Shell/res/values-ast-rES/strings.xml
@@ -16,9 +16,16 @@
 -->
 <resources>
   <string name="app_label">Shell</string>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
   <string name="bugreport_finished_title">Informe de fallu capturáu</string>
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
   <string name="bugreport_finished_text" product="watch">Esliza a esquierda pa compartir l\'informe de fallu</string>
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
   <string name="bugreport_finished_text" product="default">Toca pa compartir l\'informe de fallu</string>
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
   <string name="bugreport_confirm">Los informes de fallos contienen datos de los distintos ficheros de rexistru del sistema, incluyida información personal y privada. Comparte los informes de fallos namái con aplicaciones y usuarios nos que confíes.</string>
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
   <string name="bugreport_confirm_repeat">Amosar esti mensaxe la próxima vegada</string>
+  <!-- Title for documents backend that offers bugreports. -->
+  <string name="bugreport_storage_title">Informes de fallu</string>
 </resources>
diff --git a/packages/Shell/res/values-az-rAZ/strings.xml b/packages/Shell/res/values-az-rAZ/strings.xml
index da08e38..e235eb8 100644
--- a/packages/Shell/res/values-az-rAZ/strings.xml
+++ b/packages/Shell/res/values-az-rAZ/strings.xml
@@ -18,7 +18,9 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="3701846017049540910">"Shell"</string>
     <string name="bugreport_finished_title" msgid="2293711546892863898">"Baq raport alındı"</string>
-    <string name="bugreport_finished_text" msgid="3559904746859400732">"Xətanı şikayətini paylaşmaq üçün toxunun"</string>
+    <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Baq raportunu paylaşmaq üçün sola sürüşdürün"</string>
+    <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Xətanı şikayətini paylaşmaq üçün toxunun"</string>
     <string name="bugreport_confirm" msgid="5130698467795669780">"Baq raportları sistemin müxtəlif jurnal fayllarından data içərir ki, buna şəxsi və konfidensial məlumatlar da aiddir. Yalnız inandığınız adamlarla baq raportlarını paylaşın."</string>
     <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Bu mesajı növbəti dəfə göstər"</string>
+    <string name="bugreport_storage_title" msgid="5332488144740527109">"Baq hesabatları"</string>
 </resources>
diff --git a/packages/Shell/res/values-be/strings.xml b/packages/Shell/res/values-be/strings.xml
index 3b598d4..aa0b3d8 100644
--- a/packages/Shell/res/values-be/strings.xml
+++ b/packages/Shell/res/values-be/strings.xml
@@ -16,9 +16,16 @@
 -->
 <resources>
   <string name="app_label">Абалонка</string>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
   <string name="bugreport_finished_title">Справаздача пра збой захавана</string>
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
   <string name="bugreport_finished_text" product="watch">Правядзіце пальцам налева, каб падзяліцца сваёй справаздачай пра збой</string>
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
   <string name="bugreport_finished_text" product="default">Націсніце, каб падзяліцца сваёй справаздачай пра збой</string>
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
   <string name="bugreport_confirm">Справаздача пра памылку ўтрымлівае дадзеныя з файлаў сістэмнай гiсторыi, у тым ліку персанальную і прыватную інфармацыю. Дзялiцеся справаздачамi пра памылкі толькi з праверанымi карыстальнiкамi i праграмамі.</string>
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
   <string name="bugreport_confirm_repeat"> Паказваць гэта паведамленне у наступны раз</string>
+  <!-- Title for documents backend that offers bugreports. -->
+  <string name="bugreport_storage_title">Справаздача пра памылкі</string>
 </resources>
diff --git a/packages/Shell/res/values-bg/strings.xml b/packages/Shell/res/values-bg/strings.xml
index 2d779b6..381d5d8 100644
--- a/packages/Shell/res/values-bg/strings.xml
+++ b/packages/Shell/res/values-bg/strings.xml
@@ -22,5 +22,5 @@
     <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Докоснете, за да споделите отчета си за програмни грешки"</string>
     <string name="bugreport_confirm" msgid="5130698467795669780">"Отчетите за програмни грешки съдържат данни от различни регистрационни файлове на системата, включително лична и поверителна информация. Споделяйте ги само с приложения и хора, на които имате доверие."</string>
     <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Това съобщение да се показва следващия път"</string>
-    <string name="bugreport_storage_title" msgid="5332488144740527109">"Отчети за програмни грешки"</string>
+    <string name="bugreport_storage_title" msgid="5332488144740527109">"Отчети за прогр. грешки"</string>
 </resources>
diff --git a/packages/Shell/res/values-br-rFR/strings.xml b/packages/Shell/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-br-rFR/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-bs-rBA/strings.xml b/packages/Shell/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-bs-rBA/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-ca/strings.xml b/packages/Shell/res/values-ca/strings.xml
index 327fdc2..b07bafd 100644
--- a/packages/Shell/res/values-ca/strings.xml
+++ b/packages/Shell/res/values-ca/strings.xml
@@ -18,7 +18,7 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="3701846017049540910">"Protecció"</string>
     <string name="bugreport_finished_title" msgid="2293711546892863898">"S\'ha registrat l\'informe d\'error"</string>
-    <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Fes lliscar el dit cap a l\'esquerra per compartir l\'informe d\'errors."</string>
+    <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Llisca cap a l\'esquerra per compartir l\'informe d\'errors."</string>
     <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toca aquí per compartir el teu informe d\'error."</string>
     <string name="bugreport_confirm" msgid="5130698467795669780">"Els informes d\'error contenen dades dels diferents fitxers de registre del sistema, inclosa informació privada i personal. Comparteix els informes d\'error només amb les aplicacions i amb les persones en qui confies."</string>
     <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostra aquest missatge la propera vegada"</string>
diff --git a/packages/Shell/res/values-csb-rPL/strings.xml b/packages/Shell/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-csb-rPL/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-cy/strings.xml b/packages/Shell/res/values-cy/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-cy/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-en-rPT/strings.xml b/packages/Shell/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-en-rPT/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-eo/strings.xml b/packages/Shell/res/values-eo/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-eo/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-es-rCO/strings.xml b/packages/Shell/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-es-rCO/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-es-rMX/strings.xml b/packages/Shell/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-es-rMX/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-frp-rIT/strings.xml b/packages/Shell/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-frp-rIT/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-fy-rNL/strings.xml b/packages/Shell/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-fy-rNL/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-ga-rIE/strings.xml b/packages/Shell/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-ga-rIE/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-gd-rGB/strings.xml b/packages/Shell/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-gd-rGB/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-gu-rIN/strings.xml b/packages/Shell/res/values-gu-rIN/strings.xml
index 53e3852..e9fdfdb 100644
--- a/packages/Shell/res/values-gu-rIN/strings.xml
+++ b/packages/Shell/res/values-gu-rIN/strings.xml
@@ -20,7 +20,7 @@
     <string name="bugreport_finished_title" msgid="2293711546892863898">"બગ રિપોર્ટ કેપ્ચર કરી"</string>
     <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"તમારી બગ રિપોર્ટ શેર કરવા માટે ડાબે સ્વાઇપ કરો"</string>
     <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"તમારી બગ રિપોર્ટ શેર કરવા માટે ટચ કરો"</string>
-    <string name="bugreport_confirm" msgid="5130698467795669780">"બગ રિપોર્ટ્સ વ્યક્તિગત અને ખાનગી માહિતી સહિત, સિસ્ટમની વિભિન્ન લૉગ ફાઇલોનો ડેટા ધરાવે છે. બગ રિપોર્ટ્સ ફક્ત તમે વિશ્વાસ કરતા હો તે એપ્લિકેશન્સ અને લોકો સાથે જ શેર કરો."</string>
-    <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"આગલી વખતે આ સંદેશ દર્શાવો"</string>
+    <string name="bugreport_confirm" msgid="5130698467795669780">"બગ રિપોર્ટ્સ વ્યક્તિગત અને ખાનગી માહિતી સહિત, સિસ્ટમની વિભિન્ન લૉગ ફાઇલોનો ડેટા ધરાવે છે. બગ રિપોર્ટ્સ ફક્ત તમે વિશ્વાસ કરતા હો તે એપ્લિકેશનો અને લોકો સાથે જ શેર કરો."</string>
+    <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"આગલી વખતે આ સંદેશ બતાવો"</string>
     <string name="bugreport_storage_title" msgid="5332488144740527109">"બગ રિપોર્ટ્સ"</string>
 </resources>
diff --git a/packages/Shell/res/values-hr/strings.xml b/packages/Shell/res/values-hr/strings.xml
index cf122ab..a2cb3b0 100644
--- a/packages/Shell/res/values-hr/strings.xml
+++ b/packages/Shell/res/values-hr/strings.xml
@@ -22,5 +22,5 @@
     <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Dodirnite za dijeljenje prijave programske pogreške"</string>
     <string name="bugreport_confirm" msgid="5130698467795669780">"Prijave programskih pogrešaka sadržavaju podatke iz različitih datoteka zapisnika sustava, uključujući osobne i privatne informacije. Prijave programskih pogrešaka dijelite samo s aplikacijama i osobama koje smatrate pouzdanima."</string>
     <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Prikaži tu poruku sljedeći put"</string>
-    <string name="bugreport_storage_title" msgid="5332488144740527109">"Izvješća o programskim pogreškama"</string>
+    <string name="bugreport_storage_title" msgid="5332488144740527109">"Izvj. o prog. pogreš."</string>
 </resources>
diff --git a/packages/Shell/res/values-hy-rAM/strings.xml b/packages/Shell/res/values-hy-rAM/strings.xml
index a254192..6a5358b 100644
--- a/packages/Shell/res/values-hy-rAM/strings.xml
+++ b/packages/Shell/res/values-hy-rAM/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="3701846017049540910">"Խեցի"</string>
-    <string name="bugreport_finished_title" msgid="2293711546892863898">"Վրիպակի զեկույց ստացվեց"</string>
+    <string name="bugreport_finished_title" msgid="2293711546892863898">"Վրիպակի զեկույց է ստացվել"</string>
     <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Սահեցրեք ձախ՝ սխալի հաշվետվությունը համօգտագործելու համար"</string>
     <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Հպեք` ձեր վրիպակի մասին զեկույցը տարածելու համար"</string>
     <string name="bugreport_confirm" msgid="5130698467795669780">"Վրիպակի զեկույցները պարունակում են տվյալներ համակարգի տարբեր մուտքի ֆայլերից, այդ թվում նաև անհատական ​​և գաղտնի տեղեկություններ: Վրիպակի զեկույցները կիսեք միայն այն հավելվածների և մարդկանց հետ, որոնց վստահում եք:"</string>
diff --git a/packages/Shell/res/values-ku/strings.xml b/packages/Shell/res/values-ku/strings.xml
index 191c498..455fbb2 100644
--- a/packages/Shell/res/values-ku/strings.xml
+++ b/packages/Shell/res/values-ku/strings.xml
@@ -16,8 +16,14 @@
 -->
 <resources>
   <string name="app_label">توێکڵ</string>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
   <string name="bugreport_finished_title">ڕاپۆرتی کەموکورتیەکان وێنەگیرا</string>
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
   <string name="bugreport_finished_text" product="default">ده‌ستی لێده‌ بۆ په‌رشکردنی ڕاپۆرتی که‌موکوڕییه‌کانت</string>
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
   <string name="bugreport_confirm">ڕاپۆرتى که‌موکوڕییه‌کان داتا له‌ خۆ ده‌گرێت لە تۆمارى سيستم فايلی جۆراوجۆره‌وه‌، هەروەك زانياريى تايبەت و كەسى. تۆماری که‌موکوڕییه‌کان ته‌نها له‌گه‌ڵ ئه‌و که‌س و به‌رنامانه‌دا په‌رش بکه‌ که‌ متمانه‌ت پێیانه‌.</string>
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
   <string name="bugreport_confirm_repeat">جاری داهاتوو ئه‌م په‌یامه‌ پیشان بده‌</string>
+  <!-- Title for documents backend that offers bugreports. -->
 </resources>
diff --git a/packages/Shell/res/values-lb/strings.xml b/packages/Shell/res/values-lb/strings.xml
index 54cd3d8..04e5358 100644
--- a/packages/Shell/res/values-lb/strings.xml
+++ b/packages/Shell/res/values-lb/strings.xml
@@ -16,9 +16,15 @@
 -->
 <resources>
   <string name="app_label">Shell</string>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
   <string name="bugreport_finished_title">Feelerbericht opgefaangen</string>
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
   <string name="bugreport_finished_text" product="watch">No lénks wësche fir de Feelerbericht ze deelen</string>
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
   <string name="bugreport_finished_text" product="default">Drécken, fir de Feelerbericht ze deelen</string>
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
   <string name="bugreport_confirm">Feelerberichter hunn Daten aus de verschiddene Protokollfichiere vum System, dorënner perséinlech a privat Informatiounen. Deel just Feelerberichter mat Appen a Leit deenen s du traus.</string>
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
   <string name="bugreport_confirm_repeat">Weis dëse Message déi nächst Kéier un</string>
+  <!-- Title for documents backend that offers bugreports. -->
 </resources>
diff --git a/packages/Shell/res/values-nl/strings.xml b/packages/Shell/res/values-nl/strings.xml
index 2936387..b0dba4d 100644
--- a/packages/Shell/res/values-nl/strings.xml
+++ b/packages/Shell/res/values-nl/strings.xml
@@ -18,8 +18,8 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_label" msgid="3701846017049540910">"Shell"</string>
     <string name="bugreport_finished_title" msgid="2293711546892863898">"Foutenrapport vastgelegd"</string>
-    <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Veeg naar links om uw bugmelding te delen"</string>
-    <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Raak aan om uw foutenrapport te delen"</string>
+    <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Veeg naar links om je bugmelding te delen"</string>
+    <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Raak aan om je foutenrapport te delen"</string>
     <string name="bugreport_confirm" msgid="5130698467795669780">"Foutenrapporten bevatten gegevens uit de verschillende logbestanden van het systeem, waaronder persoonlijke en privégegevens. Deel foutenrapporten alleen met apps en mensen die u vertrouwt."</string>
     <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Dit bericht de volgende keer weergeven"</string>
     <string name="bugreport_storage_title" msgid="5332488144740527109">"Foutenrapporten"</string>
diff --git a/packages/Shell/res/values-oc-rFR/strings.xml b/packages/Shell/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-oc-rFR/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-or-rIN/strings.xml b/packages/Shell/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..a4de2af
--- /dev/null
+++ b/packages/Shell/res/values-or-rIN/strings.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
+  <!-- Title for documents backend that offers bugreports. -->
+</resources>
diff --git a/packages/Shell/res/values-pl/strings.xml b/packages/Shell/res/values-pl/strings.xml
index 266f070..96b8f2a 100644
--- a/packages/Shell/res/values-pl/strings.xml
+++ b/packages/Shell/res/values-pl/strings.xml
@@ -22,5 +22,5 @@
     <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Kliknij, by udostępnić raport o błędach"</string>
     <string name="bugreport_confirm" msgid="5130698467795669780">"Raporty o błędach zawierają dane z różnych plików dzienników systemu, w tym dane osobowe i prywatne. Udostępniaj je tylko aplikacjom i osobom, którym ufasz."</string>
     <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Pokaż ten komunikat następnym razem"</string>
-    <string name="bugreport_storage_title" msgid="5332488144740527109">"Zgłoszenia błędów"</string>
+    <string name="bugreport_storage_title" msgid="5332488144740527109">"Raporty o błędach"</string>
 </resources>
diff --git a/packages/Shell/res/values-pt-rBR/strings.xml b/packages/Shell/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e04d600
--- /dev/null
+++ b/packages/Shell/res/values-pt-rBR/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2013 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.
+ -->
+
+<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="3701846017049540910">"Shell"</string>
+    <string name="bugreport_finished_title" msgid="2293711546892863898">"Relatório de bugs capturado"</string>
+    <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Deslize para a esquerda para compartilhar seu relatório de bugs"</string>
+    <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Toque para compartilhar seu relatório de bugs"</string>
+    <string name="bugreport_confirm" msgid="5130698467795669780">"Os relatórios de bugs contêm dados de diversos arquivos de registro do sistema, inclusive informações pessoais e particulares. Compartilhe relatórios de bugs somente com apps e pessoas nos quais você confia."</string>
+    <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Mostrar esta mensagem da próxima vez"</string>
+    <string name="bugreport_storage_title" msgid="5332488144740527109">"Relatórios de bugs"</string>
+</resources>
diff --git a/packages/Shell/res/values-sk/strings.xml b/packages/Shell/res/values-sk/strings.xml
index a79059d..4228dd3 100644
--- a/packages/Shell/res/values-sk/strings.xml
+++ b/packages/Shell/res/values-sk/strings.xml
@@ -22,5 +22,5 @@
     <string name="bugreport_finished_text" product="default" msgid="3559904746859400732">"Hlásenie o chybách môžete zdielať klepnutím"</string>
     <string name="bugreport_confirm" msgid="5130698467795669780">"Správy o chybách obsahujú údaje z rôznych súborov denníkov systému vrátane osobných a súkromných informácií. Zdieľajte ich iba s dôveryhodnými aplikáciami a ľuďmi."</string>
     <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"Zobraziť túto správu nabudúce"</string>
-    <string name="bugreport_storage_title" msgid="5332488144740527109">"Hlásenia o chybe"</string>
+    <string name="bugreport_storage_title" msgid="5332488144740527109">"Hlásenia chýb"</string>
 </resources>
diff --git a/packages/Shell/res/values-ug/strings.xml b/packages/Shell/res/values-ug/strings.xml
index eee708f..366d73e 100644
--- a/packages/Shell/res/values-ug/strings.xml
+++ b/packages/Shell/res/values-ug/strings.xml
@@ -16,8 +16,16 @@
 -->
 <resources>
   <string name="app_label">Shell</string>
+  <!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
   <string name="bugreport_finished_title">خاتالىق دوكلاتى تۇتۇلدى</string>
+  <!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
+  <string name="bugreport_finished_text" product="watch">سولغا سىيرىسىڭىز خاتالىق دوكلاتىڭىزنى ھەمبەھىرلەيدۇ</string>
+  <!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
   <string name="bugreport_finished_text" product="default">چېكىپلا خاتالىق دوكلاتىنى ھەمبەھىرلىيەلەيسىز</string>
+  <!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
   <string name="bugreport_confirm">خاتالىق دوكلاتىدىكى سانلىق مەلۇماتلار سىستېمىنىڭ ھەر قايسى خاتىرە ھۆججەتلىرىدىن كەلگەن بولۇپ، ئۇنىڭدا شەخسىي ئۇچۇر ۋە شەخسىيەت ئۇچۇرلىرى بار. پەقەت سىز ئىشىنىدىغان ئەپ ۋە ئىشلەتكۈچى بىلەنلا خاتالىق دوكلاتىنى ھەمبەھىرلىنىڭ.</string>
+  <!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
   <string name="bugreport_confirm_repeat">بۇ ئۇچۇرنى كېيىنكى قېتىم كۆرسەت</string>
+  <!-- Title for documents backend that offers bugreports. -->
+  <string name="bugreport_storage_title">مەسىلە مەلۇم قىلىش</string>
 </resources>
diff --git a/packages/StatementService/res/values-ast-rES/strings.xml b/packages/StatementService/res/values-ast-rES/strings.xml
new file mode 100644
index 0000000..dcf9f6e
--- /dev/null
+++ b/packages/StatementService/res/values-ast-rES/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="service_name">Serviciu de verificación d\'Intención de filtru</string>
+</resources>
diff --git a/packages/StatementService/res/values-ug/strings.xml b/packages/StatementService/res/values-ug/strings.xml
new file mode 100644
index 0000000..bc39d79
--- /dev/null
+++ b/packages/StatementService/res/values-ug/strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2015 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="service_name">دەلىللەش مۇلازىمىتىنى ئۆتكۈزۋېتىشنى سىناپ بېقىش</string>
+</resources>
diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
index d9c9a3a..b614975 100644
--- a/packages/SystemUI/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -9,7 +9,8 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \
 LOCAL_STATIC_JAVA_LIBRARIES := Keyguard \
     org.cyanogenmod.platform.internal \
     android-support-v7-palette \
-    android-support-v4
+    android-support-v4 \
+    uicommon
 
 LOCAL_JAVA_LIBRARIES := telephony-common
 LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest_cm.xml
diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml
index 52cb1d9..d45b52b 100644
--- a/packages/SystemUI/AndroidManifest.xml
+++ b/packages/SystemUI/AndroidManifest.xml
@@ -135,12 +135,6 @@
             android:protectionLevel="signature" />
     <uses-permission android:name="com.android.systemui.permission.SELF" />
 
-    <!-- LiveDisplay -->
-    <uses-permission android:name="android.permission.HARDWARE_ABSTRACTION_ACCESS" />
-
-    <!-- Weather -->
-    <uses-permission android:name="com.cyanogenmod.lockclock.permission.READ_WEATHER" />
-
     <!-- blur surface -->
     <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />
 
@@ -186,13 +180,6 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".qs.tiles.HotspotTile$APChangedReceiver"
-                androidprv:primaryUserOnly="true">
-            <intent-filter>
-                <action android:name="android.net.wifi.WIFI_AP_STATE_CHANGED" />
-            </intent-filter>
-        </receiver>
-
         <activity android:name=".usb.UsbStorageActivity"
                   android:label="@*android:string/usb_storage_activity_title"
                   android:excludeFromRecents="true">
diff --git a/packages/SystemUI/AndroidManifest_cm.xml b/packages/SystemUI/AndroidManifest_cm.xml
index c84910d..bb1c70d 100644
--- a/packages/SystemUI/AndroidManifest_cm.xml
+++ b/packages/SystemUI/AndroidManifest_cm.xml
@@ -44,6 +44,18 @@
     <!-- Performance Manager -->
     <uses-permission android:name="cyanogenmod.permission.PERFORMANCE_ACCESS" />
 
+    <!-- Live lock screen manager -->
+    <uses-permission android:name="cyanogenmod.permission.LIVE_LOCK_SCREEN_MANAGER_ACCESS_PRIVATE" />
+
+     <!-- Weather Provider -->
+    <uses-permission android:name="cyanogenmod.permission.READ_WEATHER" />
+
+    <!-- Theme manager -->
+    <uses-permission android:name="cyanogenmod.permission.ACCESS_THEME_MANAGER" />
+
+    <!-- NFC Tile -->
+    <uses-permission android:name="android.permission.NFC" />
+
     <application>
         <provider android:name=".cm.SpamMessageProvider"
                   android:permission="android.permission.INTERACT_ACROSS_USERS_FULL"
diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
index 47e24e8..d6944a5 100644
--- a/packages/SystemUI/proguard.flags
+++ b/packages/SystemUI/proguard.flags
@@ -13,3 +13,5 @@
 -keep class com.android.systemui.statusbar.phone.PhoneStatusBar
 -keep class com.android.systemui.statusbar.tv.TvStatusBar
 -keep class com.android.systemui.recents.*
+
+-dontwarn com.cyngn.**
diff --git a/packages/SystemUI/res/anim/battery_circle.xml b/packages/SystemUI/res/anim/battery_circle.xml
new file mode 100644
index 0000000..e76fdbe
--- /dev/null
+++ b/packages/SystemUI/res/anim/battery_circle.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<objectAnimator
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:interpolator="@android:interpolator/linear"
+  android:propertyName="trimPathEnd"
+  android:valueFrom="0"
+  android:valueTo="1"
+  android:valueType="floatType"/>
\ No newline at end of file
diff --git a/packages/SystemUI/res/anim/battery_landscape.xml b/packages/SystemUI/res/anim/battery_landscape.xml
new file mode 100644
index 0000000..9583acb
--- /dev/null
+++ b/packages/SystemUI/res/anim/battery_landscape.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<objectAnimator
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:interpolator="@android:interpolator/linear"
+  android:propertyName="pathData"
+  android:valueFrom="@string/battery_landscape_path_empty"
+  android:valueTo="@string/battery_landscape_path_full"
+  android:valueType="pathType"/>
\ No newline at end of file
diff --git a/packages/SystemUI/res/anim/battery_portrait.xml b/packages/SystemUI/res/anim/battery_portrait.xml
new file mode 100644
index 0000000..c1a80bb
--- /dev/null
+++ b/packages/SystemUI/res/anim/battery_portrait.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<objectAnimator
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:interpolator="@android:interpolator/linear"
+  android:propertyName="pathData"
+  android:valueFrom="@string/battery_portrait_path_empty"
+  android:valueTo="@string/battery_portrait_path_full"
+  android:valueType="pathType"/>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_bolt.xml b/packages/SystemUI/res/drawable/ic_battery_bolt.xml
new file mode 100644
index 0000000..9da9bb5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_bolt.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="@color/batterymeter_bolt_color">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M10.5,7h5l-2,4h3l-7,6l2-5H8.5L10.5,7z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_circle.xml b/packages/SystemUI/res/drawable/ic_battery_circle.xml
new file mode 100644
index 0000000..8f39adb
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_circle.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/battery_frame"
+        android:drawable="@drawable/ic_battery_circle_frame"/>
+
+    <item
+        android:id="@+id/battery_fill"
+        android:drawable="@drawable/ic_battery_circle_avd"/>
+
+    <item
+        android:id="@+id/battery_charge_indicator"
+        android:drawable="@drawable/ic_battery_bolt"/>
+
+</layer-list>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_circle_avd.xml b/packages/SystemUI/res/drawable/ic_battery_circle_avd.xml
new file mode 100644
index 0000000..5e8fb1b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_circle_avd.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_battery_circle_fill" >
+
+    <target
+        android:name="battery_level"
+        android:animation="@anim/battery_circle" />
+
+</animated-vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_circle_fill.xml b/packages/SystemUI/res/drawable/ic_battery_circle_fill.xml
new file mode 100644
index 0000000..6944535
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_circle_fill.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <!-- Path will be tinted based on battery level -->
+    <path
+        android:name="battery_level"
+        android:strokeColor="#000000"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:pathData="@string/battery_circle_path" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_circle_frame.xml b/packages/SystemUI/res/drawable/ic_battery_circle_frame.xml
new file mode 100644
index 0000000..675c030
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_circle_frame.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <!-- Path will be tinted based on light/dark modes -->
+    <path
+        android:name="frame"
+        android:strokeColor="#000000"
+        android:strokeLineJoin="round"
+        android:strokeWidth="3"
+        android:pathData="@string/battery_circle_path"/>
+
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_landscape.xml b/packages/SystemUI/res/drawable/ic_battery_landscape.xml
new file mode 100644
index 0000000..81da041
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_landscape.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/battery_frame"
+        android:drawable="@drawable/ic_battery_landscape_frame"/>
+
+    <item
+        android:id="@+id/battery_fill"
+        android:drawable="@drawable/ic_battery_landscape_avd"/>
+
+    <item
+        android:id="@+id/battery_charge_indicator">
+        <rotate
+            android:pivotX="50%"
+            android:pivotY="50%"
+            android:fromDegrees="90"
+            android:toDegrees="90"
+            android:drawable="@drawable/ic_battery_bolt"/>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_landscape_avd.xml b/packages/SystemUI/res/drawable/ic_battery_landscape_avd.xml
new file mode 100644
index 0000000..41060e8
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_landscape_avd.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_battery_landscape_fill" >
+
+    <target
+        android:name="battery_level"
+        android:animation="@anim/battery_landscape" />
+
+</animated-vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_landscape_fill.xml b/packages/SystemUI/res/drawable/ic_battery_landscape_fill.xml
new file mode 100644
index 0000000..5d75bc6
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_landscape_fill.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+
+    <clip-path
+        android:name="mask"
+        android:pathData="@string/battery_landscape_clip_path" />
+
+    <!-- Path will be tinted based on battery level -->
+    <path
+        android:name="battery_level"
+        android:fillColor="#000000"
+        android:pathData="@string/battery_landscape_path_empty" />
+
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_landscape_frame.xml b/packages/SystemUI/res/drawable/ic_battery_landscape_frame.xml
new file mode 100644
index 0000000..bb66797
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_landscape_frame.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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:width="26dp"
+    android:height="24dp"
+    android:viewportWidth="26"
+    android:viewportHeight="24">
+
+    <clip-path
+        android:name="mask"
+        android:pathData="@string/battery_landscape_clip_path" />
+
+    <!-- Path will be tinted based on light/dark modes -->
+    <path
+        android:name="frame"
+        android:fillColor="#000000"
+        android:pathData="M 1 4 H 25 V 20 H 1 V 4 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_portrait.xml b/packages/SystemUI/res/drawable/ic_battery_portrait.xml
new file mode 100644
index 0000000..141bf1b
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_portrait.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/battery_frame"
+        android:drawable="@drawable/ic_battery_portrait_frame"/>
+
+    <item
+        android:id="@+id/battery_fill"
+        android:drawable="@drawable/ic_battery_portrait_avd"/>
+
+    <item
+        android:id="@+id/battery_charge_indicator"
+        android:drawable="@drawable/ic_battery_bolt"/>
+
+</layer-list>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_portrait_avd.xml b/packages/SystemUI/res/drawable/ic_battery_portrait_avd.xml
new file mode 100644
index 0000000..2768f5d
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_portrait_avd.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/ic_battery_portrait_fill" >
+
+    <target
+        android:name="battery_level"
+        android:animation="@anim/battery_portrait" />
+
+</animated-vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_portrait_fill.xml b/packages/SystemUI/res/drawable/ic_battery_portrait_fill.xml
new file mode 100644
index 0000000..6742181
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_portrait_fill.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <clip-path
+        android:name="mask"
+        android:pathData="@string/battery_portrait_clip_path" />
+
+    <!-- Path will be tinted based on battery level -->
+    <path
+        android:name="battery_level"
+        android:fillColor="#000000"
+        android:pathData="@string/battery_portrait_path_empty" />
+
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_battery_portrait_frame.xml b/packages/SystemUI/res/drawable/ic_battery_portrait_frame.xml
new file mode 100644
index 0000000..6bf92fb
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_battery_portrait_frame.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2016 The CyanogenMod 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:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <clip-path
+        android:name="mask"
+        android:pathData="@string/battery_portrait_clip_path" />
+
+    <!-- Path will be tinted based on light/dark modes -->
+    <path
+        android:name="frame"
+        android:fillColor="#000000"
+        android:pathData="M19,2v19H5V2H19z" />
+
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_livedisplay_auto.xml b/packages/SystemUI/res/drawable/ic_dynamic_qs_live_display.xml
index 39d1f8c..fc1c4d6 100644
--- a/packages/SystemUI/res/drawable/ic_livedisplay_auto.xml
+++ b/packages/SystemUI/res/drawable/ic_dynamic_qs_live_display.xml
@@ -15,8 +15,8 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
+    android:width="48dp"
+    android:height="48dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
diff --git a/packages/SystemUI/res/drawable/ic_dynamic_qs_themes.xml b/packages/SystemUI/res/drawable/ic_dynamic_qs_themes.xml
new file mode 100644
index 0000000..14802e9
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_dynamic_qs_themes.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 The CyanogenMod 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:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21,5V3h-2v6c0,0.6-0.4,1-1,1s-1-0.4-1-1V3h-2v10c0,0.6-0.4,1-1,1s-1-0.4-1-1V7c0-0.6-0.4-1-1-1s-1,0.4-1,1v4
+c0,0.6-0.4,1-1,1s-1-0.4-1-1V8c0-0.6-0.4-1-1-1S7,7.4,7,8v8c0,0.6-0.4,1-1,1s-1-0.4-1-1V3H3v2H2v4h1v10c0,1.1,0.9,2,2,2h14
+c1.1,0,2-0.9,2-2V9h1V5H21z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_livedisplay_off.xml b/packages/SystemUI/res/drawable/ic_empty_space.xml
index fb68c00..7327894 100644
--- a/packages/SystemUI/res/drawable/ic_livedisplay_off.xml
+++ b/packages/SystemUI/res/drawable/ic_empty_space.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015 The CyanogenMod Project
+    Copyright (c) 2016 The CyanogenMod Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,15 +15,12 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M2.7,2.7L1.3,4.1L3,5.8V19c0,1.1,0.9,2,2,2h13.2l1.7,1.7l1.4-1.4L2.7,2.7z
-M5,19V7.8l2.8,2.8L6.3,12L8,13.7 V16h2.3l1.7,1.7l1.4-1.4l2.8,2.8H5z
-M7.8,5l-2-2H19c1.1,0,2,0.9,2,2v13.2l-2-2V5H7.8z
-M16,8v2.3l1.7,1.7l-1.4,1.4l-5.7-5.7L12,6.3 L13.7,8H16z" />
+        android:fillColor="#00000000"
+        android:pathData="M7.41,7.84 L12,12.42 L16.59,7.84 L18,9.25 L12,15.25 L6,9.25 Z" />
 </vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_livedisplay_night.xml b/packages/SystemUI/res/drawable/ic_keyboard_arrow_down.xml
index 88a6764..59f9daa 100644
--- a/packages/SystemUI/res/drawable/ic_livedisplay_night.xml
+++ b/packages/SystemUI/res/drawable/ic_keyboard_arrow_down.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015 The CyanogenMod Project
+    Copyright (c) 2016 The CyanogenMod Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,15 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M15.5,15.5c0.4-0.4,0.7-0.8,0.9-1.2c-1.9,1-4.3,0.7-5.8-0.9s-1.9-4-0.9-5.8C9.2,7.8,8.8,8.1,8.5,8.5
-c-2,2-2,5.1,0,7.1S13.6,17.5,15.5,15.5z M19,5v14H5V5H19
-M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5
-C21,3.9,20.1,3,19,3L19,3z" />
+        android:fillColor="#000000"
+        android:pathData="M7.41,7.84 L12,12.42 L16.59,7.84 L18,9.25 L12,15.25 L6,9.25 Z" />
+    <path
+        android:pathData="M0,-0.75 L24,-0.75 L24,23.25 L0,23.25 Z" />
 </vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_livedisplay_outdoor.xml b/packages/SystemUI/res/drawable/ic_keyboard_arrow_left.xml
index 66ead51..182c865 100644
--- a/packages/SystemUI/res/drawable/ic_livedisplay_outdoor.xml
+++ b/packages/SystemUI/res/drawable/ic_keyboard_arrow_left.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-    Copyright (c) 2015 The CyanogenMod Project
+    Copyright (c) 2016 The CyanogenMod Project
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -15,13 +15,14 @@
     limitations under the License.
 -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
     <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3z
-M19,19H5V5h14V19z M14,12.3l-2.8,3.5l-2-2.4L6.5,17h11L14,12.3z" />
+        android:fillColor="#000000"
+        android:pathData="M15.41,16.09 L10.83,11.5 L15.41,6.91 L14,5.5 L8,11.5 L14,17.5 Z" />
+    <path
+        android:pathData="M0,-0.5 L24,-0.5 L24,23.5 L0,23.5 Z" />
 </vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_keyboard_arrow_right.xml b/packages/SystemUI/res/drawable/ic_keyboard_arrow_right.xml
new file mode 100644
index 0000000..68e056e
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_keyboard_arrow_right.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 The CyanogenMod 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:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M8.59,16.34 L13.17,11.75 L8.59,7.16 L10,5.75 L16,11.75 L10,17.75 Z" />
+    <path
+        android:pathData="M0,-0.25 L24,-0.25 L24,23.75 L0,23.75 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_keyboard_arrow_up.xml b/packages/SystemUI/res/drawable/ic_keyboard_arrow_up.xml
new file mode 100644
index 0000000..3b222a2
--- /dev/null
+++ b/packages/SystemUI/res/drawable/ic_keyboard_arrow_up.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (c) 2016 The CyanogenMod 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:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M7.41,15.41 L12,10.83 L16.59,15.41 L18,14 L12,8 L6,14 Z" />
+    <path
+        android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/ic_livedisplay_day.xml b/packages/SystemUI/res/drawable/ic_livedisplay_day.xml
deleted file mode 100644
index f454d81..0000000
--- a/packages/SystemUI/res/drawable/ic_livedisplay_day.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (c) 2015 The CyanogenMod 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:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M19,5v14H5V5H19
-M19,3H5C3.9,3,3,3.9,3,5v14c0,1.1,0.9,2,2,2h14c1.1,0,2-0.9,2-2V5C21,3.9,20.1,3,19,3L19,3z
-M14,12c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S14,10.9,14,12z
-M16,13.7l1.7-1.7L16,10.3V8h-2.3L12,6.3L10.3,8H8v2.3L6.3,12L8,13.7
-V16h2.3l1.7,1.7l1.7-1.7H16V13.7z" />
-</vector>
\ No newline at end of file
diff --git a/packages/SystemUI/res/drawable/notification_guts_queue_bg.xml b/packages/SystemUI/res/drawable/notification_guts_queue_bg.xml
new file mode 100644
index 0000000..4a869c5
--- /dev/null
+++ b/packages/SystemUI/res/drawable/notification_guts_queue_bg.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The CyanogenMod 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/notification_guts_media_bg_color"/>
+        </shape>
+    </item>
+
+
+</layer-list>
+
diff --git a/packages/SystemUI/res/drawable/queue_bg.xml b/packages/SystemUI/res/drawable/queue_bg.xml
new file mode 100644
index 0000000..0ca04c0
--- /dev/null
+++ b/packages/SystemUI/res/drawable/queue_bg.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The CyanogenMod 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <ripple android:color="?android:colorControlHighlight">
+        <item android:state_pressed="true">
+            <shape android:shape="rectangle">
+                <solid android:color="@color/queue_background_pressed"/>
+            </shape>
+        </item>
+    </ripple>
+    <ripple android:color="?android:colorControlHighlight">
+        <item android:state_selected="true">
+            <shape android:shape="rectangle">
+                <solid android:color="@color/queue_background_pressed"/>
+            </shape>
+        </item>
+    </ripple>
+    <ripple android:color="?android:colorControlHighlight">
+        <item android:state_focused="true">
+            <shape android:shape="rectangle">
+                <solid android:color="@color/queue_background_pressed"/>
+            </shape>
+        </item>
+    </ripple>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/queue_background"/>
+        </shape>
+    </item>
+</selector>
diff --git a/packages/SystemUI/res/drawable/queue_gradient.xml b/packages/SystemUI/res/drawable/queue_gradient.xml
new file mode 100644
index 0000000..614a214
--- /dev/null
+++ b/packages/SystemUI/res/drawable/queue_gradient.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The CyanogenMod 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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+    <gradient
+        android:type="linear"
+        android:angle="270"
+        android:startColor="#FF000000"
+        android:endColor="@color/queue_background"/>
+</shape>
diff --git a/packages/SystemUI/res/drawable/queue_row_background.xml b/packages/SystemUI/res/drawable/queue_row_background.xml
new file mode 100644
index 0000000..d6855a4
--- /dev/null
+++ b/packages/SystemUI/res/drawable/queue_row_background.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The CyanogenMod 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.
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="?android:attr/colorControlHighlight">
+    <item android:id="@+id/mask">
+        <color android:color="@color/queue_background_pressed"/>
+    </item>
+</ripple>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_1.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_1.xml
new file mode 100644
index 0000000..3a4ee98
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_1.xml
@@ -0,0 +1,28 @@
+<!--
+Copyright (C) 2014 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:width="20dp"
+        android:height="17dp"
+        android:viewportWidth="56.0"
+        android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M44,4V44h8V4h-8z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_2.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_2.xml
new file mode 100644
index 0000000..3a01881
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_2.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 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:width="20dp"
+        android:height="17dp"
+        android:viewportWidth="56.0"
+        android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M44,4V44h8V4h-8z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M44,34V44h8V34h-8z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_3.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_3.xml
new file mode 100644
index 0000000..9639d28
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_3.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 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:width="20dp"
+        android:height="17dp"
+        android:viewportWidth="56.0"
+        android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M44,4V44h8V4h-8z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M44,24V44h8V24h-8z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_4.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_4.xml
new file mode 100644
index 0000000..1e8ac10
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_4.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 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:width="20dp"
+        android:height="17dp"
+        android:viewportWidth="56.0"
+        android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M44,4V44h8V4h-8z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M44,14V44h8V14h-8z"/>
+</vector>
diff --git a/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_5.xml b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_5.xml
new file mode 100644
index 0000000..7464bec
--- /dev/null
+++ b/packages/SystemUI/res/drawable/stat_sys_data_bluetooth_connected_battery_5.xml
@@ -0,0 +1,31 @@
+<!--
+Copyright (C) 2014 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:width="20dp"
+        android:height="17dp"
+        android:viewportWidth="56.0"
+        android:viewportHeight="48.0">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M14.0,24.0l-4.0,-4.0l-4.0,4.0l4.0,4.0L14.0,24.0zM35.4,15.4L24.0,4.0l-2.0,0.0l0.0,15.2L12.8,10.0L10.0,12.8L21.2,24.0L10.0,35.2l2.8,2.8l9.2,-9.2L22.0,44.0l2.0,0.0l11.4,-11.4L26.8,24.0L35.4,15.4zM26.0,11.7l3.8,3.8L26.0,19.2L26.0,11.7zM29.8,32.6L26.0,36.3l0.0,-7.5L29.8,32.6zM38.0,20.0l-4.0,4.0l4.0,4.0l4.0,-4.0L38.0,20.0z"/>
+    <path
+        android:fillColor="#4DFFFFFF"
+        android:pathData="M44,4V44h8V4h-8z"/>
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M44,4V44h8V4h-8z"/>
+</vector>
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index afb98be..20ed3bc 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -19,14 +19,14 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:systemui="http://schemas.android.com/apk/res/com.android.systemui"
     android:id="@+id/keyguard_bottom_area"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:layout_width="match_parent"
     android:outlineProvider="none"
     android:elevation="5dp" > <!-- Put it above the status bar header -->
 
     <com.android.systemui.statusbar.phone.KeyguardIndicationTextView
         android:id="@+id/keyguard_indication_text"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/keyguard_indication_margin_bottom"
         android:layout_gravity="bottom|center_horizontal"
@@ -39,7 +39,7 @@
     <FrameLayout
         android:id="@+id/preview_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="wrap_content">
     </FrameLayout>
 
     <com.android.systemui.statusbar.KeyguardAffordanceView
diff --git a/packages/SystemUI/res/layout/notification_guts_queue.xml b/packages/SystemUI/res/layout/notification_guts_queue.xml
new file mode 100644
index 0000000..fe081e2
--- /dev/null
+++ b/packages/SystemUI/res/layout/notification_guts_queue.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The CyanogenMod 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.
+-->
+
+<com.android.systemui.statusbar.MediaNotificationGuts
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:id="@+id/notification_guts"
+    android:visibility="gone"
+    android:clickable="true"
+    android:gravity="top|start">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:clipChildren="false"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:background="@drawable/notification_guts_bg"
+            android:elevation="2dp"
+            android:layout_height="@android:dimen/notification_large_icon_height"
+            android:orientation="horizontal">
+
+            <ImageView
+                android:id="@android:id/icon"
+                android:layout_width="@android:dimen/notification_large_icon_width"
+                android:layout_height="@android:dimen/notification_large_icon_height"
+                android:layout_weight="0"
+                android:padding="8dp"
+                android:scaleType="centerInside"/>
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="start|center_vertical"
+                android:orientation="vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:layout_weight="1">
+                <TextView
+                    android:id="@+id/pkgname"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical|start"
+                    android:layout_weight="1"
+                    android:textAppearance="@*android:style/TextAppearance.Material.Notification.Title"
+                    android:textColor="@color/notification_guts_title_color"/>
+                <DateTimeView
+                    android:id="@+id/timestamp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:layout_gravity="center_vertical|start"
+                    android:textAppearance="@*android:style/TextAppearance.Material.Notification.Time"
+                    android:textColor="@color/notification_guts_text_color"/>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/debug_info"
+                    android:layout_weight="0"
+                    android:textAppearance="@*android:style/TextAppearance.Material.Notification.Time"
+                    android:layout_gravity="bottom|start"
+                    android:visibility="gone"
+                    android:textColor="@color/notification_guts_text_color"/>
+            </LinearLayout>
+
+            <ImageButton
+                style="@android:style/Widget.Material.Light.Button.Borderless.Small"
+                android:id="@+id/notification_inspect_app_provided_settings"
+                android:layout_width="52dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0"
+                android:gravity="center"
+                android:src="@drawable/notification_guts_ic_settings"
+                android:visibility="gone"/>
+
+            <ImageButton
+                style="@android:style/Widget.Material.Light.Button.Borderless.Small"
+                android:id="@+id/notification_inspect_filter_notification"
+                android:layout_width="52dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0"
+                android:gravity="center"
+                android:src="@drawable/notification_guts_ic_ringer_mute"
+                android:visibility="gone"/>
+
+            <ImageButton
+                style="@android:style/Widget.Material.Light.Button.Borderless.Small"
+                android:id="@+id/notification_inspect_item"
+                android:layout_width="52dp"
+                android:layout_height="match_parent"
+                android:layout_weight="0"
+                android:gravity="center"
+                android:contentDescription="@string/status_bar_notification_inspect_item_title"
+                android:src="@drawable/ic_info"/>
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/queue_group"
+            android:padding="8dp"
+            android:background="@drawable/notification_guts_queue_bg"
+            android:elevation="0dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+            <TextView
+                android:layout_height="wrap_content"
+                android:id="@+id/switch_label"
+                android:layout_marginStart="@android:dimen/notification_large_icon_width"
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:text="@string/play_queue_extention"/>
+            <Switch
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:id="@+id/queue_switch"/>
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</com.android.systemui.statusbar.MediaNotificationGuts>
diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml
index 5058314..7ff9345 100644
--- a/packages/SystemUI/res/layout/qs_detail.xml
+++ b/packages/SystemUI/res/layout/qs_detail.xml
@@ -29,6 +29,7 @@
             android:layout_weight="1" />
 
     <LinearLayout
+            android:id="@+id/buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:paddingEnd="8dp"
diff --git a/packages/SystemUI/res/layout/qs_detail_items_list.xml b/packages/SystemUI/res/layout/qs_detail_items_list.xml
index 09021f9..33dd579 100644
--- a/packages/SystemUI/res/layout/qs_detail_items_list.xml
+++ b/packages/SystemUI/res/layout/qs_detail_items_list.xml
@@ -18,7 +18,7 @@
 <com.android.systemui.qs.QSDetailItemsList xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:minHeight="200dp"
+    android:minHeight="100dp"
     android:paddingTop="16dp"
     android:paddingStart="16dp"
     android:paddingEnd="16dp">
diff --git a/packages/SystemUI/res/layout/qs_tile_top.xml b/packages/SystemUI/res/layout/qs_tile_top.xml
index a302c73..d9a7ad8 100644
--- a/packages/SystemUI/res/layout/qs_tile_top.xml
+++ b/packages/SystemUI/res/layout/qs_tile_top.xml
@@ -54,12 +54,13 @@
             android:orientation="horizontal">
 
         <TextView
+                android:id="@+id/edit_text_instruction"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
+                android:layout_marginEnd="16dp"
                 android:gravity="center_vertical"
                 android:layout_weight="1"
                 android:textColor="@color/qs_edit_header_instruction_text_color"
-                android:text="@string/qs_tile_edit_header_instruction"
                 android:contentDescription="@null"/>
 
         <ImageView
diff --git a/packages/SystemUI/res/layout/queue_adapter_row.xml b/packages/SystemUI/res/layout/queue_adapter_row.xml
new file mode 100644
index 0000000..1096066
--- /dev/null
+++ b/packages/SystemUI/res/layout/queue_adapter_row.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The CyanogenMod 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.
+-->
+<com.android.systemui.statusbar.QueueViewRow
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:background="@drawable/queue_bg"
+    android:layout_height="@dimen/queue_row_height"
+    android:paddingTop="4dp"
+    android:paddingBottom="4dp"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/art"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"/>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@+id/action"
+        android:layout_centerVertical="true">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@*android:dimen/notification_title_text_size"
+            android:color="@color/notification_guts_title_color"
+            android:id="@+id/title"/>
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="@*android:dimen/notification_subtext_size"
+            android:color="@color/notification_guts_text_color"
+            android:id="@+id/summary"/>
+    </LinearLayout>
+
+</com.android.systemui.statusbar.QueueViewRow>
diff --git a/packages/SystemUI/res/layout/status_bar.xml b/packages/SystemUI/res/layout/status_bar.xml
index 51f7df7..d5e799a 100644
--- a/packages/SystemUI/res/layout/status_bar.xml
+++ b/packages/SystemUI/res/layout/status_bar.xml
@@ -118,7 +118,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:singleLine="true"
-                android:paddingStart="7dp"
+                android:paddingStart="3dp"
                 android:gravity="center_vertical|start"
                 />
         </com.android.keyguard.AlphaOptimizedLinearLayout>
diff --git a/packages/SystemUI/res/layout/status_bar_expanded.xml b/packages/SystemUI/res/layout/status_bar_expanded.xml
index 996fb71..794a755 100644
--- a/packages/SystemUI/res/layout/status_bar_expanded.xml
+++ b/packages/SystemUI/res/layout/status_bar_expanded.xml
@@ -94,10 +94,6 @@
 
     </com.android.systemui.statusbar.phone.NotificationsQuickSettingsContainer>
 
-    <include
-            layout="@layout/keyguard_bottom_area"
-            android:visibility="gone" />
-
     <include layout="@layout/status_bar_expanded_header" />
 
     <com.android.systemui.statusbar.AlphaOptimizedView
diff --git a/packages/SystemUI/res/layout/status_bar_notification_row_media.xml b/packages/SystemUI/res/layout/status_bar_notification_row_media.xml
new file mode 100644
index 0000000..e1589f6
--- /dev/null
+++ b/packages/SystemUI/res/layout/status_bar_notification_row_media.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright (C) 2015 The CyanogenMod 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.
+-->
+
+<com.android.systemui.statusbar.MediaExpandableNotificationRow
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:focusable="true"
+    android:clickable="true">
+
+    <com.android.systemui.statusbar.NotificationBackgroundView
+        android:id="@+id/backgroundNormal"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <com.android.systemui.statusbar.NotificationBackgroundView
+        android:id="@+id/backgroundDimmed"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:clipChildren="false"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+            <com.android.systemui.statusbar.NotificationContentView
+                android:id="@+id/expanded"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+            <com.android.systemui.statusbar.NotificationContentView
+                android:id="@+id/expandedPublic"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"/>
+        </FrameLayout>
+        <com.android.systemui.statusbar.QueueView
+                android:id="@+id/queue_view"
+                android:clipChildren="false"
+                android:orientation="vertical"
+                android:background="@drawable/queue_bg"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/queue_top_shadow"
+                    android:background="@drawable/queue_gradient"/>
+            <ListView
+                    android:id="@+id/queue_list"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+        </com.android.systemui.statusbar.QueueView>
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/veto"
+        android:layout_width="48dp"
+        android:layout_height="0dp"
+        android:gravity="end"
+        android:layout_marginEnd="-80dp"
+        android:background="@null"
+        android:paddingEnd="8dp"
+        android:paddingStart="8dp"/>
+
+    <ViewStub
+        android:layout="@layout/notification_children_container"
+        android:id="@+id/child_container_stub"
+        android:inflatedId="@+id/notification_children_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
+    <ViewStub
+        android:layout="@layout/notification_expand_button"
+        android:id="@+id/more_button_stub"
+        android:inflatedId="@+id/notification_more_button_container"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/notification_bottom_decor_height"
+        />
+
+
+    <ViewStub
+        android:layout="@layout/notification_guts_queue"
+        android:id="@+id/notification_guts_stub"
+        android:inflatedId="@+id/notification_guts"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        />
+
+</com.android.systemui.statusbar.MediaExpandableNotificationRow>
diff --git a/packages/SystemUI/res/layout/system_icons.xml b/packages/SystemUI/res/layout/system_icons.xml
index 82e0667..1f3f810 100644
--- a/packages/SystemUI/res/layout/system_icons.xml
+++ b/packages/SystemUI/res/layout/system_icons.xml
@@ -34,14 +34,14 @@
 
     <!-- battery must be padded below to match assets -->
     <com.android.systemui.BatteryMeterView android:id="@+id/battery"
-        android:layout_height="14.5dp"
-        android:layout_width="9.5dp"
+        android:layout_height="18dp"
+        android:layout_width="18dp"
         android:layout_marginBottom="@dimen/battery_margin_bottom"
         android:layout_marginStart="@dimen/signal_cluster_battery_padding"/>
 
     <com.android.systemui.DockBatteryMeterView android:id="@+id/dock_battery"
-        android:layout_height="14.5dp"
-        android:layout_width="9.5dp"
+        android:layout_height="18dp"
+        android:layout_width="18dp"
         android:layout_marginBottom="@dimen/battery_margin_bottom"
         android:layout_marginStart="@dimen/signal_cluster_battery_padding"
         android:visibility="gone"/>
diff --git a/packages/SystemUI/res/layout/unlock_fab.xml b/packages/SystemUI/res/layout/unlock_fab.xml
deleted file mode 100644
index c80bc19..0000000
--- a/packages/SystemUI/res/layout/unlock_fab.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/show_bouncer"
-    android:layout_width="@dimen/unlock_fab_size"
-    android:layout_height="@dimen/unlock_fab_size"
-    android:layout_gravity="bottom|center_horizontal"
-    android:alpha="0.5"
-    android:src="@drawable/ic_lock_open_24dp" />
diff --git a/packages/SystemUI/res/values-af/cm_arrays.xml b/packages/SystemUI/res/values-af/cm_arrays.xml
index b156d8e..3008606 100644
--- a/packages/SystemUI/res/values-af/cm_arrays.xml
+++ b/packages/SystemUI/res/values-af/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NO</item>
+    <!-- North east -->
     <item>O</item>
+    <!-- East -->
     <item>SO</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-af/cm_strings.xml b/packages/SystemUI/res/values-af/cm_strings.xml
index 78abacd..823e9b3 100644
--- a/packages/SystemUI/res/values-af/cm_strings.xml
+++ b/packages/SystemUI/res/values-af/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Swiep regs vir %1$s</string>
   <string name="right_shortcut_hint">Swiep links vir %1$s</string>
   <string name="lockscreen_message">Tik \'n ikoon op die linker of regter kant om \'n slot skerm kortpad toe te wys.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Kies program</string>
   <string name="lockscreen_choose_action_title">Kies aksie</string>
   <string name="lockscreen_none_target">Geen</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Kies \'n aksie om toe te ken</string>
   <string name="navbar_home_button">Tuis-knoppie</string>
   <string name="navbar_recent_button">Onlangse programme knoppie</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Kieslys-knoppie</string>
   <string name="accessibility_dpad_left">Wyser na links</string>
   <string name="accessibility_dpad_right">Wyser na regs</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Vee program data uit</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Dwing stop</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Deïnstalleer</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Ligte herdelheidsvlak</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiele af.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profiel: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiele afgeskakel.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profiel verander na <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inisialiseer\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ligte instellings</string>
   <string name="led_notification_text">LED liggie word deur instellings gaktiveer</string>
   <string name="qs_tile_edit_header_instruction">Druk en hou teëls om te herrangskik</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Wys weer</string>
   <string name="quick_settings_title_show_brightness_slider">Wys helderheid skuiwer</string>
   <string name="quick_settings_title_enlarge_first_row">Vergroot eerste ry</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Dit hou dit binne sig totdat jy dit ontspeld. Raak en hou die knoppie Terug om te ontspeld.</string>
   <string name="quick_settings_custom_tile_detail_title">Pasgemaakte teël</string>
   <string name="quick_settings_remove">Verwyder teël</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profiele is afgeskakel</string>
   <string name="quick_settings_heads_up_label">Loer boodskap</string>
   <string name="quick_settings_battery_saver_label">Battery bespaarder</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Battery bespaarder (laai)</string>
   <string name="quick_settings_caffeine_label">Kafeïen</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sinchronisering af.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sinchronisering aan.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sinchronisering afgeskakel.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sinchronisering aangeskakel.</string>
   <string name="quick_settings_sync_label">Sinkroniseer</string>
   <string name="quick_settings_volume_panel_label">Volume paneel</string>
@@ -81,66 +107,119 @@
   <string name="quick_settings_ambient_display_label">Omgewingstemperatuur skerm</string>
   <string name="quick_settings_lockscreen_label_enforced">Slotskerm afgedwing</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Afgeskakel deur profiel</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Skerm slaap: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Skerm slaap verander na <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Battery modus</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Battery modus: energiebesparing modus.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Battery modus: gebalanseerde modus.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Battery modus: werkverrigting modus.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Battery modus: doeltreffendheid modus.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Battery modus: vinnige modus.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Battery modus verander na energiebesparings modus.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Battery modus verander na gebalanseerde modus.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Battery modus verander na werkverrigting modus.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Battery modus verander na doeltreffendheid modus.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Battery modus verander na vinnige modus.</string>
   <string name="quick_settings_performance_profile_detail_title">Battery modus</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Slotskerm af.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Slotskerm aan.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Slotskerm afgeskakel.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Slotskerm aangeskakel.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Omgewingstemperatuur vertoning af.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Omgewingstemperatuur vertoning aan.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Omgewingstemperatuur skerm vertoning is afgeskakel.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Omgewingstemperatuur skerm vertoning is aangeskakel.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Loer boodskap af.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Loer boodskap aan.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Loer boodskap is afgeskakel.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Loer boodskap is aangeskakel.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Kafeïen af.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Kafeïen aan.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Battery bespaarder af.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Battery bespaarder aan.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Battery bespaarder afgeskakel.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Battery bespaarder aangeskakel.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dinamiese teëls</string>
   <string name="dynamic_qs_tile_next_alarm_label">Volgende alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Kies IME</string>
   <string name="dynamic_qs_tile_su_label">\'Root\' toegang</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay af.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: outo modus.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: dag modus.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: nag modus.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: buitelug modus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay afgeskakel.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay verander na outo modus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay verander na dag modus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay verander na dag modus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay verander na buitelug modus.</string>
   <string name="quick_settings_title_advanced_location">Drie-staat ligging</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Liggingverslaggewing: battery besparing.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Liggingverslaggewing: sensors alleenlik.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Liggingverslaggewing: hoë akkuraatheid modus.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Liggingsinligting modus</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Battery besparend</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Slegs Toestel</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Hoë akkuraatheid</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Plek verslagdoening verander na battery sparing modus.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Plek verslagdoening verander na sensors alleenlik modus.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Plek verslagdoening verander na hoë akkuraatheid modus.</string>
   <string name="quick_settings_tiles_category_system">Stelsel teëls</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Voeg \'n teël by</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Kan nie aan mobiele netwerke koppel terwyl vliegtuig modus aan is nie. Skakel vliegtuig modus af en probeer weer.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Flitslig is aan</string>
   <string name="quick_settings_tile_flashlight_not_summary">Raak om af te skakel</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klient</item>
+    <item quantity="other">%1$d kliente</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Geen data SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dok Battery <xliff:g id="number">%d</xliff:g> persent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Wys speel ry</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Trek af om uit te brei</string>
+  <string name="swipe_left_hint">Vee links na <xliff:g id="app_name">%1$s </xliff:g></string>
+  <string name="swipe_right_hint">Vee regs na kennisgewings</string>
 </resources>
diff --git a/packages/SystemUI/res/values-am/cm_arrays.xml b/packages/SystemUI/res/values-am/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-am/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-am/cm_strings.xml b/packages/SystemUI/res/values-am/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-am/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-ar/cm_arrays.xml b/packages/SystemUI/res/values-ar/cm_arrays.xml
index cf5825b..3110756 100644
--- a/packages/SystemUI/res/values-ar/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ar/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ar/cm_strings.xml b/packages/SystemUI/res/values-ar/cm_strings.xml
index a59d14a..5df04a3 100644
--- a/packages/SystemUI/res/values-ar/cm_strings.xml
+++ b/packages/SystemUI/res/values-ar/cm_strings.xml
@@ -16,12 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">تحريك إلى اليمين من أجل %1$s</string>
   <string name="right_shortcut_hint">تحريك إلى اليسار من أجل %1$s</string>
+  <string name="lockscreen_message">انقر فوق رمز على اليسار أو اليمين لتخصيص اختصار جديد على شاشة التأمين.</string>
+  <string name="lockscreen_default_target">الافتراضي</string>
   <string name="select_application">حدد التطبيق</string>
   <string name="lockscreen_choose_action_title">اختر إجراء</string>
   <string name="lockscreen_none_target">لا شيء</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">اختر الإجراء لتخصيصه</string>
   <string name="navbar_home_button">زر الرئيسية</string>
   <string name="navbar_recent_button">زر الأشياء الأخيرة</string>
@@ -33,14 +46,38 @@
   <string name="navbar_menu_big_button">زر القائمة</string>
   <string name="accessibility_dpad_left">المؤشر إلى اليسار</string>
   <string name="accessibility_dpad_right">المؤشر الى اليمين</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">مسح بيانات التطبيق</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">إيقاف إجباري</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">إلغاء التثبيت</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">سطوع الضوء</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">إيقاف ملفات التعريف.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">ملف التعريف: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">تعطيل ملفات التعريف. </string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">تم تغيير ملف التعريف إلى <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">تهيئة\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">إعدادات الإضاءة</string>
+  <string name="led_notification_text">إضاءة الـLED مفعلة من الإعدادات</string>
+  <string name="qs_tile_edit_header_instruction">أضغط بإستمرار على الإختصارات لإعادة الترتيب</string>
+  <string name="quick_settings_edit_label">تعديل الاختصارات</string>
+  <string name="quick_settings_cannot_delete_edit_tile">لا يمكن حذف اختصار التعديل</string>
+  <string name="qs_tiles_reset_confirmation">إعادة تعيين إعدادات الاختصارات السريعة للوضع الافتراضى؟</string>
+  <string name="quick_settings_tile_reset_to_default">إعادة تعيين على التخطيط الافتراضي</string>
+  <string name="quick_settings_title_header">الرأس</string>
+  <string name="quick_settings_title_tiles">الإختصارات</string>
+  <string name="quick_settings_title_show_weather">إظهار حالة الطقس</string>
+  <string name="quick_settings_title_show_brightness_slider">إظهار شريط التحكم في السطوع</string>
+  <string name="quick_settings_title_enlarge_first_row">توسيع الصف الأول</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">ستظل ظاهرة حتى يمكنك إزالتها. المس مع الاستمرار زر العودة لإزالتها.</string>
   <string name="quick_settings_custom_tile_detail_title">مربع مخصص</string>
   <string name="quick_settings_remove">إزالة المربع</string>
@@ -51,9 +88,16 @@
   <string name="quick_settings_profiles_off">تعطيل ملفات التعريف</string>
   <string name="quick_settings_heads_up_label">إنذار مسبق</string>
   <string name="quick_settings_battery_saver_label">موفر البطارية</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">حافظ البطارية (شحن)</string>
+  <string name="quick_settings_caffeine_label">وضع الكافيين</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">تعطيل المزامنة. </string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">تشغيل المزامنة.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">تم تعطيل المزامنة.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">تم تشغيل المزامنة.</string>
   <string name="quick_settings_sync_label">المزامنة</string>
   <string name="quick_settings_volume_panel_label">لوحة مستوى الصوت</string>
@@ -63,58 +107,112 @@
   <string name="quick_settings_lockscreen_label">شاشة القفل</string>
   <string name="quick_settings_ambient_display_label">العرض المحيط</string>
   <string name="quick_settings_lockscreen_label_enforced">إعمال قفل الشاشة</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">معطل بواسطة الوضع</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">مهلة الشاشة: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">تم تغيير مهلة الشاشة إلى: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">وضع البطارية</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">وضع البطارية: وضع توفير الطاقة.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">وضع البطارية: وضع متوازن.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">وضع البطارية: وضع الأداء.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">وضع البطارية: وضع الكفاءة.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">وضع البطارية: الوضع السريع.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">تم تغيير وضع البطارية إلى وضع توفير الطاقة.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">تم تغيير وضع البطارية إلى الوضع المتوازن.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">تم تغيير وضع البطارية إلى وضع الأداء.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">تم تغيير وضع البطارية الى وضع الكفاءة.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">تم تغيير وضع البطارية الى الوضع السريع.</string>
   <string name="quick_settings_performance_profile_detail_title">وضع البطارية</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">تعطيل شاشة القفل.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">تشغيل شاشة القفل.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">تم تعطيل شاشة القفل.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">تم تشغيل شاشة القفل.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">تعطيل العرض المحيط.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">تشغيل العرض المحيط.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">تم تعطيل العرض المحيط.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">تم تشغيل العرض المحيط.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">تعطيل الإنذار المسبق.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">تشغيل الإنذار المسبق.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">تم تعطيل الإنذار المسبق.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">تم تشغيل الإنذار المسبق.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">ايقاف وضع الكافيين.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">تشغيل وضع الكافيين.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">إيقاف موفر البطارية.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">تشغيل موفر البطارية.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">تم ايقاف موفر البطارية.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">تشغيل موفر البطارية.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">مربع ديناميكي</string>
   <string name="dynamic_qs_tile_next_alarm_label">التنبيه المقبل</string>
   <string name="dynamic_qs_tile_ime_selector_label">محدد IME</string>
   <string name="dynamic_qs_tile_su_label">الوصول إلى root</string>
-  <string name="accessibility_quick_settings_live_display_off">تعطيل LiveDisplay.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: الوضع التلقائي.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: الوضع النهاري.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: الوضع الليلي.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: وضع الأماكن المفتوحة.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">تم تعطيل LiveDisplay.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">تغيير LiveDisplay إلى الوضع التلقائي.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">تغيير LiveDisplay إلى الوضع النهاري.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">تغيير LiveDisplay إلى الوضع الليلي.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">تغيير LiveDisplay إلى وضع الأماكن المفتوحة.</string>
+  <string name="quick_settings_title_advanced_location">الموقع الثلاثى</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">تحديد الموقع: وضع توفير البطارية.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">تحديد الموقع: وضع المستشعرات فقط.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">تحديد الموقع: وضع الدقة العالية.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">وضع الموقع</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">توفير البطارية</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">الجهاز فقط</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">دقة عالية</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">تغيير تحديد الموقع إلى وضع توفير البطارية.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">تغيير تحديد الموقع إلى وضع المستشعرات فقط.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">تغيير تحديد الموقع إلى وضع الدقة العالية.</string>
+  <string name="quick_settings_tiles_category_system">إختصارات النظام</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">إضافة إختصار</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">غير قادر على الإتصال بالشبكات عند تفعيل وضع الطيران. قم بإلغاء تفعيل وضع الطيران وحاول مرة أخرى.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ضوء الفلاش مشغل</string>
+  <string name="quick_settings_tile_flashlight_not_summary">المس لإيقاف التشغيل</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">لا توجد SIM للبيانات</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">بطارية الإرساء <xliff:g id="number">%d</xliff:g>في المائة.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">إظهار قائمة انتظار التشغيل</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-as-rIN/cm_arrays.xml b/packages/SystemUI/res/values-as-rIN/cm_arrays.xml
new file mode 100644
index 0000000..3110756
--- /dev/null
+++ b/packages/SystemUI/res/values-as-rIN/cm_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>N</item>
+    <!-- North -->
+    <item>NE</item>
+    <!-- North east -->
+    <item>E</item>
+    <!-- East -->
+    <item>SE</item>
+    <!-- South east -->
+    <item>S</item>
+    <!-- South -->
+    <item>SW</item>
+    <!-- South west -->
+    <item>W</item>
+    <!-- West -->
+    <item>NW</item>
+    <!-- North west -->
+  </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-as-rIN/cm_strings.xml b/packages/SystemUI/res/values-as-rIN/cm_strings.xml
new file mode 100644
index 0000000..3937ca4
--- /dev/null
+++ b/packages/SystemUI/res/values-as-rIN/cm_strings.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">%1$s ৰ বাবে সোঁফালে ছোৱাইপ কৰক</string>
+  <string name="right_shortcut_hint">%1$s ৰ বাবে বাওঁফালে ছোৱাইপ কৰক</string>
+  <string name="lockscreen_message">লক স্ক্ৰীণ চমুপথ আৰোপ কৰিবলৈ বাওঁফালে বা সোঁফালে এটা আইকনত টেপ কৰক।</string>
+  <string name="lockscreen_default_target">ডিফল্ট</string>
+  <string name="select_application">এপ্লিকেশ্যন বাচনি কৰক</string>
+  <string name="lockscreen_choose_action_title">কাৰ্য পচন্দ কৰক</string>
+  <string name="lockscreen_none_target">হাল্লা</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">আৰোপ কৰিবলৈ ক্ৰিয়া পচন্দ কৰক</string>
+  <string name="navbar_home_button">হোম বুটাম</string>
+  <string name="navbar_recent_button">শেহতীয়া বুটাম</string>
+  <string name="navbar_search_button">অন্বেষণ বুটাম</string>
+  <string name="navbar_back_button">বেক বুটাম</string>
+  <string name="navbar_empty_button">খালি বুটাম</string>
+  <string name="navbar_menu_conditional_button">মেনু (অটোহাইড) বুটাম</string>
+  <string name="navbar_menu_always_button">মেনু (অলৱেজশ্বো) বুটাম</string>
+  <string name="navbar_menu_big_button">মেন্যু বুটাম</string>
+  <string name="accessibility_dpad_left">কাৰ্ছৰ বাওঁফালে</string>
+  <string name="accessibility_dpad_right">কাৰ্ছৰ সোঁফালে</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">এপ্প্ ডাটা পৰিষ্কাৰ কৰক</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">বলপ্ৰয়োগ কৰা বন্ধ</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">আনইনষ্টল</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">লাইটৰ উজ্জ্বলতা</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">প্ৰ\'ফাইল অফ।</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">প্ৰ\'ফাইল: <xliff:g id="profile" example="Default">%s</xliff:g>।</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">প্ৰ\'ফাইল অফ কৰা হৈছে।</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">প্ৰ\'ফাইল <xliff:g id="profile" example="Default">%s</xliff:g>লৈ পৰিৱৰ্তন কৰা হৈছে।</string>
+  <string name="quick_settings_compass_init">সূচনা কৰিব আছে\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">লাইট ছেটিং</string>
+  <string name="led_notification_text">ছেটিংছৰ দ্বাৰা সক্ষমিত LED লাইট</string>
+  <string name="qs_tile_edit_header_instruction">পুনঃসজ্জিত কৰিবলৈ টাইলবোৰ টিপক আৰু ধৰি থাকক</string>
+  <string name="quick_settings_edit_label">টাইল সম্পাদনা কৰক</string>
+  <string name="quick_settings_cannot_delete_edit_tile">সম্পাদিত টাইল বিলোপ কৰিব নোৱাৰি</string>
+  <string name="qs_tiles_reset_confirmation">দ্ৰুত ছেটিংচ টাইল ডিফ\'ল্ট কনফিগাৰেচনলৈ ৰিছেট কৰিব?</string>
+  <string name="quick_settings_tile_reset_to_default">ডিফ\'ল্ট লেআউটলৈ ৰিছেট কৰক</string>
+  <string name="quick_settings_title_header">শিৰোশাৰী</string>
+  <string name="quick_settings_title_tiles">টাইলচ্‌</string>
+  <string name="quick_settings_title_show_weather">বতৰ প্ৰদৰ্শন কৰক</string>
+  <string name="quick_settings_title_show_brightness_slider">উজ্জ্বলতা স্লাইডাৰ প্ৰদৰ্শন কৰক</string>
+  <string name="quick_settings_title_enlarge_first_row">প্ৰথম শাৰী পৰিবৰ্ধন কৰক</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">ই আপুনি আনপিন নকৰালৈকে এইটো দৰ্শনত ৰাখিব৷ আনপিন কৰিবলৈ বেক বুটাম স্পৰ্শ কৰি ধৰি থাকক।</string>
+  <string name="quick_settings_custom_tile_detail_title">কাষ্টম টাইল</string>
+  <string name="quick_settings_remove">টাইল আঁতৰাওক</string>
+  <string name="quick_settings_network_adb_label">ADB অভাৰ নেটৱৰ্ক</string>
+  <string name="quick_settings_compass_label">কম্পাছ</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">ছিষ্টেম প্ৰ\'ফাইল</string>
+  <string name="quick_settings_profiles_off">প্ৰপাইল অক্ষম কৰা হৈছে</string>
+  <string name="quick_settings_heads_up_label">হেডচ আপ</string>
+  <string name="quick_settings_battery_saver_label">বেটাৰী চেভাৰ</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">কেফেইন</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">সকালীকৄত অফ কৰক।</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">সকালীকৄত অন কৰক।</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">সকালীকৄত অফ কৰা হৈছে।</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">সকালীকৄত অন কৰা হৈছে।</string>
+  <string name="quick_settings_sync_label">সংযোজন</string>
+  <string name="quick_settings_volume_panel_label">ভলিউম পেনেল</string>
+  <string name="quick_settings_usb_tether_label">USB টেথাৰিং</string>
+  <string name="quick_settings_screen_timeout_detail_title">স্ক্ৰীণ টাইম আউট</string>
+  <string name="quick_settings_lockscreen_label">লক স্ক্ৰীণ</string>
+  <string name="quick_settings_ambient_display_label">পৰিপাৰ্শ্বিক ডিচপ্লে</string>
+  <string name="quick_settings_lockscreen_label_enforced">লক স্ক্ৰীণ ৰূপায়িত</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">প্ৰফাইলৰ দ্ৱাৰা অক্ষম কৰা হৈছে</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">স্ক্ৰীণ টাইম আউট: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>।</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">স্ক্ৰীণ টাইম আউট <xliff:g id="timeout" example="30 seconds">%s</xliff:g>লৈ পৰিৱৰ্তন কৰা হৈছে।</string>
+  <string name="qs_tile_performance">বেটাৰী মোড</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">বেটাৰি মোড: পাৱাৰ ছেভ মোড।</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">বেটাৰি মোড: ৰাহি মোড।</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">বেটাৰি মোড: কাৰ্য্যকাৰিতা মোড।</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">বেটাৰি মোড: এফিচিয়েন্সী মোড।</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">বেটাৰি মোড: কুইক মোড।</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">বেটাৰি মোড পাৱাৰ ছেভ মোডলৈ পৰিৱৰ্তন কৰা হৈছে।</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">বেটাৰি মোড ৰাহি মোডলৈ পৰিৱৰ্তন কৰা হৈছে।</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">বেটাৰি মোড কাৰ্য্যকাৰিতা মোডলৈ পৰিৱৰ্তন কৰা হৈছে।</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">বেটাৰি মোড এফিচিয়েন্সী মোডলৈ পৰিৱৰ্তন কৰা হৈছে।</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">বেটাৰি মোড কুইক মোডলৈ পৰিৱৰ্তন কৰা হৈছে।</string>
+  <string name="quick_settings_performance_profile_detail_title">বেটাৰী মোড</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">লক স্ক্ৰীণ অফ।</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">লক স্ক্ৰীণ অন।</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">লক স্ক্ৰীণ অফ কৰা হৈছে।</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">লক স্ক্ৰীণ অন কৰা হৈছে।</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">পাৰিপাৰ্শ্বিক প্রদর্শন অফ।</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">পাৰিপাৰ্শ্বিক প্রদর্শন অন।</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">পাৰিপাৰ্শ্বিক প্রদর্শন অফ কৰা হৈছে।</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">পাৰিপাৰ্শ্বিক প্রদর্শন অন কৰা হৈছে।</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">হেডচ আপ অফ।</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">হেডচ আপ অন।</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">হেডচ আপ অফ কৰা হৈছে।</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">হেডচ আপ অন কৰা হৈছে।</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">কেফেইন অফ.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">কেফেইন অন.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">বেটাৰি ছেভাৰ অফ।</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">বেটাৰি ছেভাৰ অন।</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">বেটাৰি ছেভাৰ অফ কৰা হৈছে।</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">বেটাৰি ছেভাৰ অন কৰা হৈছে।</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">ডায়নামিক টাইল</string>
+  <string name="dynamic_qs_tile_next_alarm_label">পৰৱৰ্তী এলাৰ্ম</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME চয়নকাৰী</string>
+  <string name="dynamic_qs_tile_su_label">ৰুট প্ৰৱেশ কৰক</string>
+  <string name="quick_settings_title_advanced_location">ট্ৰাই-ষ্টেট অৱস্থান</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">অৱস্থান ৰিপোৰ্টিং: বেটাৰি ছেভিং মোড।</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">অৱস্থান ৰিপোৰ্টিং: কেৱল চেনচৰ মোড।</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">অৱস্থান ৰিপোৰ্টিং: উচ্চ নিৰ্ভুলতা মোড।</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">স্থানমোড</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">বেটাৰী ছেভ কৰা</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">কেৱল ডিভাইচ</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">উচ্চ সঠিকতা</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">অৱস্থান ৰিপোৰ্টিং বেটাৰি ছেভিং মোডলৈ পৰিৱৰ্তন কৰিলে।</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">অৱস্থান ৰিপোৰ্টিং কেৱল চেনচৰ মোডলৈ পৰিৱৰ্তন কৰিলে।</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">অৱস্থান ৰিপোৰ্টিং উচ্চ নিৰ্ভুলতা মোডলৈ পৰিৱৰ্তন কৰিলে।</string>
+  <string name="quick_settings_tiles_category_system">ছিষ্টেম টাইলচ্‌</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">এটা টাইল যোগ কৰক</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">এয়াৰপ্লেন মোড সক্ষম কৰা থাকিলে ম\'বাইল নেটৱৰ্কলৈ সংযোগ কৰিবলৈ অক্ষম। এয়াৰপ্লেন মোড অক্ষম কৰক আৰু পুনৰ চেষ্টা কৰক।</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ফ্লেশলাইট অন আছে</string>
+  <string name="quick_settings_tile_flashlight_not_summary">অফ কৰিবলৈ টেপ কৰক</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d ক্লায়েণ্ট</item>
+    <item quantity="other">%1$d ক্লায়েন্ট</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">ডক বেটাৰী <xliff:g id="number">%d</xliff:g> শতাংশ।</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">প্লে কিউ প্ৰদৰ্শন কৰক</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-as-rIN/strings.xml b/packages/SystemUI/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-as-rIN/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-ast-rES/cm_arrays.xml b/packages/SystemUI/res/values-ast-rES/cm_arrays.xml
index cf5825b..3110756 100644
--- a/packages/SystemUI/res/values-ast-rES/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ast-rES/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ast-rES/cm_strings.xml b/packages/SystemUI/res/values-ast-rES/cm_strings.xml
index 9628bf6..e530151 100644
--- a/packages/SystemUI/res/values-ast-rES/cm_strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/cm_strings.xml
@@ -16,12 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Esliza a la derecha pa %1$s</string>
   <string name="right_shortcut_hint">Esliza a la esquierda pa %1$s</string>
+  <string name="lockscreen_message">Toca nun iconu de la esquierda o derecha pa reasignar un atayu na pantalla de bloquéu.</string>
+  <string name="lockscreen_default_target">Por defeutu</string>
   <string name="select_application">Esbillar app</string>
   <string name="lockscreen_choose_action_title">Esbillar aición</string>
   <string name="lockscreen_none_target">Nengún</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Seleicionar botón a amosar</string>
   <string name="navbar_home_button">Botón Aniciu</string>
   <string name="navbar_recent_button">Botón Recientes</string>
@@ -33,34 +46,177 @@
   <string name="navbar_menu_big_button">Botón Menú</string>
   <string name="accessibility_dpad_left">Cursor esquierda</string>
   <string name="accessibility_dpad_right">Cursor derecha</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Desaniciar datos</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Forciar detención</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstalar</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Rellumu de lluz</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">Perfiles desactivaos.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">Perfil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">Perfiles desactivaos.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">Perfil camudáu a <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
   <string name="quick_settings_compass_init">Anicializando\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Axustes de lluz</string>
+  <string name="led_notification_text">Lluz LED habilitada polos axustes</string>
+  <string name="qs_tile_edit_header_instruction">Toca y dexa primíos los controles pa reordenalos</string>
+  <string name="quick_settings_edit_label">Editar caxelles</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Nun pue desaniciase la caxella de \"Editar\"</string>
+  <string name="qs_tiles_reset_confirmation">¿Restaurar los controles d\'axustes rápidos a la configuración predeterminada?</string>
+  <string name="quick_settings_tile_reset_to_default">Reafitar distribución</string>
+  <string name="quick_settings_title_header">Testera</string>
+  <string name="quick_settings_title_tiles">Controles</string>
+  <string name="quick_settings_title_show_weather">Amosar clima</string>
+  <string name="quick_settings_title_show_brightness_slider">Amosar barra de lluminosidá</string>
+  <string name="quick_settings_title_enlarge_first_row">Ampliar la primer filera</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Esto caltién la pantalla nesta vista hasta que se llibera. Caltén primíu\'l botón Atrás pa lliberala.</string>
+  <string name="quick_settings_custom_tile_detail_title">Caxella personalizada</string>
+  <string name="quick_settings_remove">Desaniciar caxella</string>
   <string name="quick_settings_network_adb_label">ADB sobre rede</string>
   <string name="quick_settings_compass_label">Brúxula</string>
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Perfiles del sistema</string>
   <string name="quick_settings_profiles_off">Perfiles deshabilitaos</string>
+  <string name="quick_settings_heads_up_label">Notificaciones emerxentes</string>
   <string name="quick_settings_battery_saver_label">Aforrador d\'enerxía</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Aforrador de batería (cargando)</string>
+  <string name="quick_settings_caffeine_label">Cafeína</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">Sincronización desactivada.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">Sincronización activada.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">Sincronización desactivada.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">Sincronización activada.</string>
+  <string name="quick_settings_sync_label">Sincronización</string>
   <string name="quick_settings_volume_panel_label">Panel de volume</string>
   <string name="quick_settings_usb_tether_label">USB tethering</string>
   <string name="quick_settings_screen_timeout_detail_title">Tiempu d\'espera</string>
   <string name="quick_settings_lockscreen_label">Pantalla de bloquéu</string>
   <string name="quick_settings_ambient_display_label">Pantalla ambiente</string>
   <string name="quick_settings_lockscreen_label_enforced">Bloquéu de pantalla forzáu</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Deshabilitáu por perfil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">Tiempu d\'espera de pantalla: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">Tiempu d\'espera de pantalla camudáu a <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <string name="qs_tile_performance">Mou de batería</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">Mou de batería: mou d\'aforru d\'enerxía.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">Mou de batería: mou balanceáu.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">Mou de batería: mou rindimientu.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Mou de batería: mou eficiente.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">Mou batería: mou rápidu.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Camudóse\'l mou de la batería a Aforru d\'enerxía.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">Camudóse\'l mou de la batería a Balanceáu.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">Camudóse\'l mou de la batería a Rindimientu.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Camudóse\'l mou de batería a eficiente.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Camudóse\'l mou de batería a mou rápidu.</string>
+  <string name="quick_settings_performance_profile_detail_title">Mou de batería</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">Bloquéu de pantalla desactiváu.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">Bloquéu de pantalla activáu.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">Bloquéu de pantalla desactiváu.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Bloquéu de pantalla activáu.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Pantalla ambiente apagada.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Pantalla ambiente prendida.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Apagóse la pantalla ambiente.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Prendióse la pantalla ambiente.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Desactivar notificaciones emerxentes.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Activar notificaciones emerxentes.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Notificaciones emerxentes desactivaes.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Notificaciones emerxentes activaes.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Desactivar Cafeína.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Activar Cafeína.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">Aforru de bateríu apagáu.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">Aforru de bateríu encesu.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Aforru de bateríu apagáu.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Aforru de bateríu encesu.</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">Caxella dinámica</string>
   <string name="dynamic_qs_tile_next_alarm_label">Alarma siguiente</string>
   <string name="dynamic_qs_tile_ime_selector_label">Seleutor d\'IME</string>
   <string name="dynamic_qs_tile_su_label">Accesu root</string>
+  <string name="quick_settings_title_advanced_location">Llocalización por triangulación</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Informes de llocalización: mou d\'aforru de batería.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Informes de llocalización: mou de namái sensores.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Informes de llocalización: mou d\'alta precisión.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Mou de llocalización</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Aforru d\'enerxía</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Namái preséu</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Precisión alta</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">Informes de llocalización camudaron a mou aforru de batería.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">Informes de llocalización camudaron a mou namái preséu.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">Informes de llocalización camudaron a mou d\'alta precisión.</string>
+  <string name="quick_settings_tiles_category_system">Controles del sistema</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Amestar un control</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Nun pue coneutase a redes móviles mentanto tea activáu el mou Avión. Desactiva\'l mou Avión ya inténtalo de nueves.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">La llinterna ta encesa</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Toca p\'apagala</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d veceru</item>
+    <item quantity="other">%1$d veceros</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Ensin datos SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Batería de la bas al <xliff:g id="number">%d</xliff:g> por cientu.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Amosar la cola de reproducción</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
 </resources>
diff --git a/packages/SystemUI/res/values-ast-rES/strings.xml b/packages/SystemUI/res/values-ast-rES/strings.xml
index b4ea942..3b9cdb0 100644
--- a/packages/SystemUI/res/values-ast-rES/strings.xml
+++ b/packages/SystemUI/res/values-ast-rES/strings.xml
@@ -18,294 +18,843 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
   <string name="app_label">IU sistema</string>
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
   <string name="status_bar_clear_all_button">Llimpiar</string>
+  <!-- Title shown in recents popup for removing an application from the list -->
   <string name="status_bar_recent_remove_item_title">Desaniciar de la llista</string>
+  <!-- Title shown in recents popup for inspecting an application's properties -->
   <string name="status_bar_recent_inspect_item_title">Información de l\'aplicación</string>
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
   <string name="status_bar_no_recent_apps">Les tos pantalles recientes apaecen equí</string>
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
   <string name="status_bar_accessibility_dismiss_recents">Inorar aplicaciones recientes</string>
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <plurals name="status_bar_accessibility_recent_apps">
+    <item quantity="one">1 pantalla en perspeutiva</item>
+    <item quantity="other">%d pantalles en perspeutiva</item>
+  </plurals>
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
   <string name="status_bar_no_notifications_title">Nun tienes notificaciones</string>
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
   <string name="status_bar_ongoing_events_title">Entrante</string>
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
   <string name="status_bar_latest_events_title">Notificaciones</string>
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
   <string name="battery_low_title">Batería baxa</string>
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
   <string name="invalid_charger">Nun s\'almite la carga por USB.\nUsa namái el cargador proporcionáu.</string>
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
   <string name="invalid_charger_title">La carga USB nun ta sofitada.</string>
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
   <string name="invalid_charger_text">Usar namái el cargador suministráu.</string>
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
   <string name="battery_low_why">Axustes</string>
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
   <string name="battery_saver_confirmation_title">¿Prender l\'aforrador d\'enerxía?</string>
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
   <string name="battery_saver_confirmation_ok">Activar</string>
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
   <string name="battery_saver_start_action">Prender l\'aforrador d\'enerxía</string>
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_settings_button">Axustes</string>
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_wifi_button">Wi-Fi</string>
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
   <string name="status_bar_settings_auto_rotation">Xirar pantalla automáticamente</string>
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
   <string name="status_bar_settings_mute_label">SILENC</string>
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
   <string name="status_bar_settings_auto_brightness_label">AUTO</string>
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
   <string name="status_bar_settings_notifications">Notificaciones</string>
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
   <string name="bluetooth_tethered">Bluetooth ancláu</string>
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
   <string name="status_bar_input_method_settings_configure_input_methods">Configurar métodos d\'entrada</string>
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
   <string name="status_bar_use_physical_keyboard">Tecláu físicu</string>
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
   <string name="usb_device_permission_prompt">¿Permitir que l\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> acceda al preséu USB?</string>
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_permission_prompt">¿Permitir que l\'aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> acceda al preséu USB?</string>
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
   <string name="usb_device_confirm_prompt">¿Quies abrir <xliff:g id="ACTIVITY">%1$s</xliff:g> al coneutar esti preséu USB?</string>
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_confirm_prompt">¿Quies abrir <xliff:g id="ACTIVITY">%1$s</xliff:g> al coneutar esti preséu USB?</string>
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_uri_prompt">Nenguna aplicación instalada funciona con esti preséu USB. Más información: <xliff:g id="URL">%1$s</xliff:g></string>
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
   <string name="title_usb_accessory">Preséu USB</string>
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
   <string name="label_view">Ver</string>
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
   <string name="always_use_device">Usar de mou predetermináu pa esti preséu USB</string>
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
   <string name="always_use_accessory">Usar de mou predetermináu pa esti preséu USB</string>
+  <!-- Title of confirmation dialog for USB debugging -->
   <string name="usb_debugging_title">¿Permitir depuración USB?</string>
+  <!-- Message of confirmation dialog for USB debugging -->
   <string name="usb_debugging_message">La buelga dixital de la to clave RSA ye:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g></string>
+  <!-- Option to always allow USB debugging from the attached computer -->
   <string name="usb_debugging_always">Permitir siempre dende esti ordenador</string>
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <string name="usb_debugging_secondary_user_title">Depuración USB non permitida</string>
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <string name="usb_debugging_secondary_user_message">L\'usuariu coneutáu agora con esti preséu nun pue activar la depuración por USB. Pa usar esta función, has camudar al usuariu principal \u201C<xliff:g id="name" example="John Doe">%s</xliff:g>\u201D.</string>
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
   <string name="compat_mode_on">Zoom p\'axustar</string>
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
   <string name="compat_mode_off">Espander p\'axustar</string>
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
   <string name="screenshot_saving_ticker">Guardando captura...</string>
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
   <string name="screenshot_saving_title">Guardando captura...</string>
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
   <string name="screenshot_saving_text">La captura de pantalla ta guardándose.</string>
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
   <string name="screenshot_saved_title">Captura guardada</string>
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
   <string name="screenshot_saved_text">Toca pa ver la captura de pantalla</string>
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
   <string name="screenshot_failed_title">Nun pudo guardase la captura de pantalla.</string>
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
   <string name="screenshot_failed_text">Nun pue facese captura de pantalla porque nun hai espaciu, o nun hai permisu pa esta app.</string>
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
   <string name="usb_preference_title">Opciones de tresferencia de ficheros por USB</string>
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_mtp_button_title">Activar como reproductor de medios (MTP)</string>
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_ptp_button_title">Activar como cámara (PTP)</string>
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="installer_cd_button_title">Instalar Android File Transfer pa Mac</string>
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_back">Atrás</string>
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_home">Aniciu</string>
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_menu">Menú</string>
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_recent">Perspeutiva</string>
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
   <string name="accessibility_search_light">Guetar</string>
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_camera_button">Cámara</string>
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_button">Teléfonu</string>
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_voice_assist_button">Asistente voz</string>
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_unlock_button">Desbloquiar</string>
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_unlock_button_fingerprint">Botón de desbloquéu, esperando buelga dixital</string>
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_unlock_without_fingerprint">Desbloquiar ensin usar buelga dixital</string>
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
   <string name="unlock_label">desbloquiar</string>
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
   <string name="phone_label">abrir teléfonu</string>
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <string name="voice_assist_label">abrir l\'encontu de voz</string>
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
   <string name="camera_label">abrir cámara</string>
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <string name="recents_caption_resize">Esbilla\'l diseñu nuevu de la xera</string>
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <string name="cancel">Encaboxar</string>
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_compatibility_zoom_button">Botón de zoom de compatibilidá</string>
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_compatibility_zoom_example">Zoom de pantalla más pequeña a más grande</string>
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_connected">Bluetooth coneutáu</string>
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_disconnected">Bluetooth desconeutáu</string>
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_battery">Ensin batería</string>
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_one_bar">Una barra de batería</string>
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_two_bars">Dos barres de batería</string>
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_three_bars">Trés barres de batería</string>
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_full">Batería completa</string>
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_phone">Ensin teléfonu</string>
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_one_bar">Una barra de cobertoria</string>
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_two_bars">Dos barres de cobertoria</string>
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_three_bars">Trés barres de cobertoria</string>
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_signal_full">Cobertoria al máximu</string>
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_data">Ensin datos</string>
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_one_bar">Una barra de datos</string>
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_two_bars">Dos barres de datos</string>
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_three_bars">Trés barres de datos</string>
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_signal_full">Señal de datos al máximu</string>
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
   <string name="accessibility_wifi_name">Coneutáu a <xliff:g id="wifi" example="Home Network">%s</xliff:g>.</string>
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_name">Coneutáu a <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_wimax">Ensin conexón WiMAX</string>
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_one_bar">Una barra de WiMAX</string>
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_two_bars">Dos barres de WiMAX</string>
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_three_bars">Trés barres de WiMAX</string>
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_signal_full">Señal de WiMAX al máximu</string>
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_ethernet_disconnected">Ethernet desconeutada.</string>
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_ethernet_connected">Ethernet coneutada.</string>
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_signal">Nun hai señal</string>
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
   <string name="accessibility_not_connected">Ensin conexón</string>
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_zero_bars">Nenguna barra</string>
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_one_bar">Una barra</string>
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_two_bars">Dos barres</string>
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_three_bars">Trés barres</string>
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_signal_full">Señal al máximu</string>
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_on">Activáu</string>
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_off">Desactiváu</string>
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_connected">Coneutáu</string>
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_connecting">Coneutando.</string>
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_gprs">GPRS</string>
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_1x">1 X</string>
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspa">HSPA</string>
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_3g">3G</string>
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_3.5g">3.5 G</string>
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g">4G</string>
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_lte">LTE</string>
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_cdma">CDMA</string>
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_roaming">Itinerancia</string>
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_edge">Tipu Edge</string>
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_wifi">Wi-Fi</string>
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_sim">Ensin tarxeta SIM</string>
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_tether">Anclaxe de Bluetooth</string>
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_airplane_mode">Mou avión</string>
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_no_sims">Ensin tarxeta SIM.</string>
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_carrier_network_change_mode">Cambéu de fornidor de rede.</string>
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_level"><xliff:g id="NUMBER">%d</xliff:g> por cientu de batería</string>
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_settings_button">Axustes del sistema</string>
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notifications_button">Notificaciones</string>
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_remove_notification">Desaniciar notificación</string>
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_gps_enabled">GPS habilitáu</string>
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_gps_acquiring">Obteniendo llocalización...</string>
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_tty_enabled">Teletipu habilitáu</string>
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ringer_vibrate">Mou vibración</string>
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ringer_silent">Mou silenciu</string>
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
   <string name="accessibility_recents_item_will_be_dismissed">Descartar <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
+  <!-- Content description to tell the user an application has been removed from recents -->
   <string name="accessibility_recents_item_dismissed">Desanicióse <xliff:g id="APP">%s</xliff:g>.</string>
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <string name="accessibility_recents_all_items_dismissed">Descartáronse toles aplicaciones recientes.</string>
+  <!-- Content description to tell the user an application has been launched from recents -->
   <string name="accessibility_recents_item_launched">Aniciando <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
+  <!-- Content description of individual recents task. -->
+  <string name="accessibility_recents_task_header"><xliff:g id="app" example="Chrome">%1$s</xliff:g> <xliff:g id="activity_label" example="www.google.com">%2$s</xliff:g></string>
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
   <string name="accessibility_notification_dismissed">Notificación inorada</string>
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_notification_shade">Pantalla de notificaciones</string>
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_quick_settings">Axustes rápidos</string>
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_lock_screen">Pantalla de bloquéu.</string>
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_settings">Axustes</string>
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_recent_apps">Perspeutiva.</string>
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <string name="accessibility_desc_close">Zarrar</string>
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_user">Usuariu <xliff:g id="USER">%s</xliff:g></string>
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>.</string>
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi_changed_off">Wifi apagada.</string>
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi_changed_on">Wifi prendida.</string>
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_mobile">Móvil <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>
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery">Batería <xliff:g id="STATE">%s</xliff:g></string>
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_off">Mou avión apagáu.</string>
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_on">Mou avión prendíu.</string>
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_changed_off">Mou avión apagáu.</string>
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_changed_on">Mou avión prendíu.</string>
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_dnd_priority_on">Nun molestar activáu (namái prioridá)</string>
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_dnd_none_on">Nun molestar activáu, silenciu total.</string>
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_dnd_alarms_on">Nun molestar activáu, namái alarmes.</string>
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_dnd_off">Nun molestar desactiváu.</string>
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_dnd_changed_off">Nun molestar desactiváu.</string>
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_dnd_changed_on">Nun molestar activáu.</string>
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_off">Bluetooth desactiváu.</string>
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_on">Bluetooth prendíu.</string>
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_connecting">Coneutando Bluetooth.</string>
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_connected">Bluetooth coneutáu.</string>
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_changed_off">Bluetooth desconeutáu.</string>
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_changed_on">Bluetooth coneutáu.</string>
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_off">Informe de llocalización desactiváu</string>
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_on">Informe de llocalización activáu</string>
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_off">Informe de llocalización apagáu</string>
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_on">Informe de llocalización prendíu</string>
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_alarm">L\'alarma va sonar a les <xliff:g id="TIME">%s</xliff:g>.</string>
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_close">Zarrar panel.</string>
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_more_time">Más tiempu.</string>
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_less_time">Menos tiempu.</string>
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_off">Llinterna apagada.</string>
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_on">Llinterna prendida.</string>
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_changed_off">Llinterna desconeutada.</string>
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_changed_on">Llinterna coneutada.</string>
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_color_inversion_changed_off">Inversión de color apagáu</string>
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_color_inversion_changed_on">Inversión de color prendíu</string>
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_hotspot_changed_off">Puntu d\'accesu móvil apagáu</string>
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_hotspot_changed_on">Puntu d\'accesu móvil prendíu</string>
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_casting_turned_off">Pantalla d\'emisión parada.</string>
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_brightness">Amosar brillu</string>
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <string name="data_usage_disabled_dialog_3g_title">Posáronse los datos 2G-3G</string>
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <string name="data_usage_disabled_dialog_4g_title">Posáronse los datos 4G</string>
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <string name="data_usage_disabled_dialog_mobile_title">Datos móviles en posa</string>
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <string name="data_usage_disabled_dialog_title">Datos posaos</string>
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <string name="data_usage_disabled_dialog">Darréu qu\'algamóse la llende de datos afitada, el preséu paró l\'usu de datos pal restu d\'esti ciclu.\n\nReanudar esto, podría tener como resultáu cargos del fornidor.</string>
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <string name="data_usage_disabled_dialog_enable">Reanudar</string>
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
   <string name="status_bar_settings_signal_meter_disconnected">Ensin conexón a Internet</string>
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
   <string name="status_bar_settings_signal_meter_wifi_nossid">Con conexón Wi-Fi</string>
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
   <string name="gps_notification_searching_text">Guetando GPS</string>
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
   <string name="gps_notification_found_text">Llocalización definida por GPS</string>
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
   <string name="accessibility_location_active">Solicitúes de llocalización actives</string>
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_clear_all">Llimpiar toles notificaciones</string>
+  <!-- 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">Axustes de notificaciones</string>
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
   <string name="status_bar_notification_app_settings_title">Axustes <xliff:g id="app_name" example="Calendar">%s</xliff:g></string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_off">La pantalla va xirar automáticamente.</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_landscape">La pantalla ta bloquiada en mou horizontal.</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_portrait">La pantalla ta bloquiada en mou vertical.</string>
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_off_changed">La pantalla va xirar agora automáticamente.</string>
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_landscape_changed">La pantalla ta bloquiada en mou horizontal.</string>
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_portrait_changed">La pantalla ta bloquiada en mou vertical.</string>
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
   <string name="dessert_case">Caxa para postres</string>
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
   <string name="start_dreams">Curiapantalles</string>
+  <!-- Textual description of Ethernet connections -->
   <string name="ethernet_label">Ethernet</string>
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_dnd_label">Nun molestar</string>
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_dnd_priority_label">Namái prioridá</string>
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_dnd_alarms_label">Namái alarmes</string>
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_dnd_none_label">Silenciu total</string>
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_label">Bluetooth</string>
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_multiple_devices_label">Bluetooth (<xliff:g id="NUMBER">%d</xliff:g> preseos)</string>
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_off_label">Bluetooth desactiváu</string>
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_detail_empty_text">Nun hai disponibles preseos empareyaos</string>
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_label">Brillu</string>
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rotation_unlocked_label">Xiru-auto</string>
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rotation_locked_label">Xiru bloquiáu</string>
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rotation_locked_portrait_label">Retratu</string>
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rotation_locked_landscape_label">Paisaxe</string>
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
   <string name="quick_settings_ime_label">Métodu d\'entrada</string>
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_label">Llocalización</string>
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_off_label">Llocalización desactivada</string>
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
   <string name="quick_settings_media_device_label">Preséu multimedia</string>
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_label">RSSI</string>
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_emergency_only">Namái llamaes d\'emerxencia</string>
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
   <string name="quick_settings_settings_label">Axustes</string>
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
   <string name="quick_settings_time_label">Hora</string>
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_label">Yo</string>
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_title">Usuariu</string>
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_new_user">Usuariu nuevu</string>
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_label">Wi-Fi</string>
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_not_connected">Non coneutáu</string>
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_no_network">Nun hai rede.</string>
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_off_label">Wi-Fi desactiváu</string>
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_wifi_detail_empty_text">Nun hai redes Wi-Fi disponibles</string>
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_cast_title">Tresmitir</string>
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
   <string name="quick_settings_casting">Emisión</string>
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cast_device_default_name">Preséu ensin nome</string>
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cast_device_default_description">Preparáu pa emitir</string>
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cast_detail_empty_text">Nun hai preseos disponibles</string>
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_title">Brillu</string>
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_auto_brightness_label">AUTO</string>
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_inversion_label">Invertir colores</string>
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_color_space_label">Mou de correición de color</string>
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_more_settings">Más axustes</string>
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_done">Fecho</string>
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_connected">Coneutáu</string>
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_connecting">Coneutando...</string>
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_tethering_label">Anclaxe a rede</string>
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_hotspot_label">Hotspot</string>
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
   <string name="quick_settings_notifications_label">Notificaciones</string>
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
   <string name="quick_settings_flashlight_label">Llinterna</string>
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_title">Datos móvil</string>
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_usage">Usu de datos</string>
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_remaining_data">Datos restantes</string>
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_used"><xliff:g id="data_used" example="2.0 GB">%s</xliff:g> usaos</string>
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_limit">Llende <xliff:g id="data_limit" example="2.0 GB">%s</xliff:g></string>
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_warning">Avisu <xliff:g id="data_limit" example="2.0 GB">%s</xliff:g></string>
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
   <string name="recents_empty_message">Les tos pantalles recientes apaecen equí</string>
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
   <string name="recents_app_info_button_label">Info d\'aplicación</string>
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
   <string name="recents_search_bar_label">guetar</string>
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
   <string name="recents_launch_error_message">Nun pudo aniciase <xliff:g id="app" example="Calendar">%s</xliff:g>.</string>
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <string name="recents_dismiss_all_message">Descartar toles apps</string>
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <string name="recents_multistack_add_stack_dialog_split_horizontal">División horizontal</string>
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <string name="recents_multistack_add_stack_dialog_split_vertical">División vertical</string>
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <string name="recents_multistack_add_stack_dialog_split_custom">División personalizada</string>
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_charged">Cargada</string>
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_charging">Cargando</string>
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_charging_with_time">Queden <xliff:g id="charging_time" example="2 hrs 25 min">%s</xliff:g> cargando</string>
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_not_charging">Nun se ta cargando</string>
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
   <string name="battery_meter_very_low_overlay_symbol">!</string>
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
   <string name="ssl_ca_cert_warning">La rede pue\nsupervisase</string>
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="description_target_search">Guetar</string>
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="description_direction_up">Esliza\'l deu hacia arriba pa <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="description_direction_left">\"Esliza\'l deu hacia la esquierda pa <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <string name="zen_priority_introduction">Nun van molestate los soníos nin les vibraciones, sacante que seyan alarmes, recordatorios, eventos y emisores qu\'especifiques.</string>
+  <!-- Zen mode: Priority only customization button label -->
+  <string name="zen_priority_customize_button">Personalizar</string>
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <string name="zen_silence_introduction_voice">Esta aición bloquia TOLOS soníos y les vibraciones, incluyíes les que remanecen d\'alarmes, vídeos y xuegos. Vas poder facer llamaes telefóniques.</string>
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <string name="zen_silence_introduction">Esta aición bloquia TOLOS soníos y les vibraciones, incluyíes les que remanecen d\'alarmes, vídeos y xuegos.</string>
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
   <string name="keyguard_more_overflow_text">+<xliff:g id="number_of_notifications" example="5">%d</xliff:g></string>
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
   <string name="speed_bump_explanation">Notificaciones menos urxentes, debaxo</string>
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
   <string name="notification_tap_again">Toca otra vuelta p\'abrir</string>
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
   <string name="keyguard_unlock">Eslizar arriba pa desbloquiar</string>
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <string name="phone_hint">Esliza\'l deu pa desbloquiar el teléfonu</string>
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <string name="voice_hint">Esliza\'l deu dende l\'iconu p\'abrir encontu de voz</string>
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <string name="camera_hint">Esliza\'l deu p\'acceder a la cámara</string>
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <string name="interruption_level_none_with_warning">Silenciu total. Tamién van silenciase los llectores de pantalla.</string>
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <string name="interruption_level_none">Silenciu total</string>
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <string name="interruption_level_priority">Namái prioridá</string>
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <string name="interruption_level_alarms">Namái alarmes</string>
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <string name="interruption_level_none_twoline">Silenciu\ntotal</string>
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <string name="interruption_level_priority_twoline">Namái\nprioridá</string>
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <string name="interruption_level_alarms_twoline">Namái\nalarmes</string>
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time">Cargando (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar)</string>
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <string name="keyguard_indication_charging_time_fast">Carga rápida (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar la carga)</string>
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <string name="keyguard_indication_charging_time_slowly">Carga lenta (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> pa completar la carga)</string>
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Camudar usuariu</string>
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <string name="accessibility_multi_user_switch_switcher_with_current">Cambiar usuariu, usuariu actual <xliff:g id="current_user_name" example="John Doe">%s</xliff:g></string>
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <string name="accessibility_multi_user_switch_inactive">L\'usuariu actual ye <xliff:g id="current_user_name" example="John Doe">%s</xliff:g></string>
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
   <string name="accessibility_multi_user_switch_quick_contact">Amosar perfil</string>
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
   <string name="user_add_user">Amestar usuariu</string>
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
   <string name="user_new_user_name">Usuariu nuevu</string>
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
   <string name="guest_nickname">Convidáu</string>
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
   <string name="guest_new_guest">Amestar convidáu</string>
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
   <string name="guest_exit_guest">Desaniciar convidáu</string>
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
   <string name="guest_exit_guest_dialog_title">Desaniciar convidáu?</string>
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
   <string name="guest_exit_guest_dialog_message">Van desaniciase toles apps y datos nesta sesión.</string>
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
   <string name="guest_exit_guest_dialog_remove">Desaniciar</string>
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
   <string name="guest_wipe_session_title">Bienllegáu otra vuelta, convidáu!</string>
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
   <string name="guest_wipe_session_message">Quies continuar la to sesión?</string>
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
   <string name="guest_wipe_session_wipe">Aniciar sesión nueva</string>
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
   <string name="guest_wipe_session_dontwipe">Sí, siguir</string>
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <string name="guest_notification_title">Usuariu convidáu</string>
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <string name="guest_notification_text">Pa desaniciar aplicaciones y datos, desanicia l\'usuariu convidáu</string>
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <string name="guest_notification_remove_action">DESANICIAR CONVIDÁU</string>
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
   <string name="user_add_user_title" msgid="2108112641783146007">Amestar usuariu nuevu?</string>
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
   <string name="user_add_user_message_short" msgid="1511354412249044381">Cuando amiestes un usuariu nuevu, esi usuariu necesita configurar el so espaciu\n\nCualquier usuariu pue anovar apps pa otros usuarios. </string>
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
   <string name="battery_saver_notification_title">L\'aforrador de batería ta activáu</string>
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
   <string name="battery_saver_notification_text">Amenorga los datos de rindimientu y de fondu</string>
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
   <string name="battery_saver_notification_action_text">Prender l\'aforrador d\'enerxía</string>
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
   <string name="notification_hidden_text">Conteníos anubríos</string>
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
   <string name="media_projection_dialog_text"><xliff:g id="app_seeking_permission" example="Hangouts">%s</xliff:g> va empezar a capturar tolo que s\'amuese na pantalla.</string>
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
   <string name="media_projection_remember_text">Nun amosar más</string>
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
   <string name="clear_all_notifications_text">Llimpiar too</string>
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
   <string name="media_projection_action_text">Aniciar agora</string>
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
   <string name="empty_shade_text">Nun tienes notificaciones</string>
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
   <string name="device_owned_footer">El preséu pue ser monitoreáu</string>
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
   <string name="profile_owned_footer">El perfil pue ser monitoreáu</string>
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
   <string name="vpn_footer">La rede pue ser monitoreada</string>
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
   <string name="monitoring_title_device_owned">Monitoréu de preseos</string>
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
   <string name="monitoring_title_profile_owned">Monitoréu de perfiles</string>
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
   <string name="monitoring_title">Monitoréu de rede</string>
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
   <string name="disable_vpn">Deshabilitar VPN</string>
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
   <string name="disconnect_vpn">Desconeutar VPN</string>
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <string name="monitoring_description_device_owned"><xliff:g id="ORGANIZATION">%1$s</xliff:g> xestiona\'l to preséu.\n\nL\'alministrador pue supervisar y alministra la configuración, l\'accesu corporativu, les aplicaciones, los datos asociaos a esti preséu y la información de llocalización del preséu. Pa obtener más información, comunícate col alministrador.</string>
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <string name="monitoring_description_vpn">Disti permisu a una app p\'afitar una conexón VPN.\n\nEsta app pue monitorear el preséu y l\'actividá de rede, incluyendo correos, apps y webs.</string>
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <string name="monitoring_description_vpn_device_owned"><xliff:g id="ORGANIZATION">%1$s</xliff:g> xestiona\'l to preséu.\n\nL\'alministrador pue supervisar y alministra la configuración, l\'accesu corporativu, les aplicaciones, los datos asociaos a esti preséu y la información de llocalización del preséu. Pa obtener más información, comunícate col alministrador.\n\nTamién tienes una conexón VPN, que pue supervisar l\'actividá de la rede (corréu-e, apps y sitios web).\n\nPa tener más información, contauta col alministrador.</string>
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <string name="monitoring_description_vpn_profile_owned"><xliff:g id="organization">%1$s</xliff:g> xestiona\'l to perfil de trabayu.\n\nL\'alministrador pue supervisar l\'actividá de la rede, incluyíos los correos-e, les apps y los sitios web.\n\nPa obtener más información, comunícate col alministrador.\n\nTamién tienes conexón a una VPN, que pue supervisar l\'actividá de la to rede.</string>
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <string name="legacy_vpn_name">VPN</string>
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <string name="monitoring_description_app">Tas coneutáu a <xliff:g id="application">%1$s</xliff:g>, que pue monitorear la to actividá personal na rede, correos, apps y sitios web.</string>
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <string name="monitoring_description_app_personal">Tas coneutáu a <xliff:g id="application">%1$s</xliff:g>, que pue monitorear la to actividá personal na rede, correos, apps y sitios web.</string>
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <string name="monitoring_description_app_work"><xliff:g id="organization">%1$s</xliff:g> xestiona\'l to perfil de trabayu. Ta coneutáu a <xliff:g id="application">%2$s</xliff:g>, que pue supervisar l\'actividá de la rede, incluyíos los correos-e, les apps y los sitios web.\n\nPa obtener más información, contauta col alministrador.</string>
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <string name="monitoring_description_app_personal_work"><xliff:g id="organization">%1$s</xliff:g> xestiona\'l to perfil de trabayu. Ta coneutáu a <xliff:g id="application_work">%2$s</xliff:g>, que pue supervisar l\'actividá de la rede, incluyíos los correos-e, les apps y los sitios web.\n\nTamién tas coneutáu a <xliff:g id="application_personal">%3$s</xliff:g>, que pue monitorear la to actividá personal na rede.</string>
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <string name="monitoring_description_vpn_app_device_owned"><xliff:g id="ORGANIZATION">%1$s</xliff:g> xestiona\'l to preséu.\n\nL\'alministrador pue supervisar y alministra la configuración, l\'accesu corporativu, les aplicaciones, los datos asociaos a esti preséu y la información de llocalización del preséu.\n\nTienes conexón a <xliff:g id="APPLICATION">%2$s</xliff:g>, que pue supervisar l\'actividá de la rede, incluidos los correos electrónicos, les aplicaciones y los sitios web.\n\nPa obtener más información, comunícate col alministrador.</string>
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
   <string name="keyguard_indication_trust_disabled">El preséu va tar bloquiáu hasta que lu desbloquies manualmente</string>
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
   <string name="hidden_notifications_title">Obtener notificaciones más rápido</string>
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
   <string name="hidden_notifications_text">Veles enantes de desbloquiar</string>
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
   <string name="hidden_notifications_cancel">Non, gracies</string>
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
   <string name="hidden_notifications_setup">Configurar</string>
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <string name="notification_expand_button_text">Ver toes</string>
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <string name="notification_collapse_button_text">Anubrir toes</string>
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
   <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string>
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <string name="volume_zen_end_now">Finar agora</string>
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <string name="accessibility_volume_expand">Espander</string>
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <string name="accessibility_volume_collapse">Contrayer</string>
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <string name="volumeui_prompt_message"><xliff:g id="app_name" example="Volume Prototype 1">%1$s</xliff:g> quier ser el cuadru de diálogu de volume.</string>
+  <!-- VolumeUI activation dialog: allow button label -->
+  <string name="volumeui_prompt_allow">Permitir</string>
+  <!-- VolumeUI activation dialog: deny button label -->
+  <string name="volumeui_prompt_deny">Ñegar</string>
+  <!-- VolumeUI restoration notification: title -->
+  <string name="volumeui_notification_title"><xliff:g id="app_name" example="Volume Prototype 1">%1$s</xliff:g> ye\'l diálogu de volume</string>
+  <!-- VolumeUI restoration notification: text -->
+  <string name="volumeui_notification_text">Toca pa restaurar l\'orixinal.</string>
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <string name="managed_profile_foreground_toast">Tas usando\'l to perfil de trabayu</string>
+  <!-- Name of special SystemUI debug settings -->
+  <string name="system_ui_tuner">Sintonizador de IU del sistema</string>
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <string name="show_battery_percentage">Amosar porcentaxe de la batería integrada</string>
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <string name="show_battery_percentage_summary">Amosar porcentaxe del nivel de batería nel iconu de la barra d\'estáu cuando nun se ta cargando</string>
+  <!-- Name of quick settings -->
+  <string name="quick_settings">Axustes rápidos</string>
+  <!-- Name of status bar -->
+  <string name="status_bar">Barra d\'estáu</string>
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <string name="demo_mode">Mou desmostración</string>
+  <!-- Enable demo mode -->
+  <string name="enable_demo_mode">Activar el mou de demostración</string>
+  <!-- Show demo mode icons -->
+  <string name="show_demo_mode">Amosar mou demo</string>
+  <!-- Name of the ethernet status bar icon. -->
   <string name="status_bar_ethernet">Ethernet</string>
+  <!-- Name of the alarm status bar icon. -->
+  <string name="status_bar_alarm">Alarma</string>
+  <!-- Name of the work status bar icon. -->
+  <string name="status_bar_work">Perfil de trabayu</string>
+  <!-- Name of the airplane status bar icon. -->
   <string name="status_bar_airplane">Mou avión</string>
+  <!-- Description for adding  a quick settings tile -->
+  <string name="add_tile">Amestar mosaicu</string>
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <string name="broadcast_tile">Mosaicu de tresmisión</string>
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <string name="regrettable_lack_of_easter_egg">
+        ¯\\_(ツ)_/¯
+    </string>
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <string name="zen_alarm_warning_indef">Nun vas sentir la próxima alarma a la(les) <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g> sacantes que desactives esta enantes</string>
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <string name="zen_alarm_warning">Nun vas sentir la próxima alarma a la(les) <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g></string>
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <string name="alarm_template">a la(les) <xliff:g id="when" example="at 7:00 AM">%1$s</xliff:g></string>
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <string name="alarm_template_far">el <xliff:g id="WHEN">%1$s</xliff:g></string>
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_detail">Configuración rápida: <xliff:g id="TITLE">%s</xliff:g></string>
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
   <string name="accessibility_status_bar_hotspot">Hotspot</string>
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <string name="accessibility_managed_profile">Perfil de trabayu</string>
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <string name="tuner_warning_title">Diversión pa dalgunos, pero non pa toos</string>
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <string name="tuner_warning">El sintonizador de IU del sistema date más formes pa editar y personalizar la interfaz d\'usuariu d\'Android. Estes funciones esperimentales puen camudar, dexar de furrular, o nun incluyise en versiones futures. Procede con precuru.</string>
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <string name="tuner_persistent_warning">Estes funciones esperimentales puen camudar, dexar de furrular, o nun incluyise en versiones futures. Procede con precuru.</string>
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <string name="tuner_toast">Amestóse\'l sintonizador de IU del sistema a Axustes</string>
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <string name="remove_from_settings">Quitar de Axustes</string>
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <string name="remove_from_settings_prompt">¿Quies quitar el sintonizador de IU del sistema de Axustes y dexar d\'usar toles sos funciones?</string>
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <string name="enable_bluetooth_title">¿Prender Bluetooth?</string>
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <string name="enable_bluetooth_message">Pa coneutar el tecláu cola tablet, primero tienes d\'activar Bluetooth.</string>
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
   <string name="enable_bluetooth_confirmation_ok">Activar</string>
 </resources>
diff --git a/packages/SystemUI/res/values-az-rAZ/cm_arrays.xml b/packages/SystemUI/res/values-az-rAZ/cm_arrays.xml
index da47b5a..4d75e51 100644
--- a/packages/SystemUI/res/values-az-rAZ/cm_arrays.xml
+++ b/packages/SystemUI/res/values-az-rAZ/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>Şi</item>
+    <!-- North -->
     <item>ŞŞ</item>
+    <!-- North east -->
     <item>Şə</item>
+    <!-- East -->
     <item>CŞ</item>
+    <!-- South east -->
     <item>C</item>
+    <!-- South -->
     <item>CQ</item>
+    <!-- South west -->
     <item>Q</item>
+    <!-- West -->
     <item>ŞQ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-az-rAZ/cm_strings.xml b/packages/SystemUI/res/values-az-rAZ/cm_strings.xml
index d7414f7..d9b0088 100644
--- a/packages/SystemUI/res/values-az-rAZ/cm_strings.xml
+++ b/packages/SystemUI/res/values-az-rAZ/cm_strings.xml
@@ -16,12 +16,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">%1$s üçün sağa sürüşdürün</string>
   <string name="right_shortcut_hint">%1$s üçün sola sürüşdürün</string>
   <string name="select_application">Tətbiqetmə seç</string>
   <string name="lockscreen_choose_action_title">Hərəkət seç</string>
   <string name="lockscreen_none_target">Yoxdur</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Hərəkət seçin</string>
   <string name="navbar_home_button">Əsas ekran düyməsi</string>
   <string name="navbar_recent_button">Son tətb. düyməsi</string>
@@ -33,14 +42,25 @@
   <string name="navbar_menu_big_button">Menyu düyməsi</string>
   <string name="accessibility_dpad_left">Sol kursor</string>
   <string name="accessibility_dpad_right">Sağ kursor</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Tətbiq verilənlərini sil</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Dayanmağa məcbur et</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Çıxart</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profillər bağlıdır.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profillər bağlıdır.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed"><xliff:g id="profile" example="Default">%s</xliff:g> profilinə keçildi.</string>
   <string name="quick_settings_compass_init">Başladılır\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Ekrandan çıxarılana qədər görsənəcək. Çıxartmaq üçün Geri düyməsinə toxunub basılı tutun.</string>
   <string name="quick_settings_custom_tile_detail_title">Özəl kvadrat</string>
   <string name="quick_settings_remove">Kvadratı çıxart</string>
@@ -51,9 +71,14 @@
   <string name="quick_settings_profiles_off">Profillər ləğv edildi</string>
   <string name="quick_settings_heads_up_label">Açılan başlıqlar</string>
   <string name="quick_settings_battery_saver_label">Batereyaya qənaət</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Eyniləşdirmə bağlıdır.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Eyniləşdirmə açıqdır.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Eyniləşdirmə bağlanıldı.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Eyniləşdirmə açıldı.</string>
   <string name="quick_settings_sync_label">Eyniləşdirmə</string>
   <string name="quick_settings_volume_panel_label">Səs paneli</string>
@@ -62,58 +87,102 @@
   <string name="quick_settings_lockscreen_label">Kilid ekranı</string>
   <string name="quick_settings_ambient_display_label">Bildiriş ekranı</string>
   <string name="quick_settings_lockscreen_label_enforced">Kilit ekranı məcburidir</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Ekrana qoyulan vaxt: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Ekrana qoyulan vaxt <xliff:g id="timeout" example="30 seconds">%s</xliff:g> olaraq tənzimləndi.</string>
   <string name="qs_tile_performance">Batereya rejimi</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Batereya rejimi: enerjiyə qənaəti rejimi.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Batereya rejimi: tarazlaşdırılmış rejim.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Batereya rejimi: performans rejimi.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Batareya rejimi: səmərəli rejim.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Batereya rejimi: cəld rejim.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Batereya rejimi enerjiyə qənaət rejiminə keçdi.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Batereya rejimi tarazlaşdırılmış rejimə keçdi.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Batereya rejimi performans rejiminə keçdi.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Batereya rejimi səmərəli rejimə keçdi.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Batereya rejimi cəld rejiminə keçdi.</string>
   <string name="quick_settings_performance_profile_detail_title">Batereya rejimi</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Kilit ekranı bağlıdır.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Kilit ekranı açıldı.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Kilit ekranı bağlanıldı.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Kilit ekranı açıldı.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Bildiriş ekranı bağlıdır.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Bildiriş ekranı açıqdır.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Bildiriş ekranı bağlanıldı.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Bildiriş ekranı açıldı.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Açılan başlıq bildirişi bağlıdır.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Açılan başlıq bildişi açıqdır.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Açılan başlıq bildirişi bağlanıldı.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Açılan başlıq bildirişi açıldı.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Batereyaya qənaət bağlıdır.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Batereyaya qənaət açıqdır.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Batereyaya qənaət bağlanıldı.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Batereyaya qənaət açıldı.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dinamik kvadrat</string>
   <string name="dynamic_qs_tile_next_alarm_label">Növbəti zəngli saat</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME seçici</string>
   <string name="dynamic_qs_tile_su_label">Root müraciəti</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay bağlıdır.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: avtomatik rejim.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: gündüz rejimi.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: gecə rejimi.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: açıq hava rejimi.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay bağlanıldı.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay avtomatik rejimə keçdi.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay gündüz rejiminə keçdi.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay gecə rejiminə keçdi.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay açıq hava rejiminə keçdi.</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Yer hesabatı: batareyaya qənaət rejimi.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Yer hesabatı: yalnız sensorlar rejimi.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Yer hesabatı: yüksək həssaslıq rejimi.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Yer rejimi</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Batareyaya qənaət</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Yalnız cihaz</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Yüksək həssaslıq</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Yer bildirişi batereyaya qənaət rejiminə keçdi.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Yer bildirişi yalnız sensorlar rejiminə keçdi.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Yer bildirişi yüksək dəqiqlik rejiminə keçdi.</string>
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Modul batareya faizi <xliff:g id="number">%d</xliff:g>.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Oynatma sırasını göstər</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-be/cm_arrays.xml b/packages/SystemUI/res/values-be/cm_arrays.xml
index 5a2d012..e41fd7f 100644
--- a/packages/SystemUI/res/values-be/cm_arrays.xml
+++ b/packages/SystemUI/res/values-be/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>Паўночны</item>
+    <!-- North -->
     <item>Паўночна-Усходні</item>
+    <!-- North east -->
     <item>Усходні</item>
+    <!-- East -->
     <item>Паўднёва-Усходні</item>
+    <!-- South east -->
     <item>Паўднёвы</item>
+    <!-- South -->
     <item>Паўднёва-Заходні</item>
+    <!-- South west -->
     <item>Заходні</item>
+    <!-- West -->
     <item>Паўночна-Заходні</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-be/cm_strings.xml b/packages/SystemUI/res/values-be/cm_strings.xml
index 65a09b6..4db516e 100644
--- a/packages/SystemUI/res/values-be/cm_strings.xml
+++ b/packages/SystemUI/res/values-be/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Правядзіце направа, каб адкрыць дадатак %1$s</string>
   <string name="right_shortcut_hint">Правядзіце налева, каб адкрыць дадатак %1$s</string>
   <string name="lockscreen_message">Націсніце значок злева альбо справа для змянення цэтліка экрана блакавання.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Выбар дадатку</string>
   <string name="lockscreen_choose_action_title">Выбар дзеяння</string>
   <string name="lockscreen_none_target">Нічога</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Выберыце дзеянне</string>
   <string name="navbar_home_button">Дамоў</string>
   <string name="navbar_recent_button">Запушчаныя дадаткі</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Меню</string>
   <string name="accessibility_dpad_left">Курсор налева</string>
   <string name="accessibility_dpad_right">Курсор направа</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Сцерці дадзеныя</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Спыніць прымусова</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Выдаліць</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Яскравасць</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Профілі выключаны.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Профіль: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Профілі выключаны.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Профіль зменены на <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Ініцыялізацыя\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Індыкатар падзей</string>
   <string name="led_notification_text">Светадыёд уключаны параметрамі</string>
   <string name="qs_tile_edit_header_instruction">Націсніце і ўтрымвайце плітку для змены</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Звесткі пра надвор\'е</string>
   <string name="quick_settings_title_show_brightness_slider">Паказваць рэгулятар яскравасці</string>
   <string name="quick_settings_title_enlarge_first_row">Павялічыць першы рад</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Гэты дадатак застанецца актыўным, пакуль вы не скасуеце блакаванне доўгім націскам кнопкі \"Назад\".</string>
   <string name="quick_settings_custom_tile_detail_title">Карыстальніцкая плітка</string>
   <string name="quick_settings_remove">Выдаліць плітку</string>
@@ -68,9 +88,14 @@
   <string name="quick_settings_profiles_off">Профілі адключаны</string>
   <string name="quick_settings_heads_up_label">Усплывальныя паведамленні</string>
   <string name="quick_settings_battery_saver_label">Энергазахавання</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Сінхранізацыя адключаная.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Сінхранізацыя ўключана.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Сінхранізацыя адключаная.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Сінхранізацыя ўключана.</string>
   <string name="quick_settings_sync_label">Сінхранізацыя</string>
   <string name="quick_settings_volume_panel_label">Панэль гучнасці</string>
@@ -79,61 +104,110 @@
   <string name="quick_settings_lockscreen_label">Экран блакіроўкі</string>
   <string name="quick_settings_ambient_display_label">Індыкацыя падзей</string>
   <string name="quick_settings_lockscreen_label_enforced">Блакаванне экрана ўключана</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Адключаны профілем</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Час да выключэння экрана: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Час да выключэння экрана зменены на <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Энергаспажыванне</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Рэжым батарэі: энергазахавальны.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Рэжым батарэі: збалансаваны.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Рэжым батарэі: прадукцыйны.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Рэжым энергаспажывання: эфектыўны.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Рэжым энергаспажывання: прадукцыйнасць.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Рэжым батарэі зменены на энергазахавальны.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Рэжым батарэі зменены на збалансаваны.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Рэжым батарэі зменены на прадукцыйны.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Рэжым энергаспажывання зменены на эфектыўны.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Рэжым энергаспажывання зменены на прадукцыйны.</string>
   <string name="quick_settings_performance_profile_detail_title">Энергаспажыванне</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Экран блакавання выключаны.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Экран блакавання ўключаны.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Экран блакавання выключаны.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Экран блакавання ўключаны.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Індыкацыя падзей экранам адключаная.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Індыкацыя падзей экранам уключана.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Індыкацыя падзей экранам адключаная.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Індыкацыя падзей экранам уключана.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Усплывальныя паведамленні адключаны.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Усплывальныя паведамленні ўключаны.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Усплывальныя паведамленні адключаны.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Усплывальныя паведамленні ўключаны.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Рэжым энергазахавання вымкнуты.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Рэжым энергазахавання ўлучаны.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Рэжым энергазахавання вымкнуты.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Рэжым энергазахавання ўлучаны.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Дынамічная плітка</string>
   <string name="dynamic_qs_tile_next_alarm_label">Наступны будзільнік</string>
   <string name="dynamic_qs_tile_ime_selector_label">Выбар метаду ўводу</string>
   <string name="dynamic_qs_tile_su_label">Суперкарыстальнік</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay выключаны.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay працуе ў аўтаматычным рэжыме.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay працуе ў дзённым рэжыме.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay працуе ў начным рэжыме.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay працуе ў рэжыме \"на вуліцы\".</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay выключаны.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay пераключаны ў аўтаматычны рэжым.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay пераключаны ў дзённы рэжым.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay пераключаны ў начны рэжым.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay пераключаны ў рэжым \"на вуліцы\".</string>
   <string name="quick_settings_title_advanced_location">Налады адсылання геададзеных</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Адпраўка месцазнаходжання: рэжым эканоміі батарэі.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Адпраўка месцазнаходжання: толькі па GPS.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Адпраўка месцазнаходжання: рэжым высокай дакладнасці.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Вызначэнне месцазнаходжання</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Па каардынатах сеткі</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Па спадарожніках GPS</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Па ўсіх крыніцах</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Служба адпраўкі месцазнаходжання пераключана ў рэжым эканоміі батарэі.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Для адпраўкі месцазнаходжання выкарыстоўваюцца толькі дадзеныя GPS.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Служба адпраўкі месцазнаходжання пераключана ў рэжым высокай дакладнасці.</string>
   <string name="quick_settings_tiles_category_system">Сістэмны пліткі</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Дадаць плітку</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Немагчыма падлучыцца да сеткі сотавай сувязі ў той час як рэжым палёту ўключаны. Адключыце рэжым палёту і паспрабуйце ізноў.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Выбліск уключаны</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Націсніце, каб уключыць</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Няма дадзеных SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Зарад батарэі док-станцыі <xliff:g id="number">%d</xliff:g> адсоткаў.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Паказаць чаргу прайгравання</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml
index 7f9d3ea..bcd4e8d 100644
--- a/packages/SystemUI/res/values-be/strings.xml
+++ b/packages/SystemUI/res/values-be/strings.xml
@@ -18,9 +18,453 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_mtp_button_title">Падлучыць як медыяпрайгравальнік (MTP)</string>
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="installer_cd_button_title">Усталяваць праграму Android File Transfer для Mac</string>
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_connected">Bluetooth падлучаны.</string>
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_disconnected">Bluetooth адлучаны.</string>
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_airplane_mode">Рэжым лёту.</string>
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_flashlight_off">Ліхтарык выключаны.</string>
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_flashlight_on">Ліхтарык уключаны.</string>
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_hotspot_label">Кропка доступу</string>
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_flashlight_label">Ліхтарык</string>
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
   <string name="status_bar_airplane">Рэжым самалёту</string>
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <string name="accessibility_status_bar_hotspot">Кропка доступу</string>
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
 </resources>
diff --git a/packages/SystemUI/res/values-bg/cm_arrays.xml b/packages/SystemUI/res/values-bg/cm_arrays.xml
index d80936a..5558075 100644
--- a/packages/SystemUI/res/values-bg/cm_arrays.xml
+++ b/packages/SystemUI/res/values-bg/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>Север</item>
+    <!-- North -->
     <item>Северо-изток</item>
+    <!-- North east -->
     <item>Изток</item>
+    <!-- East -->
     <item>Юго-изток</item>
+    <!-- South east -->
     <item>Юг</item>
+    <!-- South -->
     <item>Юго-запад</item>
+    <!-- South west -->
     <item>Запад</item>
+    <!-- West -->
     <item>Северо-запад</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-bg/cm_strings.xml b/packages/SystemUI/res/values-bg/cm_strings.xml
index 6d6b9c3..18cc9ba 100644
--- a/packages/SystemUI/res/values-bg/cm_strings.xml
+++ b/packages/SystemUI/res/values-bg/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s </xliff:g> - <xliff:g id="condition">%2$s </xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Плъзнете надясно за %1$s</string>
   <string name="right_shortcut_hint">Плъзнете наляво за %1$s</string>
   <string name="lockscreen_message">Докоснете иконата в наляво или надясно, за да присвоите команда за бърз достъп при заключен на екран.</string>
@@ -26,28 +34,39 @@
   <string name="select_application">Изберете приложение</string>
   <string name="lockscreen_choose_action_title">Изберете действие</string>
   <string name="lockscreen_none_target">Няма</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Изберете действие</string>
   <string name="navbar_home_button">Начален бутон</string>
   <string name="navbar_recent_button">Последен бутон</string>
   <string name="navbar_search_button">Бутон за търсене</string>
-  <string name="navbar_back_button">Бутон \"назад\"</string>
+  <string name="navbar_back_button">Бутон \"Назад\"</string>
   <string name="navbar_empty_button">Празен бутон</string>
   <string name="navbar_menu_conditional_button">Меню бутон (Автоскриване)</string>
   <string name="navbar_menu_always_button">Меню бутон (Видим)</string>
   <string name="navbar_menu_big_button">Меню бутон</string>
   <string name="accessibility_dpad_left">Курсора наляво</string>
   <string name="accessibility_dpad_right">Курсора надясно</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Изтриване данни на приложението</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Принудително спиране</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Деинсталиране</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Яркостта на светлината</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Изключени профили.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Профил: <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Профилите са изключени.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Профила е сменен с <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
   <string name="quick_settings_compass_init">Стартиране на\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Настройки на светлината</string>
-  <string name="led_notification_text">LED светлини, разрешени в настройките</string>
+  <string name="led_notification_text">Светлинните индикации са разрешени от настройките</string>
   <string name="qs_tile_edit_header_instruction">Натиснете и задръжте плочка за да я пренаредите или премахнете</string>
   <string name="quick_settings_edit_label">Редактиране на плочки</string>
   <string name="quick_settings_cannot_delete_edit_tile">Не може да изтрие редактираната на плочка</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Показване на времето</string>
   <string name="quick_settings_title_show_brightness_slider">Показване на плъзгача за яркост</string>
   <string name="quick_settings_title_enlarge_first_row">Уголемяване на първия ред</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Това допълнение ще остане активено, докато не натиснете и зъдържите на бутона \"Назад\".</string>
   <string name="quick_settings_custom_tile_detail_title">Персонализирана плочка</string>
   <string name="quick_settings_remove">Премахни на плочки</string>
@@ -68,79 +88,139 @@
   <string name="quick_settings_profiles_off">Деактивирани профили</string>
   <string name="quick_settings_heads_up_label">Изскачащи известия</string>
   <string name="quick_settings_battery_saver_label">Пестене на батерия</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Пестене на батерията (зареждане)</string>
   <string name="quick_settings_caffeine_label">Кофеин</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Изключена синхронизация.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Включена синхронизация.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Синхронизацията е изключена.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Синхронизацията е включена.</string>
   <string name="quick_settings_sync_label">Синхронизация</string>
-  <string name="quick_settings_volume_panel_label">Панел на звука</string>
+  <string name="quick_settings_volume_panel_label">Звуков панел</string>
   <string name="quick_settings_usb_tether_label">Тетъринг през USB</string>
   <string name="quick_settings_screen_timeout_detail_title">Изключване на дисплея</string>
   <string name="quick_settings_lockscreen_label">Заключен екран</string>
-  <string name="quick_settings_ambient_display_label">Атмосферен екран</string>
+  <string name="quick_settings_ambient_display_label">Активен дисплей</string>
   <string name="quick_settings_lockscreen_label_enforced">Принудително заключен екран</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Деактивирано от профила</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Изключване на екрана след: <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Изключване на екрана е променен на <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
   <string name="qs_tile_performance">Режим на батерията</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Режим на батерията: Енергоспестяващ.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Режим на батерията: Балансиран.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Режим на батерията: Производителен.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Режим на батерията: Ефективен.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Режим на батерията: Скоростен.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Преминаване в режим Енергоспестяващ.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Преминаване в режим Балансиран.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Преминаване в режим Производителен.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Преминаване в режим Ефективност.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Преминаване в режим Скоростен.</string>
   <string name="quick_settings_performance_profile_detail_title">Режим на батерията</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Изключване на заключване на екрана.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Включване на заключване на екран.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Заключване екран е изключено.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Заключване екран е включено.</string>
-  <string name="accessibility_quick_settings_ambient_display_off">Атмосферен екран изключен.</string>
-  <string name="accessibility_quick_settings_ambient_display_on">Атмосферен екран включен.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_off">Атмосферен екран е изключен.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_on">Атмосферен екран е включен.</string>
-  <string name="accessibility_quick_settings_heads_up_off">Изключи Изскачащи съобщения.</string>
-  <string name="accessibility_quick_settings_heads_up_on">Включи Изскачащи съобщения.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">Активен дисплей е изключен.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">Активен дисплей е включен.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Активен дисплей е изключен.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Активен дисплей е включен.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Изключи изскачащи известия.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Включи изскачащи известия.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Изскачащите известия са изключени.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Изскачащите известия са включени.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Кофеин изключен.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Кофеин включен.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Режим за пестене на батерията изключен.</string>
-  <string name="accessibility_quick_settings_battery_saver_on">Режим за запазване на батерията нключен.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">Режим за пестене на батерията включен.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Режим за пестене на батерията е изключен.</string>
-  <string name="accessibility_quick_settings_battery_saver_changed_on">Пестене на батерията е включено.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Режим за пестене на батерията е включен.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Динамични плочки</string>
   <string name="dynamic_qs_tile_next_alarm_label">Следваща аларма</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME селектор</string>
-  <string name="dynamic_qs_tile_su_label">Root достъп</string>
-  <string name="accessibility_quick_settings_live_display_off">Изключи Адаптивен екран.</string>
-  <string name="accessibility_quick_settings_live_display_auto">Адаптивен екран: автоматичен режим.</string>
-  <string name="accessibility_quick_settings_live_display_day">Адаптивен екран: дневен режим.</string>
-  <string name="accessibility_quick_settings_live_display_night">Адаптивен екран: нощен режим.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">Адаптивен екран: външен режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">Адаптивен екран е изключен.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">Адаптивен екран е променен на автоматичен режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">Адаптивен екран е променен на дневен режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">Адаптивен екран е променен на нощен режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">Адаптивен екран е променен на външен режим.</string>
+  <string name="dynamic_qs_tile_su_label">Администраторски достъп</string>
+  <string name="dynamic_qs_tile_themes_label">Теми</string>
   <string name="quick_settings_title_advanced_location">Три-посочно местоположение</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Настройка на местоположение: икономичен режим на батерията.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Доклад на местоположение: само по GPS.</string>
-  <string name="accessibility_quick_settings_location_high_accuracy">Доклад на местоположение: прецизен режим.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">Доклад на местоположение: режим на висока точност.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Режим за местоположение</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Пестене на батерия</string>
-  <string name="quick_settings_location_gps_only_label">Само чрез GPS</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">Само по GPS</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Висока точност</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Доклад на местоположение променен в икономичен режим на батерията.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Доклад на местоположение променен в режим GPS.</string>
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">Доклад на местоположение променен в прецизен режим.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">Доклад на местоположение променен в режим с висока точнос.</string>
   <string name="quick_settings_tiles_category_system">Системни плочки</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Добавяне на плочка</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Свързването към мобилна мрежа не е възможно, докато сте в Самолетен режим. Изключете го и след това опитайте отново.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Фенерчето е включено</string>
   <string name="quick_settings_tile_flashlight_not_summary">Натиснете, за изключване</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d клиент</item>
+    <item quantity="other">%1$d клиента</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">СИМ картата не е конфигурирана</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Док батерия <xliff:g id="number">%d </xliff:g> процента.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Покажи опашка за изпълнение</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s </xliff:g> <xliff:g id="condition">%2$s </xliff:g></string>
+  <string name="expand_hint">Плъзнете надолу за разширяване</string>
+  <string name="swipe_left_hint">Плъзнете наляво за <xliff:g id="app_name">%1$s </xliff:g></string>
+  <string name="swipe_right_hint">Плъзнете надясно за известия</string>
 </resources>
diff --git a/packages/SystemUI/res/values-bn-rBD/cm_arrays.xml b/packages/SystemUI/res/values-bn-rBD/cm_arrays.xml
index e694747..26a6a84 100644
--- a/packages/SystemUI/res/values-bn-rBD/cm_arrays.xml
+++ b/packages/SystemUI/res/values-bn-rBD/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>উঃ</item>
+    <!-- North -->
     <item>উঃপূঃ</item>
+    <!-- North east -->
     <item>পূঃ</item>
+    <!-- East -->
     <item>দঃপূঃ</item>
+    <!-- South east -->
     <item>দঃ</item>
+    <!-- South -->
     <item>দঃপঃ</item>
+    <!-- South west -->
     <item>পঃ</item>
+    <!-- West -->
     <item>উঃপঃ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-bn-rBD/cm_strings.xml b/packages/SystemUI/res/values-bn-rBD/cm_strings.xml
index 8db74b9..4fcb247 100644
--- a/packages/SystemUI/res/values-bn-rBD/cm_strings.xml
+++ b/packages/SystemUI/res/values-bn-rBD/cm_strings.xml
@@ -16,6 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">দায়িত্ব অর্পণ পদক্ষেপ বেছে নিন</string>
   <string name="navbar_home_button">মূল বোতাম</string>
   <string name="navbar_recent_button">সাম্প্রতিক বোতাম</string>
@@ -26,8 +35,76 @@
   <string name="navbar_menu_big_button">মেনু বোতাম</string>
   <string name="accessibility_dpad_left">কার্সর বামে</string>
   <string name="accessibility_dpad_right">কার্সর ডানে</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">অ্যাপ ডাটা মুছে ফেলুন</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">জোরপূর্বক বন্ধ</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">আনইনস্টল</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_compass_init">আরম্ভ করা\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-br-rFR/cm_arrays.xml b/packages/SystemUI/res/values-br-rFR/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-br-rFR/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-br-rFR/cm_strings.xml b/packages/SystemUI/res/values-br-rFR/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-br-rFR/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-br-rFR/strings.xml b/packages/SystemUI/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-br-rFR/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-bs-rBA/cm_arrays.xml b/packages/SystemUI/res/values-bs-rBA/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-bs-rBA/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-bs-rBA/cm_strings.xml b/packages/SystemUI/res/values-bs-rBA/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-bs-rBA/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-bs-rBA/strings.xml b/packages/SystemUI/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-bs-rBA/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-ca/cm_arrays.xml b/packages/SystemUI/res/values-ca/cm_arrays.xml
index cb6fbec..85897e7 100644
--- a/packages/SystemUI/res/values-ca/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ca/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SO</item>
+    <!-- South west -->
     <item>O</item>
+    <!-- West -->
     <item>NO</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ca/cm_strings.xml b/packages/SystemUI/res/values-ca/cm_strings.xml
index ed84e26..8296219 100644
--- a/packages/SystemUI/res/values-ca/cm_strings.xml
+++ b/packages/SystemUI/res/values-ca/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Llisca a la dreta per %1$s</string>
   <string name="right_shortcut_hint">Llisca a l\'esquerra per %1$s</string>
   <string name="lockscreen_message">Toca una icona a l\'esquerra o a la dreta per reassignar una drecera a la pantalla de bloqueig.</string>
@@ -26,7 +34,8 @@
   <string name="select_application">Selecciona l\'aplicació</string>
   <string name="lockscreen_choose_action_title">Tria una acció</string>
   <string name="lockscreen_none_target">Cap</string>
-  <string name="navbar_dialog_title">Escull l\'acció a assignar</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">Tria l\'acció a assignar</string>
   <string name="navbar_home_button">Botó Inici</string>
   <string name="navbar_recent_button">Botó Recent</string>
   <string name="navbar_search_button">Botó Cerca</string>
@@ -37,27 +46,38 @@
   <string name="navbar_menu_big_button">Botó Menú</string>
   <string name="accessibility_dpad_left">Cursor esquerra</string>
   <string name="accessibility_dpad_right">Cursor dreta</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Neteja dades de l\'aplicació</string>
-  <string name="advanced_dev_option_force_stop">Força tancament</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">Força el tancament</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstal·la</string>
-  <string name="accessibility_notification_brightness">Brillantor dels llums</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Lluminositat</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Perfils desactivats.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Perfils: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">S\'han desactivat els perfils.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Perfil canviat a <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">S\'està inicialitzant\u2026</string>
-  <string name="led_notification_title">Ajustaments de llums</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Ajustaments de llum</string>
   <string name="led_notification_text">Llum LED habilitada per ajustos</string>
   <string name="qs_tile_edit_header_instruction">Prem i aguanta les cel·les per reordenar-les</string>
   <string name="quick_settings_edit_label">Edita cel·les</string>
   <string name="quick_settings_cannot_delete_edit_tile">No s\'ha pogut esborrar la cel·la Edita</string>
-  <string name="qs_tiles_reset_confirmation">Vols restaurar les cel·les d\'ajustaments ràpids a la configuració predeterminada?</string>
-  <string name="quick_settings_tile_reset_to_default">Restaura la disposició per defecte</string>
+  <string name="qs_tiles_reset_confirmation">Vols restablir les cel·les d\'ajustaments ràpids a la configuració predeterminada?</string>
+  <string name="quick_settings_tile_reset_to_default">Restableix la disposició per defecte</string>
   <string name="quick_settings_title_header">Capçalera</string>
   <string name="quick_settings_title_tiles">Cel·les</string>
   <string name="quick_settings_title_show_weather">Mostra el temps</string>
-  <string name="quick_settings_title_show_brightness_slider">Mostra la barra liscant de brillantor</string>
+  <string name="quick_settings_title_show_brightness_slider">Mostra la barra lliscant de lluminositat</string>
   <string name="quick_settings_title_enlarge_first_row">Engrandeix la primera fila</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Això ho manté a la vista fins que el desancoris. Toca i aguanta el botó Enrera per desancorar.</string>
   <string name="quick_settings_custom_tile_detail_title">Cel·la personalitzada</string>
   <string name="quick_settings_remove">Esborra cel·la</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Perfils desactivats</string>
   <string name="quick_settings_heads_up_label">Notificacions emergents</string>
   <string name="quick_settings_battery_saver_label">Estalvi de bateria</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Estalvi de bateria (carregant)</string>
   <string name="quick_settings_caffeine_label">Cafeïna</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sinc desactivada.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sinc activada.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">S\'ha desactivat la sincronització.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">S\'ha activat la sincronització.</string>
   <string name="quick_settings_sync_label">Sinc</string>
   <string name="quick_settings_volume_panel_label">Panell de volum</string>
@@ -81,66 +107,120 @@
   <string name="quick_settings_ambient_display_label">Pantalla ambient</string>
   <string name="quick_settings_lockscreen_label_enforced">Pantalla de bloqueig aplicada</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Deshabilitat pel perfil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Temps d\'espera de la pantalla: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Temps d\'espera de la pantalla canviat a <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Mode de la bateria</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Mode de la bateria: mode estalvi d\'energia.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Mode de la bateria: mode equilibrat.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Mode de la bateria: mode rendiment.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Mode de la bateria: mode d\'eficiència.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Mode de la bateria: mode ràpid.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Mode de la bateria canviat a mode estalvi d\'energia.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Mode de la bateria canviat a mode equilibrat.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Mode de la bateria canviat a mode rendiment.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Mode de la bateria canviat a mode d\'eficiència.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Mode de la bateria canviat a mode ràpid.</string>
   <string name="quick_settings_performance_profile_detail_title">Mode de la bateria</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Pantalla de bloqueig desactivada.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Pantalla de bloqueig activada.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">S\'ha desactivat la pantalla de bloqueig.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">S\'ha activat la pantalla de bloqueig.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Pantalla ambient desactivada.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Pantalla ambient activada.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">S\'ha desactivat la pantalla ambient.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">S\'ha activat la pantalla ambient.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Notificacions emergents apagades.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Notificacions emergents activades.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">S\'han apagat les notificacions emergents.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">S\'han encès les notificacions emergents.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Cafeïna desactivada.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Cafeïna activada.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Estalvi de bateria apagat.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Estalvi de bateria encès.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">S\'ha apagat l\'estalvi de bateria.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">S\'ha encès l\'estalvi de bateria.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Cel·la dinàmica</string>
   <string name="dynamic_qs_tile_next_alarm_label">Propera alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector de l\'IME</string>
   <string name="dynamic_qs_tile_su_label">Accés Superusuari</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay desactivat.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: mode automàtic.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: mode diurn.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: mode nocturn.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: mode exterior.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">S\'ha desactivat el LiveDisplay.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay canviat al mode automàtic.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay canviat al mode diurn.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay canviat al mode nocturn.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay canviat al mode exterior.</string>
+  <string name="dynamic_qs_tile_themes_label">Temes</string>
   <string name="quick_settings_title_advanced_location">Localització per triangulació</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Informes d\'ubicació: Mode d\'estalvi de bateria.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Informes d\'ubicació: Mode només sensors.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Informes d\'ubicació: Mode d\'alta precisió.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Mode d\'ubicació</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Estalvi de bateria</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Només dispositiu</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Alta precisió</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Informes d\'ubicació canviats al mode d\'estalvi d\'energia.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Informes d\'ubicació canviats al mode només sensors.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Informes d\'ubicació canviats al mode d\'alta precisió.</string>
   <string name="quick_settings_tiles_category_system">Cel·les del sistema</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Afegeix una cel·la</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">No es pot connectar a xarxes mòbils mentre el mode Avió està habilitat. Deshabilita el mode Avió i intenta-ho de nou.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">La llanterna està encesa</string>
   <string name="quick_settings_tile_flashlight_not_summary">Pica per apagar-la</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d clients</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Sense dades SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Acoblament bateria <xliff:g id="number">%d</xliff:g> percent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Mostra la cua de reproducció</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Llisca cap avall per expandir</string>
+  <string name="swipe_left_hint">Llisca cap a l\'esquerra per <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Llisca cap a la dreta per veure les notificacions</string>
 </resources>
diff --git a/packages/SystemUI/res/values-cs/cm_arrays.xml b/packages/SystemUI/res/values-cs/cm_arrays.xml
index ca2178e..3c17f45 100644
--- a/packages/SystemUI/res/values-cs/cm_arrays.xml
+++ b/packages/SystemUI/res/values-cs/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>S</item>
+    <!-- North -->
     <item>SV</item>
+    <!-- North east -->
     <item>V</item>
+    <!-- East -->
     <item>JV</item>
+    <!-- South east -->
     <item>J</item>
+    <!-- South -->
     <item>JZ</item>
+    <!-- South west -->
     <item>Z</item>
+    <!-- West -->
     <item>SZ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-cs/cm_strings.xml b/packages/SystemUI/res/values-cs/cm_strings.xml
index 7e4c34e..4a0fc63 100644
--- a/packages/SystemUI/res/values-cs/cm_strings.xml
+++ b/packages/SystemUI/res/values-cs/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Přejeďte doprava pro %1$s</string>
   <string name="right_shortcut_hint">Přejeďte doleva pro %1$s</string>
   <string name="lockscreen_message">Dotykem na ikonu na levé nebo pravé straně zamykací obrazovky změňte zástupce.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Vybrat aplikaci</string>
   <string name="lockscreen_choose_action_title">Zvolit akci</string>
   <string name="lockscreen_none_target">Žádný</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Vybrat akci k přiřazení</string>
   <string name="navbar_home_button">Tlačítko Domů</string>
   <string name="navbar_recent_button">Tlačítko Nedávné</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Tlačítko Nabídka</string>
   <string name="accessibility_dpad_left">Kurzor doleva</string>
   <string name="accessibility_dpad_right">Kurzor doprava</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Vymazat data aplikací</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Vynutit ukončení</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Odinstalovat</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Jas podsvícení</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profily vyp.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profily vypnuty.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil změněn na <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicializace\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Nastavení jasu</string>
   <string name="led_notification_text">LED světlo povoleno v nastavení</string>
   <string name="qs_tile_edit_header_instruction">Stiskněte a podržte tlačítko dlaždice pro přeskupení</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Zobrazit počasí</string>
   <string name="quick_settings_title_show_brightness_slider">Zobrazit posuvník jasu</string>
   <string name="quick_settings_title_enlarge_first_row">Zvětšit první řádek</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Zůstává zobrazeno, dokud není uvolněn. Dotykem a podržením tlačítka Zpět bude provedeno uvolnění.</string>
   <string name="quick_settings_custom_tile_detail_title">Vlastní dlaždice</string>
   <string name="quick_settings_remove">Odebrat dlaždici</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profily zakázány</string>
   <string name="quick_settings_heads_up_label">Plovoucí upozornění</string>
   <string name="quick_settings_battery_saver_label">Spořič baterie</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Úspora baterie (nabíjení)</string>
   <string name="quick_settings_caffeine_label">Kofein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synch. vyp.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synch. zap.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synchronizace vypnuta.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synchronizace zapnuta.</string>
   <string name="quick_settings_sync_label">Synchronizace</string>
   <string name="quick_settings_volume_panel_label">Panel hlasitosti</string>
@@ -81,66 +107,120 @@
   <string name="quick_settings_ambient_display_label">Ambientní zobrazení</string>
   <string name="quick_settings_lockscreen_label_enforced">Vynucení zámku obrazovky</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Potlačen profilem</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Limit vypnutí obrazovky: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Limit vypnutí obrazovky změněn na <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Režim baterie</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Režim baterie: úspora energie.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Režim baterie: vyvážený.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Režim baterie: výkonný.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Režim baterie: efektivita</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Režim baterie: výkon</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Režim baterie změněn na úsporu energie.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Režim baterie změněn na vyvážený.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Režim baterie změněn na vysoký výkon.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Režim baterie změněn na efektivní.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Režim baterie změněn na výkonný.</string>
   <string name="quick_settings_performance_profile_detail_title">Režim baterie</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Zámek displeje vyp.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Zámek displeje zap.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Zámek displeje je vypnutý.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Zámek displeje je zapnutý.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambientní zobrazení vypnuto.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambientní zobrazení zapnuto.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambientní zobrazení vypnuto.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambientní zobrazení zapnuto.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Plovoucí upozorněn vyp.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Plovoucí upozornění zap.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Plovoucí upozorněn vyp.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Plovoucí upozornění zap.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Kofein vyp.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Kofein zap.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Spořič baterie vyp.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Spořič baterie zap.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Spořič baterie vypnut.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Spořič baterie zapnut.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamické dlaždice</string>
   <string name="dynamic_qs_tile_next_alarm_label">Další budík</string>
   <string name="dynamic_qs_tile_ime_selector_label">Výběr IME</string>
   <string name="dynamic_qs_tile_su_label">Root přístup</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay vyp.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automatický režim.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: režim ve dne.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: režim v noci.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: režim venku.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay vypnutý.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay změněn na automatický režim.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay změněn na režim ve dne.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay změněn na režim v noci.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay změněn na režim venku.</string>
   <string name="quick_settings_title_advanced_location">Třístavové nastavení určení polohy</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Zjištění polohy: úsporný režim.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Zjištění polohy: pouze GPS.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Zjištění polohy: vysoká přesnost.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Poloha</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Úspora baterie</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Pouze zařízení</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Vysoká přesnost</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Zjištění polohy změněno na úsporu baterie.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Zjištění polohy změněno na pouze GPS.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Zjištění polohy změněno na vysokou přesnost.</string>
   <string name="quick_settings_tiles_category_system">Systémové dlaždice</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Přidat dlaždici</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Nelze se připojit k mobilním datům při zapnutém režimu „Letadlo“. Vypněte tento režim a zkuste to znovu.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Svítilna zapnuta</string>
   <string name="quick_settings_tile_flashlight_not_summary">Dotykem vypněte</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klient</item>
+    <item quantity="few">%1$d klienti</item>
+    <item quantity="other">%1$d klientů</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Žádná SIM pro data</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Baterie doku: <xliff:g id="number">%d</xliff:g>\u0025.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Zobrazit frontu přehrávání</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Posunutím dolů rozbalit</string>
+  <string name="swipe_left_hint">Posunutím doleva spustit <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Posunutím doprava zobrazit oznámení</string>
 </resources>
diff --git a/packages/SystemUI/res/values-csb-rPL/cm_arrays.xml b/packages/SystemUI/res/values-csb-rPL/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-csb-rPL/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-csb-rPL/cm_strings.xml b/packages/SystemUI/res/values-csb-rPL/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-csb-rPL/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-csb-rPL/strings.xml b/packages/SystemUI/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-csb-rPL/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-cy/cm_arrays.xml b/packages/SystemUI/res/values-cy/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-cy/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-cy/cm_strings.xml b/packages/SystemUI/res/values-cy/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-cy/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-cy/strings.xml b/packages/SystemUI/res/values-cy/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-cy/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-da/cm_arrays.xml b/packages/SystemUI/res/values-da/cm_arrays.xml
index 9763e17..1d89f10 100644
--- a/packages/SystemUI/res/values-da/cm_arrays.xml
+++ b/packages/SystemUI/res/values-da/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NØ</item>
+    <!-- North east -->
     <item>Ø</item>
+    <!-- East -->
     <item>SØ</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SV</item>
+    <!-- South west -->
     <item>V</item>
+    <!-- West -->
     <item>NV</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-da/cm_strings.xml b/packages/SystemUI/res/values-da/cm_strings.xml
index 7102c5e..4a39c75 100644
--- a/packages/SystemUI/res/values-da/cm_strings.xml
+++ b/packages/SystemUI/res/values-da/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Stryg til højre for %1$s</string>
   <string name="right_shortcut_hint">Stryg til venstre for %1$s</string>
   <string name="lockscreen_message">Tryk på et ikon til venstre eller højre for at tildele en genvej til skærmlåsen.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Vælg applikation</string>
   <string name="lockscreen_choose_action_title">Vælg handling</string>
   <string name="lockscreen_none_target">Ingen</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Vælg handling at tildele</string>
   <string name="navbar_home_button">Startknap</string>
   <string name="navbar_recent_button">Seneste-knap</string>
@@ -37,24 +46,38 @@
   <string name="navbar_menu_big_button">Menuknap</string>
   <string name="accessibility_dpad_left">Venstremarkør</string>
   <string name="accessibility_dpad_right">Højremarkør</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Ryd appdata</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Gennemtving stop</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Afinstallér</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Lysstyrke</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiler fra.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiler slået fra.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil ændret til <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Initialisere\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Indstillinger for lys</string>
   <string name="led_notification_text">LED-lys aktiveret via indstillinger</string>
   <string name="qs_tile_edit_header_instruction">Tryk og hold, for at flytte fliserne</string>
   <string name="quick_settings_edit_label">Redigér fliser</string>
   <string name="quick_settings_cannot_delete_edit_tile">Kan ikke slette Redigér-flisen</string>
+  <string name="qs_tiles_reset_confirmation">Nulstil indstillinger for hurtig tiles til standardkonfiguration?</string>
   <string name="quick_settings_tile_reset_to_default">Nulstil til standardlayout</string>
   <string name="quick_settings_title_header">Overskrift</string>
   <string name="quick_settings_title_tiles">Fliser</string>
   <string name="quick_settings_title_show_weather">Vis vejr</string>
+  <string name="quick_settings_title_show_brightness_slider">Vis skyder til lysstyrke</string>
+  <string name="quick_settings_title_enlarge_first_row">Forstør første række</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Dette fastholder det i visningen indtil du frigører det. Tryk og hold tilbage-knappen nede for at frigøre.</string>
   <string name="quick_settings_custom_tile_detail_title">Tilpasset flise</string>
   <string name="quick_settings_remove">Fjern flise</string>
@@ -65,9 +88,16 @@
   <string name="quick_settings_profiles_off">Profiler deaktiveret</string>
   <string name="quick_settings_heads_up_label">Svævende meddelelser</string>
   <string name="quick_settings_battery_saver_label">Strømsparetilstand</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Strømsparetilstand (oplader)</string>
+  <string name="quick_settings_caffeine_label">Koffein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synkr. fra.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synkr. til.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synkr. er slået fra.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synkr. er slået til.</string>
   <string name="quick_settings_sync_label">Synkr.</string>
   <string name="quick_settings_volume_panel_label">Lydstyrkepanel</string>
@@ -76,60 +106,121 @@
   <string name="quick_settings_lockscreen_label">Låseskærm</string>
   <string name="quick_settings_ambient_display_label">Inaktivitetsvisning</string>
   <string name="quick_settings_lockscreen_label_enforced">Tving låseskærm</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Deaktiveret via profil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Tidsudløb for skærm: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Tidsudløb for skærm ændret til <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Batteritilstand</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Batteri tilstand: strømsparetilstand.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Batteri tilstand: balanceret tilstand.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Batteri tilstand: høj ydeevne tilstand.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Batteritilstand: effektivitetstilstand.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Batteritilstand: hurtig tilstand.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Batteritilstand skiftet til strømsparetilstand.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Batteritilstand ændret til balanceret tilstand.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Batteritilstand ændret til tilstanden høj ydeevne.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Batteritilstand ændret til effektivitetstilstand.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Batteritilstand ændret til hurtigt tilstand.</string>
   <string name="quick_settings_performance_profile_detail_title">Batteritilstand</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Skærmlås fra.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Skærmlås til.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Skærmlås er slået fra.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Skærmlås er slået til.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Inaktivitetsvisning fra.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Inaktivitetsvisning til.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Inaktivitetsvisning er slået fra.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Inaktivitetsvisning er slået til.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Svævende meddelelser fra.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Svævende meddelelser til.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Svævende meddelelser er slået fra.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Svævende meddelelser er slået til.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Koffein fra.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Koffein til.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Strømsparetilstand fra.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Strømsparetilstand til.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Strømsparetilstand er slået fra.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Strømsparetilstand er slået til.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamisk flise</string>
   <string name="dynamic_qs_tile_next_alarm_label">Næste alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME-vælger</string>
   <string name="dynamic_qs_tile_su_label">Root-adgang</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay fra.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automatisk tilstand.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: dag tilstand.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: nat tilstand.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: udendørstilstand.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay er slået fra.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay ændret til auto tilstand.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay ændret til dag tilstand.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay ændret til nat tilstand.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay ændret til udendørstilstand.</string>
+  <string name="dynamic_qs_tile_themes_label">Temaer</string>
+  <string name="quick_settings_title_advanced_location">Lokation via triangulering</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Placeringsrapportering: Batterisparetilstand.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Placeringsrapportering: Kun sensorer-tilstand.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Placeringsrapportering: Høj nøjagtighed-tilstand.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Placeringstilstand</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Batteribesparelse</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Kun enhed</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Høj nøjagtighed</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Rapportering af placering ændret til batterisparetilstand.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Lokationsrapportering ændret til kun at bruge sensorer.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Lokationsrapportering ændret til høj nøjagtighed.</string>
   <string name="quick_settings_tiles_category_system">System-fliser</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Tilføj en flise</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Kan ikke oprette forbindelse til mobile netværk når Flytilstand er aktiveret. Deaktiver Flytilstand og prøv igen.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Lommelygten er tændt</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Tryk for at slukke</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klient</item>
+    <item quantity="other">%1$d klienter</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Ingen data-SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dockingstations batteri <xliff:g id="number">%d</xliff:g> procent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Vis afspillingskø</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Stryg ned for at udvide</string>
+  <string name="swipe_left_hint">Stryg til venstre for at <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Stryg til højre for meddelelser</string>
 </resources>
diff --git a/packages/SystemUI/res/values-de/cm_arrays.xml b/packages/SystemUI/res/values-de/cm_arrays.xml
index b156d8e..3008606 100644
--- a/packages/SystemUI/res/values-de/cm_arrays.xml
+++ b/packages/SystemUI/res/values-de/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NO</item>
+    <!-- North east -->
     <item>O</item>
+    <!-- East -->
     <item>SO</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-de/cm_strings.xml b/packages/SystemUI/res/values-de/cm_strings.xml
index e63f2d0..c588c5c 100644
--- a/packages/SystemUI/res/values-de/cm_strings.xml
+++ b/packages/SystemUI/res/values-de/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> – <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Nach rechts wischen für %1$s</string>
   <string name="right_shortcut_hint">Nach links wischen für %1$s</string>
   <string name="lockscreen_message">Berühren Sie das linke oder rechte Symbol, um eine Sperrbildschirm-Verknüpfung festzulegen.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">App wählen</string>
   <string name="lockscreen_choose_action_title">Aktion auswählen</string>
   <string name="lockscreen_none_target">Keine</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Funktion zuweisen</string>
   <string name="navbar_home_button">Home</string>
   <string name="navbar_recent_button">Anwendungsverlauf-Taste</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Menüschaltfläche</string>
   <string name="accessibility_dpad_left">Pfeiltaste links</string>
   <string name="accessibility_dpad_right">Pfeiltaste rechts</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Anwendungsdaten löschen</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Beenden erzwingen</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Deinstallieren</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Helligkeit</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profile aus.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profile ausgeschaltet.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil auf <xliff:g id="profile" example="Default">%s</xliff:g> geändert.</string>
   <string name="quick_settings_compass_init">Initialisierung\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">LED-Einstellungen</string>
   <string name="led_notification_text">Benachrichtigungs-LED durch Einstellungen aktiviert</string>
   <string name="qs_tile_edit_header_instruction">Drücken und halten Sie die Kacheln, um sie neu anzuordnen.</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Wetter anzeigen</string>
   <string name="quick_settings_title_show_brightness_slider">Helligkeitsregler anzeigen</string>
   <string name="quick_settings_title_enlarge_first_row">Erste Zeile vergrößern</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Dies fixiert die aktuelle Ansicht. Zum Lösen die Zurück-Taste drücken und halten.</string>
   <string name="quick_settings_custom_tile_detail_title">Benutzerdefinierte Kachel</string>
   <string name="quick_settings_remove">Kachel entfernen</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profile deaktiviert</string>
   <string name="quick_settings_heads_up_label">Pop-up</string>
   <string name="quick_settings_battery_saver_label">Akku-Sparmodus</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Akku-Sparmodus (Aufladen)</string>
   <string name="quick_settings_caffeine_label">Koffein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synchronisierung aus.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synchronisierung an.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synchronisierung ist ausgeschaltet.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synchronisierung ist eingeschaltet.</string>
   <string name="quick_settings_sync_label">Synchronisieren</string>
   <string name="quick_settings_volume_panel_label">Lautstärke</string>
@@ -81,66 +107,120 @@
   <string name="quick_settings_ambient_display_label">Inaktivitätsdisplay</string>
   <string name="quick_settings_lockscreen_label_enforced">Bildschirmsperre aktiviert</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Durch Profil gesperrt</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Ruhezustand nach <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Zeit bis zum Ruhezustand in <xliff:g id="timeout" example="30 seconds">%s</xliff:g> geändert.</string>
   <string name="qs_tile_performance">Akkumodus</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Akkumodus: Energie sparen.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Akkumodus: Ausgeglichen.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Akkumodus: Mehr Leistung.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Akkumodus: Effizient.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Akkumodus: Schnell.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Akkumodus auf \"Energie sparen\" geändert.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Akkumodus auf \"Ausgeglichen\" geändert.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Akkumodus auf \"Mehr Leistung\" geändert.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Akkumodus auf \"Effizient\" geändert.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Akkumodus auf \"Schnell\" geändert.</string>
   <string name="quick_settings_performance_profile_detail_title">Akkumodus</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Bildschirmsperre aus.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Bildschirmsperre an.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Bildschirmsperre ausgeschaltet.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Bildschirmsperre eingeschaltet.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Inaktivitätsdisplay aus.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Inaktivitätsdisplay an.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Inaktivitätsdisplay ausgeschaltet.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Inaktivitätsdisplay eingeschaltet.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Pop-up aus.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Pop-up an.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Pop-up ausgeschaltet.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Pop-up eingeschaltet.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Koffein aus.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Koffein an.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Akku-Sparmodus aus.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Akku-Sparmodus an.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Akku-Sparmodus ausgeschaltet.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Akku-Sparmodus eingeschaltet.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamische Kachel</string>
   <string name="dynamic_qs_tile_next_alarm_label">Nächster Alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Eingabemethode</string>
   <string name="dynamic_qs_tile_su_label">Root-Zugriff</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay aus.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: Automatisch.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: Tag.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: Nacht.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: Außen.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay ausgeschaltet.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay auf Auto-Modus geändert.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay auf Tag-Modus geändert.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay auf Nacht-Modus geändert.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay auf Außen-Modus geändert.</string>
+  <string name="dynamic_qs_tile_themes_label">Designs</string>
   <string name="quick_settings_title_advanced_location">Standort mit drei Zuständen</string>
-  <string name="accessibility_quick_settings_location_battery_saving">Standortdienste: Energiesparmodus</string>
-  <string name="accessibility_quick_settings_location_gps_only">Standortdienste: Nur Gerät</string>
-  <string name="accessibility_quick_settings_location_high_accuracy">Standortdienste: Hohe Genauigkeit</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">Standortdienste: Energiesparmodus.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">Standortdienste: Nur Gerät.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">Standortdienste: Hohe Genauigkeit.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Standortmodus</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Akku-Sparmodus</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Nur Gerät</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Hohe Genauigkeit</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Standortmodus auf \"Energiesparmodus\" geändert.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Standortmodus auf \"Nur Gerät\" geändert.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Standortmodus auf \"Hohe Genauigkeit\" geändert.</string>
   <string name="quick_settings_tiles_category_system">System-Kacheln</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Kachel hinzufügen</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Im Flugmodus ist keine Verbindung zum Mobilfunknetz möglich. Deaktivieren Sie den Flugmodus und versuchen Sie es erneut.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Taschenlampe ist eingeschaltet</string>
   <string name="quick_settings_tile_flashlight_not_summary">Zum Ausschalten tippen</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d Client</item>
+    <item quantity="other">%1$d Clients</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Keine Daten-SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dock-Akku <xliff:g id="number">%d</xliff:g> Prozent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Warteschlange anzeigen</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> – <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Zum Erweitern nach unten wischen</string>
+  <string name="swipe_left_hint">Für <xliff:g id="app_name">%1$s</xliff:g> nach links wischen</string>
+  <string name="swipe_right_hint">Für Benachrichtigungen nach rechts wischen</string>
 </resources>
diff --git a/packages/SystemUI/res/values-el/cm_arrays.xml b/packages/SystemUI/res/values-el/cm_arrays.xml
index 2a1bb43..82272d5 100644
--- a/packages/SystemUI/res/values-el/cm_arrays.xml
+++ b/packages/SystemUI/res/values-el/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>Β</item>
+    <!-- North -->
     <item>ΒΑ</item>
+    <!-- North east -->
     <item>Α</item>
+    <!-- East -->
     <item>ΝΑ</item>
+    <!-- South east -->
     <item>Ν</item>
+    <!-- South -->
     <item>ΝΔ</item>
+    <!-- South west -->
     <item>Δ</item>
+    <!-- West -->
     <item>ΒΔ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-el/cm_strings.xml b/packages/SystemUI/res/values-el/cm_strings.xml
index d2e57e1..49fa515 100644
--- a/packages/SystemUI/res/values-el/cm_strings.xml
+++ b/packages/SystemUI/res/values-el/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Σύρετε προς τα δεξιά για %1$s</string>
   <string name="right_shortcut_hint">Σύρετε προς τα αριστερά για %1$s</string>
   <string name="lockscreen_message">Πιέστε ένα εικονίδιο στα αριστερά ή δεξιά για να αντιστοιχίσετε εκ νέου μια συντόμευση οθόνης κλειδώματος.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Επιλέξτε εφαρμογή</string>
   <string name="lockscreen_choose_action_title">Επιλέξτε ενέργεια</string>
   <string name="lockscreen_none_target">Καμία</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Επιλέξτε ενέργεια για εκχώρηση</string>
   <string name="navbar_home_button">Πλήκτρο αρχικής οθόνης</string>
   <string name="navbar_recent_button">Πλήκτρο πρόσφατων εφαρμογών</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Πλήκτρο μενού</string>
   <string name="accessibility_dpad_left">Κέρσορας αριστερά</string>
   <string name="accessibility_dpad_right">Κέρσορας δεξιά</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Εκκαθάριση δεδομένων</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Αναγκαστική διακοπή</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Απεγκατάσταση</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Φωτεινότητα LED</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Ανενεργά προφίλ.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Προφίλ: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Τα προφίλ απενεργοποιήθηκαν.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Το προφίλ άλλαξε σε <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Προετοιμασία\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ρυθμίσεις LED</string>
   <string name="led_notification_text">Το LED ενεργοποιήθηκε από τις ρυθμίσεις</string>
   <string name="qs_tile_edit_header_instruction">Πιέστε παρατεταμένα στα πλακίδια για αναδιάταξη</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Εμφάνιση καιρού</string>
   <string name="quick_settings_title_show_brightness_slider">Εμφάνιση ρυθμιστικού φωτεινότητας</string>
   <string name="quick_settings_title_enlarge_first_row">Μεγέθυνση της πρώτης γραμμής</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Αυτό κλειδώνει την συγκεκριμένη οθόνη μέχρι να την ξεκαρφιτσώσετε. Αγγίξτε και κρατήστε πατημένο το πλήκτρο Πίσω για ξεκαρφίτσωμα.</string>
   <string name="quick_settings_custom_tile_detail_title">Προσαρμοσμένο πλακίδιο</string>
   <string name="quick_settings_remove">Αφαίρεση πλακιδίου</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Προφίλ απενεργοποιημένα</string>
   <string name="quick_settings_heads_up_label">Αναδυόμενες ειδοποιήσεις</string>
   <string name="quick_settings_battery_saver_label">Εξοικονόμηση μπαταρίας</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Εξοικονόμηση μπαταρίας (φόρτιση)</string>
   <string name="quick_settings_caffeine_label">Καφεΐνη</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Ανενεργός συγχρονισμός.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Ενεργός συγχρονισμός.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Ο συγχρονισμός απενεργοποιήθηκε.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Ο συγχρονισμός ενεργοποιήθηκε.</string>
   <string name="quick_settings_sync_label">Συγχρονισμός</string>
   <string name="quick_settings_volume_panel_label">Πάνελ έντασης</string>
@@ -81,66 +107,120 @@
   <string name="quick_settings_ambient_display_label">Οθόνη ambient</string>
   <string name="quick_settings_lockscreen_label_enforced">Επιβαλλόμενη οθόνη κλειδώματος</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Απενεργοποιήθηκε από προφίλ</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Χρονικό όριο οθόνης: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Το χρονικό όριο οθόνης άλλαξε σε: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Λειτουργία μπαταρίας</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Λειτουργία μπαταρίας: εξοικονόμηση ενέργειας.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Λειτουργία μπαταρίας: ισορροπημένο.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Λειτουργία μπαταρίας: επιδόσεις.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Λειτουργία μπαταρίας: αποδοτικό.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Λειτουργία μπαταρίας: γρήγορο.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Η λειτουργία μπαταρίας άλλαξε σε εξοικονόμηση ενέργειας.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Η λειτουργία μπαταρίας άλλαξε σε ισορροπημένο.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Η λειτουργία μπαταρίας άλλαξε σε επιδόσεις.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Η λειτουργία μπαταρίας άλλαξε σε αποδοτικό.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Η λειτουργία μπαταρίας άλλαξε σε γρήγορο.</string>
   <string name="quick_settings_performance_profile_detail_title">Λειτουργία μπαταρίας</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Ανενεργή οθόνη κλειδώματος.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Ενεργή οθόνη κλειδώματος.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Η οθόνη κλειδώματος απενεργοποιήθηκε.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Η οθόνη κλειδώματος ενεργοποιήθηκε.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ανενεργή οθόνη ambient.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ενεργή οθόνη ambient.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Η οθόνη ambient απενεργοποιήθηκε.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Η οθόνη ambient ενεργοποιήθηκε.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Ανενεργές αναδυόμενες ειδοποιήσεις.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Ενεργές αναδυόμενες ειδοποιήσεις.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Οι αναδυόμενες ειδοποιήσεις απενεργοποιήθηκαν.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Οι αναδυόμενες ειδοποιήσεις ενεργοποιήθηκαν.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Καφεΐνη ανενεργή.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Καφεΐνη ενεργή.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Ανενεργή εξοικονόμηση μπαταρίας.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Ενεργή εξοικονόμηση μπαταρίας.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Η εξοικονόμηση μπαταρίας απενεργοποιήθηκε.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Η εξοικονόμηση μπαταρίας ενεργοποιήθηκε.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Δυναμικό πλακίδιο</string>
   <string name="dynamic_qs_tile_next_alarm_label">Επόμενο ξυπνητήρι</string>
   <string name="dynamic_qs_tile_ime_selector_label">Επιλογέας μεθόδου εισόδου</string>
   <string name="dynamic_qs_tile_su_label">Πρόσβαση root</string>
-  <string name="accessibility_quick_settings_live_display_off">Ανενεργό LiveDisplay.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: αυτόματη λειτουργία.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: λειτουργία ημέρας.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: λειτουργία νύχτας.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: λειτουργία εξωτερικού χώρου.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">Το LiveDisplay απενεργοποιήθηκε.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">Το LiveDisplay άλλαξε σε αυτόματη λειτουργία.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">Το LiveDisplay άλλαξε σε λειτουργία ημέρας.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">Το LiveDisplay άλλαξε σε λειτουργία νύχτας.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">Το LiveDisplay άλλαξε σε λειτουργία εξωτερικού χώρου.</string>
+  <string name="dynamic_qs_tile_themes_label">Θέματα</string>
   <string name="quick_settings_title_advanced_location">Προηγμένη ρύθμιση τοποθεσίας</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Αναφορά τοποθεσίας: λειτουργία εξοικονόμησης μπαταρίας.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Αναφορά τοποθεσίας: λειτουργία μόνο αισθητήρων.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Αναφορά τοποθεσίας: λειτουργία υψηλής ακρίβειας.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Λειτουργία τοποθεσίας</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Εξοικονόμηση μπαταρίας</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Μόνο συσκευή</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Υψηλή ακρίβεια</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Η αναφορά τοποθεσίας άλλαξε σε λειτουργία εξοικονόμησης μπαταρίας.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Η αναφορά τοποθεσίας άλλαξε σε λειτουργία μόνο αισθητήρων.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Η αναφορά τοποθεσίας άλλαξε σε λειτουργία υψηλής ακρίβειας.</string>
   <string name="quick_settings_tiles_category_system">Πλακίδια συστήματος</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Προσθήκη πλακιδίου</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Δεν είναι δυνατή η σύνδεση με δίκτυα κινητής τηλεφωνίας ενώ είναι ενεργοποιημένη η λειτουργία πτήσης. Απενεργοποιήστε τη λειτουργία πτήσης και προσπαθήστε ξανά.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Ο φακός είναι ενεργοποιημένος</string>
   <string name="quick_settings_tile_flashlight_not_summary">Πιέστε για απενεργοποίηση</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d συνδεδεμένος</item>
+    <item quantity="other">%1$d συνδεδεμένοι</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Δεν υπάρχει SIM δεδομένων</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Μπαταρία βάσης σύνδεσης <xliff:g id="number">%d</xliff:g> τοις εκατό.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Εμφάνιση ουράς αναπαραγωγής</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Σύρετε προς τα κάτω για ανάπτυξη</string>
+  <string name="swipe_left_hint">Σύρετε προς τα αριστερά για <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Σύρετε προς τα δεξιά για ειδοποιήσεις</string>
 </resources>
diff --git a/packages/SystemUI/res/values-en-rAU/cm_arrays.xml b/packages/SystemUI/res/values-en-rAU/cm_arrays.xml
index cf5825b..3110756 100644
--- a/packages/SystemUI/res/values-en-rAU/cm_arrays.xml
+++ b/packages/SystemUI/res/values-en-rAU/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-en-rAU/cm_strings.xml b/packages/SystemUI/res/values-en-rAU/cm_strings.xml
index bac2e03..5607867 100644
--- a/packages/SystemUI/res/values-en-rAU/cm_strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/cm_strings.xml
@@ -16,12 +16,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Swipe right for %1$s</string>
   <string name="right_shortcut_hint">Swipe left for %1$s</string>
   <string name="select_application">Select application</string>
   <string name="lockscreen_choose_action_title">Choose action</string>
   <string name="lockscreen_none_target">None</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Choose action to assign</string>
   <string name="navbar_home_button">Home button</string>
   <string name="navbar_recent_button">Recent button</string>
@@ -33,23 +42,91 @@
   <string name="navbar_menu_big_button">Menu button</string>
   <string name="accessibility_dpad_left">Cursor left</string>
   <string name="accessibility_dpad_right">Cursor right</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Wipe app data</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Force stop</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Uninstall</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_compass_init">Initialising\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="quick_settings_network_adb_label">ADB over network</string>
   <string name="quick_settings_compass_label">Compass</string>
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">System profiles</string>
   <string name="quick_settings_profiles_off">Profiles disabled</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_screen_timeout_detail_title">Screen timeout</string>
   <string name="quick_settings_lockscreen_label">Lock screen</string>
   <string name="quick_settings_lockscreen_label_enforced">Lock screen enforced</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Location reporting: Battery-saving mode.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Location reporting: Sensors-only mode.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Location reporting: High-accuracy mode.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Location mode</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Battery-saving</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Device only</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">High accuracy</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-en-rGB/cm_arrays.xml b/packages/SystemUI/res/values-en-rGB/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rGB/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-en-rGB/cm_strings.xml b/packages/SystemUI/res/values-en-rGB/cm_strings.xml
new file mode 100644
index 0000000..4b3b506
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rGB/cm_strings.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Unable to connect to mobile networks while Airplane mode is enabled. Disable Airplane mode and try again.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-en-rIN/cm_arrays.xml b/packages/SystemUI/res/values-en-rIN/cm_arrays.xml
index cf5825b..3110756 100644
--- a/packages/SystemUI/res/values-en-rIN/cm_arrays.xml
+++ b/packages/SystemUI/res/values-en-rIN/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-en-rIN/cm_strings.xml b/packages/SystemUI/res/values-en-rIN/cm_strings.xml
index 1e364db..37769e0 100644
--- a/packages/SystemUI/res/values-en-rIN/cm_strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Swipe right for %1$s</string>
   <string name="right_shortcut_hint">Swipe left for %1$s</string>
   <string name="lockscreen_message">Tap an icon on the left or right to reassign a lock screen shortcut.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Select application</string>
   <string name="lockscreen_choose_action_title">Choose action</string>
   <string name="lockscreen_none_target">None</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Choose action to assign</string>
   <string name="navbar_home_button">Home button</string>
   <string name="navbar_recent_button">Recent button</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Menu button</string>
   <string name="accessibility_dpad_left">Cursor left</string>
   <string name="accessibility_dpad_right">Cursor right</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Wipe app data</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Force stop</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Uninstall</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Light brightness</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiles off.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profile: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiles turned off.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profile changed to <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Initializing\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Light settings</string>
   <string name="led_notification_text">LED light enabled by settings</string>
   <string name="qs_tile_edit_header_instruction">Press and hold tiles to rearrange</string>
@@ -57,6 +76,7 @@
   <string name="quick_settings_title_tiles">Tiles</string>
   <string name="quick_settings_title_show_weather">Show weather</string>
   <string name="quick_settings_title_enlarge_first_row">Enlarge first row</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">This keeps it in view until you unpin. Touch and hold the Back button to unpin.</string>
   <string name="quick_settings_custom_tile_detail_title">Custom tile</string>
   <string name="quick_settings_remove">Remove tile</string>
@@ -67,9 +87,14 @@
   <string name="quick_settings_profiles_off">Profiles disabled</string>
   <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="quick_settings_battery_saver_label">Battery saver</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sync off.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sync on.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sync turned off.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sync turned on.</string>
   <string name="quick_settings_sync_label">Sync</string>
   <string name="quick_settings_volume_panel_label">Volume panel</string>
@@ -78,61 +103,105 @@
   <string name="quick_settings_lockscreen_label">Lock screen</string>
   <string name="quick_settings_ambient_display_label">Ambient display</string>
   <string name="quick_settings_lockscreen_label_enforced">Lock screen enforced</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Screen timeout: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Screen timeout changed to <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Battery mode</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Battery mode: power save mode.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Battery mode: balanced mode.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Battery mode: performance mode.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Battery mode: efficiency mode.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Battery mode: quick mode.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Battery mode changed to power save mode.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Battery mode changed to balanced mode.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Battery mode changed to performance mode.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Battery mode changed to efficiency mode.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Battery mode changed to quick mode.</string>
   <string name="quick_settings_performance_profile_detail_title">Battery mode</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Lock screen off.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Lock screen on.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Lock screen turned off.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Lock screen turned on.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambient display off.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display on.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display turned off.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display turned on.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Heads up off.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Heads up on.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads up turned off.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Heads up turned on.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Battery saver off.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Battery saver on.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Battery saver turned off.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Battery saver turned on.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamic tile</string>
   <string name="dynamic_qs_tile_next_alarm_label">Next alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME selector</string>
   <string name="dynamic_qs_tile_su_label">Root access</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay off.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: auto mode.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: day mode.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: night mode.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: outdoor mode.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay turned off.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay changed to auto mode.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay changed to day mode.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay changed to night mode.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay changed to outdoor mode.</string>
   <string name="quick_settings_title_advanced_location">Tri-state location</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Location reporting: battery saving mode.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Location reporting: sensors only mode.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Location reporting: high accuracy mode.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Location mode</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Battery saving</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Device only</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">High accuracy</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Location reporting changed to battery saving mode.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Location reporting changed to sensors only mode.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Location reporting changed to high accuracy mode.</string>
   <string name="quick_settings_tiles_category_system">System tiles</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Add a tile</string>
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dock battery <xliff:g id="number">%d</xliff:g> percent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Show play queue</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-en-rPT/cm_arrays.xml b/packages/SystemUI/res/values-en-rPT/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rPT/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-en-rPT/cm_strings.xml b/packages/SystemUI/res/values-en-rPT/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rPT/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-en-rPT/strings.xml b/packages/SystemUI/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-en-rPT/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-eo/cm_arrays.xml b/packages/SystemUI/res/values-eo/cm_arrays.xml
index 8084f6b..44e4c6a 100644
--- a/packages/SystemUI/res/values-eo/cm_arrays.xml
+++ b/packages/SystemUI/res/values-eo/cm_arrays.xml
@@ -16,14 +16,8 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string-array name="cardinal_directions">
-    <item>N</item>
-    <item>N-Or</item>
-    <item>Or</item>
-    <item>S-Or</item>
-    <item>S</item>
-    <item>S-Ok</item>
-    <item>Ok</item>
-    <item>N-Ok</item>
-  </string-array>
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-eo/cm_strings.xml b/packages/SystemUI/res/values-eo/cm_strings.xml
index e903d2b..83a6190 100644
--- a/packages/SystemUI/res/values-eo/cm_strings.xml
+++ b/packages/SystemUI/res/values-eo/cm_strings.xml
@@ -16,92 +16,82 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
-  <string name="left_shortcut_hint">Movi dekstren por %1$s</string>
-  <string name="right_shortcut_hint">Movi maldekstren por %1$s</string>
-  <string name="select_application">Elekti aplikaĵon</string>
-  <string name="lockscreen_choose_action_title">Elekti agon</string>
-  <string name="lockscreen_none_target">Nenio</string>
-  <string name="navbar_dialog_title">Elekti agon por atribui</string>
-  <string name="navbar_home_button">Hejmbutono</string>
-  <string name="navbar_recent_button">Lasttempe-butono</string>
-  <string name="navbar_search_button">Serĉ-butono</string>
-  <string name="navbar_back_button">Reen-butono</string>
-  <string name="navbar_empty_button">Malplena butono</string>
-  <string name="navbar_menu_conditional_button">Menubutono (aŭtomate kaŝita)</string>
-  <string name="navbar_menu_always_button">Menubutono (ĉiam videbla)</string>
-  <string name="navbar_menu_big_button">Menubutono</string>
-  <string name="accessibility_dpad_left">Maldekstra kursoro</string>
-  <string name="accessibility_dpad_right">Dekstra kursoro</string>
-  <string name="advanced_dev_option_wipe_app">Forigi ĉiujn datumojn</string>
-  <string name="advanced_dev_option_force_stop">Devigi ĉesadon</string>
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Malinstali</string>
-  <string name="accessibility_quick_settings_profiles_off">Profiloj malaktivaj.</string>
-  <string name="accessibility_quick_settings_profiles">Profilo: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
-  <string name="accessibility_quick_settings_profiles_changed_off">Profiloj malŝaltitaj.</string>
-  <string name="accessibility_quick_settings_profiles_changed">Profilo ŝanĝita al <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
-  <string name="quick_settings_compass_init">Preparado\u2026</string>
-  <string name="screen_pinning_description_no_navbar">Tio lasos ĝin videbla ĝin kiam vi malfiksos ĝin. Tuŝetu kaj tenu la reenbutonon por malfiksi.</string>
-  <string name="quick_settings_custom_tile_detail_title">Tajlorita kahelo</string>
-  <string name="quick_settings_remove">Forigi kahelon</string>
-  <string name="quick_settings_network_adb_label">reta ADB</string>
-  <string name="quick_settings_compass_label">Kompaso</string>
-  <string name="quick_settings_nfc_label">NFC</string>
-  <string name="quick_settings_profiles">Sistemaj profiloj</string>
-  <string name="quick_settings_profiles_off">Profiloj malŝaltitaj</string>
-  <string name="quick_settings_heads_up_label">Atentigoj</string>
-  <string name="accessibility_quick_settings_sync_off">Sinkronigado malaktiva.</string>
-  <string name="accessibility_quick_settings_sync_on">Sinkronigado aktiva.</string>
-  <string name="accessibility_quick_settings_sync_changed_off">Sinkronigado malŝaltita.</string>
-  <string name="accessibility_quick_settings_sync_changed_on">Sinkronigado ŝaltita.</string>
-  <string name="quick_settings_sync_label">Sinkronigo</string>
-  <string name="quick_settings_usb_tether_label">USB modemo</string>
-  <string name="quick_settings_screen_timeout_detail_title">Ekrana tempolimo</string>
-  <string name="quick_settings_lockscreen_label">Ŝlosa ekrano</string>
-  <string name="quick_settings_ambient_display_label">Ĉirkaŭaĵa afiŝado</string>
-  <string name="quick_settings_lockscreen_label_enforced">Ŝlosa ekrano devigita</string>
-  <string name="accessibility_quick_settings_screen_timeout">Ekrana tempolimo: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
-  <string name="accessibility_quick_settings_screen_timeout_changed">Ekrana tempolimo ŝanĝita al <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
-  <string name="accessibility_quick_settings_perf_profile_pwrsv">Bateria reĝimo: reĝimo de energia ŝparado.</string>
-  <string name="accessibility_quick_settings_perf_profile_bal">Bateria reĝimo: meza reĝimo.</string>
-  <string name="accessibility_quick_settings_perf_profile_perf">Bateria reĝimo: reĝimo de rendimento.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Bateria reĝimo ŝanĝita al reĝimo de energia ŝparado.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_bal">Bateria reĝimo ŝanĝita al meza reĝimo.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_perf">Bateria reĝimo ŝanĝita al reĝimo de rendimento.</string>
-  <string name="accessibility_quick_settings_lock_screen_off">Ŝlosa ekrano malaktiva.</string>
-  <string name="accessibility_quick_settings_lock_screen_on">Ŝlosa ekrano aktiva.</string>
-  <string name="accessibility_quick_settings_lock_screen_changed_off">Ŝlosa ekrano malŝaltita.</string>
-  <string name="accessibility_quick_settings_lock_screen_changed_on">Ŝlosa ekrano ŝaltita.</string>
-  <string name="accessibility_quick_settings_ambient_display_off">Ĉirkaŭaĵa afiŝado malaktiva.</string>
-  <string name="accessibility_quick_settings_ambient_display_on">Ĉirkaŭaĵa afiŝado aktiva.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_off">Ĉirkaŭaĵa afiŝado malŝaltita.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_on">Ĉirkaŭaĵa afiŝado ŝaltita.</string>
-  <string name="accessibility_quick_settings_heads_up_off">Atentigoj malaktivaj.</string>
-  <string name="accessibility_quick_settings_heads_up_on">Atentigoj aktivaj.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_off">Atentigoj malŝaltitaj.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_on">Atentigoj ŝaltitaj.</string>
-  <string name="quick_settings_dynamic_tile_detail_title">Dinamika kahelo</string>
-  <string name="dynamic_qs_tile_next_alarm_label">Venonta alarmo</string>
-  <string name="dynamic_qs_tile_ime_selector_label">IME elektilo</string>
-  <string name="dynamic_qs_tile_su_label">Radikuzanta atingo</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay malaktiva.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: aŭtomata reĝimo.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: taga reĝimo.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: nokta reĝimo.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: ekstera reĝimo.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay malŝaltita.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay ŝanĝita al aŭtomata reĝimo.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay ŝanĝita al taga reĝimo.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay ŝanĝita al nokta reĝimo.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay ŝanĝita al ekstera reĝimo.</string>
-  <string name="accessibility_quick_settings_location_battery_saving">Lokalizado: reĝimo de bateria ŝparado.</string>
-  <string name="accessibility_quick_settings_location_gps_only">Lokalizado: reĝimo de nur aparato.</string>
-  <string name="accessibility_quick_settings_location_high_accuracy">Lokalizado: reĝimo de alta precizeco.</string>
-  <string name="quick_settings_location_detail_title">Moduso por loko</string>
-  <string name="quick_settings_location_battery_saving_label">Ŝparado de baterio</string>
-  <string name="quick_settings_location_gps_only_label">Nur aparato</string>
-  <string name="quick_settings_location_high_accuracy_label">Alta precizeco</string>
-  <string name="accessibility_quick_settings_location_changed_battery_saving">Lokalizado ŝanĝita al ŝparado de baterio.</string>
-  <string name="accessibility_quick_settings_location_changed_gps_only">Lokalizado ŝanĝita al reĝimo de nur aparato.</string>
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">Lokalizado ŝanĝita al reĝimo de alta precizeco.</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-eo/strings.xml b/packages/SystemUI/res/values-eo/strings.xml
new file mode 100644
index 0000000..8041df8
--- /dev/null
+++ b/packages/SystemUI/res/values-eo/strings.xml
@@ -0,0 +1,483 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <string name="status_bar_latest_events_title">Sciigoj</string>
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <string name="battery_low_why">Agordoj</string>
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <string name="status_bar_settings_settings_button">Agordoj</string>
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <string name="status_bar_settings_notifications">Sciigoj</string>
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <string name="accessibility_search_light">Serĉi</string>
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_phone_button">Telefono</string>
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <string name="cancel">Nuligi</string>
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_airplane_mode">Aviadila reĝimo.</string>
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notifications_button">Sciigoj.</string>
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <string name="accessibility_desc_settings">Agordoj</string>
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <string name="accessibility_desc_close">Fermi</string>
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_label">Loko</string>
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_settings_label">Agordoj</string>
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_user_label">Mi</string>
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_user_title">Uzanto</string>
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_notifications_label">Sciigoj</string>
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <string name="description_target_search">Serĉi</string>
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <string name="user_new_user_name">Nova uzanto</string>
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <string name="guest_nickname">Gasto</string>
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <string name="guest_new_guest">Aldoni gaston</string>
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <string name="guest_exit_guest">Forigi gaston</string>
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <string name="guest_exit_guest_dialog_remove">Forigi</string>
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <string name="guest_notification_remove_action">FORIGI GASTON</string>
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <string name="status_bar_airplane">Aviadila reĝimo</string>
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-es-rCO/cm_arrays.xml b/packages/SystemUI/res/values-es-rCO/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rCO/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-es-rCO/cm_strings.xml b/packages/SystemUI/res/values-es-rCO/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rCO/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-es-rCO/strings.xml b/packages/SystemUI/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rCO/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-es-rMX/cm_arrays.xml b/packages/SystemUI/res/values-es-rMX/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rMX/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-es-rMX/cm_strings.xml b/packages/SystemUI/res/values-es-rMX/cm_strings.xml
new file mode 100644
index 0000000..f7de9c2
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rMX/cm_strings.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="lockscreen_message">Toca un icono a la izquierda o derecha para volver a asignar un atajo a la pantalla de bloqueo.</string>
+  <string name="lockscreen_default_target">Por defecto</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Ajuste de brillo</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Ajustes de luz</string>
+  <string name="led_notification_text">Luz LED activada por ajustes</string>
+  <string name="qs_tile_edit_header_instruction">Toca y deja presionados los controles para reorganizarlos</string>
+  <string name="quick_settings_edit_label">Editar controles</string>
+  <string name="quick_settings_cannot_delete_edit_tile">No se puede eliminar el control de \"Editar\"</string>
+  <string name="qs_tiles_reset_confirmation">¿Restaurar los controles de ajustes rápidos a su configuración predeterminada?</string>
+  <string name="quick_settings_tile_reset_to_default">Restaurar disposición por defecto</string>
+  <string name="quick_settings_title_header">Encabezado</string>
+  <string name="quick_settings_title_tiles">Controles</string>
+  <string name="quick_settings_title_show_weather">Mostrar clima</string>
+  <string name="quick_settings_title_show_brightness_slider">Mostrar barra de brillo</string>
+  <string name="quick_settings_title_enlarge_first_row">Ampliar la primera fila</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">Cafeína</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Desactivado por perfil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Desactivar Cafeína.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Activar Cafeína.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_title_advanced_location">Ubicación por triangulación</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_tiles_category_system">Controles del sistema</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Añadir un control</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">No se puede conectar con redes móviles cuando el modo avión está activado. Desactiva el modo avión y vuelve a intentarlo.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">La linterna está encendida</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Toca para apagarla</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Sin datos SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-es-rMX/strings.xml b/packages/SystemUI/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rMX/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-es-rUS/cm_arrays.xml b/packages/SystemUI/res/values-es-rUS/cm_arrays.xml
new file mode 100644
index 0000000..85897e7
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rUS/cm_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>N</item>
+    <!-- North -->
+    <item>NE</item>
+    <!-- North east -->
+    <item>E</item>
+    <!-- East -->
+    <item>SE</item>
+    <!-- South east -->
+    <item>S</item>
+    <!-- South -->
+    <item>SO</item>
+    <!-- South west -->
+    <item>O</item>
+    <!-- West -->
+    <item>NO</item>
+    <!-- North west -->
+  </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-es-rUS/cm_strings.xml b/packages/SystemUI/res/values-es-rUS/cm_strings.xml
new file mode 100644
index 0000000..a193b19
--- /dev/null
+++ b/packages/SystemUI/res/values-es-rUS/cm_strings.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">Deslizar a la derecha para %1$s</string>
+  <string name="right_shortcut_hint">Deslizar a la izquierda para %1$s</string>
+  <string name="lockscreen_message">Pulsar un icono a la izquierda o derecha para reasignar un atajo de la pantalla bloqueada.</string>
+  <string name="lockscreen_default_target">Predeterminado</string>
+  <string name="select_application">Selecciona una aplicación</string>
+  <string name="lockscreen_choose_action_title">Elegir acción</string>
+  <string name="lockscreen_none_target">Ninguna</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">Seleccionar acción a asignar</string>
+  <string name="navbar_home_button">Botón de inicio</string>
+  <string name="navbar_recent_button">Botón reciente</string>
+  <string name="navbar_search_button">Botón de búsqueda</string>
+  <string name="navbar_back_button">Botón Atrás</string>
+  <string name="navbar_empty_button">Botón vacío</string>
+  <string name="navbar_menu_conditional_button">Botón de menú (auto-ocultar)</string>
+  <string name="navbar_menu_always_button">Botón de menú (siempre visible)</string>
+  <string name="navbar_menu_big_button">Botón de menú</string>
+  <string name="accessibility_dpad_left">Cursor izquierda</string>
+  <string name="accessibility_dpad_right">Cursor derecha</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">Borrar datos de la aplicación</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">Forzar detención</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">Desinstalar</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Ajuste de brillo</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">Perfiles desactivados.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">Perfil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">Perfiles desactivados.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">Perfil cambiado a <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <string name="quick_settings_compass_init">Inicializando\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Ajustes de luz de notificación</string>
+  <string name="led_notification_text">Luz LED activada por ajustes</string>
+  <string name="qs_tile_edit_header_instruction">Tocar y dejar presionados los mosaicos para reorganizarlos</string>
+  <string name="quick_settings_edit_label">Editar mosaicos</string>
+  <string name="quick_settings_cannot_delete_edit_tile">No se puede eliminar el mosaico Editar</string>
+  <string name="qs_tiles_reset_confirmation">¿Restaurar lo mosaicos de ajustes rápidos a su configuración predeterminada?</string>
+  <string name="quick_settings_tile_reset_to_default">Restaurar disposición predeterminada</string>
+  <string name="quick_settings_title_header">Encabezado</string>
+  <string name="quick_settings_title_tiles">Mosaicos</string>
+  <string name="quick_settings_title_show_weather">Mostrar clima</string>
+  <string name="quick_settings_title_show_brightness_slider">Mostrar barra de brillo</string>
+  <string name="quick_settings_title_enlarge_first_row">Ampliar la primera fila</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Esto fija la pantalla en esta vista hasta que se desancla. Mantén pulsado el botón Atrás para desanclar.</string>
+  <string name="quick_settings_custom_tile_detail_title">Control personalizado</string>
+  <string name="quick_settings_remove">Eliminar control</string>
+  <string name="quick_settings_network_adb_label">ADB sobre red</string>
+  <string name="quick_settings_compass_label">Brújula</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">Perfiles del sistema</string>
+  <string name="quick_settings_profiles_off">Perfiles desactivados</string>
+  <string name="quick_settings_heads_up_label">Notificaciones emergentes</string>
+  <string name="quick_settings_battery_saver_label">Modo de ahorro de batería</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Ahorrador de batería (cargando)</string>
+  <string name="quick_settings_caffeine_label">Cafeína</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">Sincronización desactivada.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">Sincronización activada.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">Sincronización desactivada.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">Sincronización activada.</string>
+  <string name="quick_settings_sync_label">Sincronizar</string>
+  <string name="quick_settings_volume_panel_label">Panel de volumen</string>
+  <string name="quick_settings_usb_tether_label">Anclaje USB</string>
+  <string name="quick_settings_screen_timeout_detail_title">Tiempo de espera de pantalla</string>
+  <string name="quick_settings_lockscreen_label">Pantalla bloqueada</string>
+  <string name="quick_settings_ambient_display_label">Pantalla ambiente</string>
+  <string name="quick_settings_lockscreen_label_enforced">Pantalla bloqueada forzada</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Deshabilitado por perfil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">Tiempo de espera de pantalla: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">Tiempo de espera de pantalla cambiado a <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <string name="qs_tile_performance">Modo de batería</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">Modo de batería: ahorro de energía.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">Modo de batería: equilibrado.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">Modo de batería: rendimiento.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Modo de batería: eficiente.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">Modo de batería: rápido.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Modo de batería cambiado a ahorro de energía.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">Modo de batería cambiado a equilibrado.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">Modo de batería cambiado a rendimiento.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Modo de batería cambiado a eficiente.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Modo de batería cambiado a rápido.</string>
+  <string name="quick_settings_performance_profile_detail_title">Modo de batería</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">Pantalla bloqueada desactivada.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">Pantalla bloqueada activada.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">Pantalla bloqueada desactivada.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Pantalla bloqueada activada.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">Pantalla ambiente desactivada.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">Pantalla ambiente activada.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Pantalla ambiente desactivada.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Pantalla ambiente activada.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Desactivar notificaciones emergentes.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Activar notificaciones emergentes.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Notificaciones emergentes desactivadas.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Notificaciones emergentes activadas.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Deshabilitar cafeína.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Habilitar cafeína.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">Apagar modo de ahorro de batería.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">Encender modo de ahorro de batería.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Modo de ahorro de batería apagado.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Modo de ahorro de batería encendido.</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">Control dinámico</string>
+  <string name="dynamic_qs_tile_next_alarm_label">Próxima alarma</string>
+  <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
+  <string name="dynamic_qs_tile_su_label">Acceso a raíz</string>
+  <string name="quick_settings_title_advanced_location">Localización trizona</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">Informes de ubicación: modo de ahorro de batería.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">Informes de ubicación: modo de solo sensores.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">Informes de ubicación: modo de alta precisión.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">Modos de ubicación</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">Ahorro de batería</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">Solo dispositivo</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">Alta precisión</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">Informes de ubicación cambiados a modo de ahorro de batería.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">Informes de ubicación cambiados a modo solo dispositivo.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">Informes de ubicación cambiados a modo de gran precisión.</string>
+  <string name="quick_settings_tiles_category_system">Mosaicos del sistema</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Añadir un mosaico</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">No se puede conectar con redes móviles cuando el modo avión está activado. Desactivar el modo avión y volver a intentarlo.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">La linterna está encendida</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Pulsar para apagarla</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d cliente</item>
+    <item quantity="other">%1$d clientes</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Sin datos SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Batería del dock al <xliff:g id="number">%d</xliff:g> %.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Mostrar la cola de reproducción</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-es/cm_arrays.xml b/packages/SystemUI/res/values-es/cm_arrays.xml
index cb6fbec..85897e7 100644
--- a/packages/SystemUI/res/values-es/cm_arrays.xml
+++ b/packages/SystemUI/res/values-es/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SO</item>
+    <!-- South west -->
     <item>O</item>
+    <!-- West -->
     <item>NO</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-es/cm_strings.xml b/packages/SystemUI/res/values-es/cm_strings.xml
index 92425c1..a9b7a8d 100644
--- a/packages/SystemUI/res/values-es/cm_strings.xml
+++ b/packages/SystemUI/res/values-es/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Desliza a la derecha para %1$s</string>
   <string name="right_shortcut_hint">Desliza a la izquierda para %1$s</string>
   <string name="lockscreen_message">Toca un icono a la izquierda o derecha para volver a asignar un atajo a la pantalla de bloqueo.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Selecciona una aplicación</string>
   <string name="lockscreen_choose_action_title">Elegir acción</string>
   <string name="lockscreen_none_target">Ninguno</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Elegir acción a asignar</string>
   <string name="navbar_home_button">Botón Inicio</string>
   <string name="navbar_recent_button">Botón reciente</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Botón de menú</string>
   <string name="accessibility_dpad_left">Cursor izquierdo</string>
   <string name="accessibility_dpad_right">Cursor derecho</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Borrar datos de la aplicación</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Forzar detención</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstalar</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Brillo ligero</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Perfiles desactivados.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Perfil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Perfiles desactivado.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Perfil cambiado a <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicializando\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ajustes de luz</string>
   <string name="led_notification_text">Luz LED activada por ajustes</string>
   <string name="qs_tile_edit_header_instruction">Toca y deja presionados los controles para reorganizarlos</string>
@@ -56,7 +75,9 @@
   <string name="quick_settings_title_header">Encabezado</string>
   <string name="quick_settings_title_tiles">Controles</string>
   <string name="quick_settings_title_show_weather">Mostrar el clima</string>
+  <string name="quick_settings_title_show_brightness_slider">Mostrar barra de brillo</string>
   <string name="quick_settings_title_enlarge_first_row">Ampliar la primera fila</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Esto fija la pantalla en esta vista hasta que es liberada. Mantén pulsado el botón Atrás para liberarla.</string>
   <string name="quick_settings_custom_tile_detail_title">Control personalizado</string>
   <string name="quick_settings_remove">Eliminar control</string>
@@ -67,9 +88,16 @@
   <string name="quick_settings_profiles_off">Perfiles desactivados</string>
   <string name="quick_settings_heads_up_label">Notificaciones emergentes</string>
   <string name="quick_settings_battery_saver_label">Modo de ahorro de batería</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Ahorrador de batería (cargando)</string>
+  <string name="quick_settings_caffeine_label">Cafeína</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sincronización desactivada.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sincronización activada.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sincronización desactivada.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sincronización activada.</string>
   <string name="quick_settings_sync_label">Sincronizar</string>
   <string name="quick_settings_volume_panel_label">Panel de volumen</string>
@@ -78,59 +106,116 @@
   <string name="quick_settings_lockscreen_label">Pantalla de bloqueo</string>
   <string name="quick_settings_ambient_display_label">Pantalla ambiente</string>
   <string name="quick_settings_lockscreen_label_enforced">Pantalla de bloqueo forzada</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Desactivado por perfil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Tiempo de espera de pantalla: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Tiempo de espera de pantalla cambiado a <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Modo de la batería</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Modo de batería: ahorro de energía.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Modo de batería: equilibrado.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Modo de batería: rendimiento.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Modo de la batería: eficiente.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Modo de la batería: rápido.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Modo de batería cambiado a ahorro de energía.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Modo de batería cambiado a equilibrado.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Modo de batería cambiado a rendimiento.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Modo de la batería cambiado a eficiente.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Modo de la batería cambiado a rápido.</string>
   <string name="quick_settings_performance_profile_detail_title">Modo de la batería</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Bloqueo de pantalla desactivado.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Bloqueo de pantalla activado.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Bloqueo de pantalla desactivado.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Bloqueo de pantalla activado.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Pantalla ambiente desactivada.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Pantalla ambiente activada.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Pantalla ambiente desactivada.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Pantalla ambiente activada.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Desactivar notificaciones emergentes.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Activar notificaciones emergentes.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Notificaciones emergentes desactivadas.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Notificaciones emergentes activadas.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Desactivar Cafeína.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Activar Cafeína.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Apagar modo de ahorro de batería.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Encender modo de ahorro de batería.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Modo de ahorro de batería apagado.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Modo de ahorro de batería encendido.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Control dinámico</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próxima alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
   <string name="dynamic_qs_tile_su_label">Acceso administrativo</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay desactivado.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modo automático.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: modo diurno.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: modo nocturno.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modo aire libre.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay desactivado.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay cambió a modo automático.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay ha cambiado a modo diurno.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay ha cambiado a modo nocturno.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay cambiado a modo aire libre.</string>
   <string name="quick_settings_title_advanced_location">Ubicación por triangulación</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Informes de ubicación: modo de ahorro de batería.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Informes de ubicación: modo de solo sensores.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Informes de ubicación: modo de alta precisión.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Modo de ubicación</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Ahorro de batería</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Solo en dispositivo</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Alta precisión</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Informes de ubicación cambiados a modo de ahorro de batería.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Informes de ubicación cambiados a modo solo dispositivo.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Informes de ubicación cambiados a modo de gran precisión.</string>
+  <string name="quick_settings_tiles_category_system">Controles del sistema</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Añadir un control</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">No se puede conectar a redes móviles mientras el modo Avión esté activado. Desactiva el modo Avión e inténtalo de nuevo.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">La linterna está encendida</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Toca para apagarla</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d cliente</item>
+    <item quantity="other">%1$d clientes</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Sin datos SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Batería de la base al <xliff:g id="number">%d</xliff:g> por ciento.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Mostrar la cola de reproducción</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-et-rEE/cm_arrays.xml b/packages/SystemUI/res/values-et-rEE/cm_arrays.xml
index cf5825b..3110756 100644
--- a/packages/SystemUI/res/values-et-rEE/cm_arrays.xml
+++ b/packages/SystemUI/res/values-et-rEE/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-et-rEE/cm_strings.xml b/packages/SystemUI/res/values-et-rEE/cm_strings.xml
index 4d9eafa..d3265c5 100644
--- a/packages/SystemUI/res/values-et-rEE/cm_strings.xml
+++ b/packages/SystemUI/res/values-et-rEE/cm_strings.xml
@@ -16,12 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Libista paremale et käivitada %1$s</string>
   <string name="right_shortcut_hint">Libista vasakule et käivitada %1$s</string>
+  <string name="lockscreen_message">Koputage vasaku või parema ikooni peale, et muuta lukustusekraani lühiteid.</string>
+  <string name="lockscreen_default_target">Vaikimisi</string>
   <string name="select_application">Valige rakendus</string>
   <string name="lockscreen_choose_action_title">Valige toiming</string>
   <string name="lockscreen_none_target">Puudub</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Vali toiming mida lisada</string>
   <string name="navbar_home_button">Kodu nupp</string>
   <string name="navbar_recent_button">Hiljutiste nupp</string>
@@ -33,14 +46,38 @@
   <string name="navbar_menu_big_button">Menüü nupp</string>
   <string name="accessibility_dpad_left">Kursor vasakule</string>
   <string name="accessibility_dpad_right">Kursor paremale</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Kustuta rakenduse andmed</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Jõuga peatamine</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Eemalda</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Teavitustule heledus</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiilid väljas.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profiil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiilid välja lülitatud.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profiil muudetud: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Määratlen\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Teavitustule sätted</string>
+  <string name="led_notification_text">LED tule lubamine</string>
+  <string name="qs_tile_edit_header_instruction">Hoia plaatide ümber paigutamiseks</string>
+  <string name="quick_settings_edit_label">Redigeeri plaate</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Ei saa kustutada Redigeerimise plaati</string>
+  <string name="qs_tiles_reset_confirmation">Taasta kiirseadistuse plaatide vaikekonfoguratsioon?</string>
+  <string name="quick_settings_tile_reset_to_default">Taasta plaatide vaikeseadistus</string>
+  <string name="quick_settings_title_header">Päis</string>
+  <string name="quick_settings_title_tiles">Plaadid</string>
+  <string name="quick_settings_title_show_weather">Näita Ilmateadet</string>
+  <string name="quick_settings_title_show_brightness_slider">Kuva heleduse liugur</string>
+  <string name="quick_settings_title_enlarge_first_row">Suurenda esimene rida</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">See hoiab vaate kuni vabastamiseni. Vajuta ja hoia tagasi nuppu vabastamiseks.</string>
   <string name="quick_settings_custom_tile_detail_title">Kohandatud plaat</string>
   <string name="quick_settings_remove">Eemalda plaat</string>
@@ -51,9 +88,16 @@
   <string name="quick_settings_profiles_off">Profiilid välja lülitatud</string>
   <string name="quick_settings_heads_up_label">Etteteavitus</string>
   <string name="quick_settings_battery_saver_label">Akusäästja</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Akusäästja (laadimine)</string>
+  <string name="quick_settings_caffeine_label">Kofeiin</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sünk väljas.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sünk sees.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sünk välja lülitatud.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sünk sisse lülitatud.</string>
   <string name="quick_settings_sync_label">Sünk</string>
   <string name="quick_settings_volume_panel_label">Helipaneel</string>
@@ -62,58 +106,119 @@
   <string name="quick_settings_lockscreen_label">Lukustusekraan</string>
   <string name="quick_settings_ambient_display_label">Ambient kuva</string>
   <string name="quick_settings_lockscreen_label_enforced">Lukustusekraan sunnitud</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Profiili poolt keelatud</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Ekraani ajalõpp: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Ekraani ajalõpp muudetud <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Aku režiim</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Aku režiim: energiasäästmise režiim.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Aku režiim: tasakaalustatud režiim.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Aku režiim: jõudlus režiim.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Aku režiim: energiatõhususe režiimis.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Aku režiim: kiirrežiim.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Aku režiim muudeti energiasäästu režiimiks.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Aku režiim muudeti tasakaalustatud režiimiks.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Aku režiim muudeti jõudluse režiimiks.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Aku režiimi muudeti tõhususe režiimiks.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Aku režiimi muudeti kiirrežiimiks.</string>
   <string name="quick_settings_performance_profile_detail_title">Aku režiim</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Lukustusekraan väljas.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Lukustusekraan sees.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Lukustusekraan välja lülitatud.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Lukustusekraan sisse lülitatud.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambient kuva väljas.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambient kuva sees.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient kuva väljalülitatud.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient kuva sisselülitatud.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Etteteavitus väljas.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Etteteavitus sees.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Etteteavitus on väljalülitatud.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Etteteavitus on sisselülitatud.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Kofeiin välja.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Kofeiin sisse.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Akusäästja väljas.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Akusäästja sees.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Akusäästja on välja lülitatud.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Akusäästja on sisse lülitatud.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dünaamiline plaat</string>
   <string name="dynamic_qs_tile_next_alarm_label">Järgmine alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME valija</string>
   <string name="dynamic_qs_tile_su_label">Root ligipääs</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay väljas.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automaatrežiim.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: päev-režiim.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: Öörežiim.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: õues režiim.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay välja lülitatud.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay muudetud automaatrežiimi.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay muudetud päev-režiimi.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay muudetud Öörežiimi.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay muudetud õues režiimi.</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Asukoha teatamine: aku säästmise režiim.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Asukoha teatamine: ainult andurite režiim.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Asukoha teatamine: kõrge täpsusega režiim.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Asukoha režiim</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Akut säästev</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Ainult seade</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Kõrge täpsusega</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Asukoha teavitus muudetud aku säästmise režiimi.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Asukoha teavitus muudetud vaid sensorite režiimi.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Asukoha teavitus muudetud kõrge täpsusega režiimi.</string>
+  <string name="quick_settings_tiles_category_system">Süsteemi plaadid</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Lisa plaat</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Ei saa ühenduda mobiilsidevõrguga kuni lennukirežiim on lubatud. Lülita lennukirežiim välja ja proovi uuesti.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Taskulamp põleb</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Väljalülitamiseks koputage</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d seade</item>
+    <item quantity="other">%1$d seadmed</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Andmeside puudub</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Doki aku <xliff:g id="number">%d</xliff:g> protsenti.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Näita esitamise järjekorda</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Laiendamiseks tõmmake alla</string>
+  <string name="swipe_left_hint">Tõmmake vasakule. et avada rakendus <xliff:g id="app_name">%1$s </xliff:g></string>
+  <string name="swipe_right_hint">Teadete nägemiseks tõmmake paremale</string>
 </resources>
diff --git a/packages/SystemUI/res/values-eu-rES/cm_arrays.xml b/packages/SystemUI/res/values-eu-rES/cm_arrays.xml
index 969a4d1..ba9d5de 100644
--- a/packages/SystemUI/res/values-eu-rES/cm_arrays.xml
+++ b/packages/SystemUI/res/values-eu-rES/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>I</item>
+    <!-- North -->
     <item>IE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>HE</item>
+    <!-- South east -->
     <item>H</item>
+    <!-- South -->
     <item>HM</item>
+    <!-- South west -->
     <item>M</item>
+    <!-- West -->
     <item>IM</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-eu-rES/cm_strings.xml b/packages/SystemUI/res/values-eu-rES/cm_strings.xml
index ac12c88..6e55af9 100644
--- a/packages/SystemUI/res/values-eu-rES/cm_strings.xml
+++ b/packages/SystemUI/res/values-eu-rES/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Pasatu hatza eskumara: %1$s</string>
   <string name="right_shortcut_hint">Pasatu hatza ezkerrera: %1$s</string>
   <string name="lockscreen_message">Sakatu ezker edo eskuineko ikono bat blokeo-pantailako lasterbide bat aldatzeko.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Hautatu aplikazioa</string>
   <string name="lockscreen_choose_action_title">Aukeratu ekintza</string>
   <string name="lockscreen_none_target">Bat ere ez</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Hautatu esleituko zaion ekintza</string>
   <string name="navbar_home_button">Hasiera botoia</string>
   <string name="navbar_recent_button">Azkenak botoia</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Menu botoia</string>
   <string name="accessibility_dpad_left">Kurtsorea ezkerrean</string>
   <string name="accessibility_dpad_right">Kurtsorea eskuman</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Ezabatu aplikazioaren datuak</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Gelditzera behartu</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstalatu</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Argiaren distira</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profilak ezgaituta.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profila: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profilak ezgaituta.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil honetara aldatu da: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Hasieratzen\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Argi ezarpenak</string>
   <string name="led_notification_text">LED argia ezarpenetan gaituta</string>
   <string name="qs_tile_edit_header_instruction">Sakatu eta mantendu lauzak berrantolatzeko</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Bistaratu eguraldia</string>
   <string name="quick_settings_title_show_brightness_slider">Bistaratu distira graduatzailea</string>
   <string name="quick_settings_title_enlarge_first_row">Handitu lehen lerroa</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Honek bistan mantenduko du desiltzatzen duzun arte. Sakatu eta mantendu atzera botoia desiltzatzeko.</string>
   <string name="quick_settings_custom_tile_detail_title">Lauza pertsonalizatua</string>
   <string name="quick_settings_remove">Ezabatu lauza</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profilak ezgaituta</string>
   <string name="quick_settings_heads_up_label">Jakinarazpen flotatzaileak</string>
   <string name="quick_settings_battery_saver_label">Bateria aurrezlea</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Bateria aurrezlea (kargatzen)</string>
   <string name="quick_settings_caffeine_label">Kafeina</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sinkronizazioa ezgaituta.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sinkronizazioa gaituta.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sinkronizazioa ezgaituta.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sinkronizazioa gaituta.</string>
   <string name="quick_settings_sync_label">Sinkronizazioa</string>
   <string name="quick_settings_volume_panel_label">Bolumen panela</string>
@@ -81,66 +107,120 @@
   <string name="quick_settings_ambient_display_label">Ambient display</string>
   <string name="quick_settings_lockscreen_label_enforced">Blokeo-pantaila behartuta</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Profilak desgaituta</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Pantailaren denbora-muga: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Pantailaren denbora-muga aldatu da: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Bateria modua</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Bateria modua: energia aurrezteko modua.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Bateria modua: modu orekatua.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Bateria modua: Errendimendu modua.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Bateria modua: modu eraginkorra.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Bateria modua: modu azkarra.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Bateria modua energia aurrezteko modura aldatu da.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Bateria modua modu orekatura aldatu da.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Bateria modua errendimendu modura aldatu da.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Bateria modua modu eraginkorrera aldatu da.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Bateria modua modu azkarrera aldatu da.</string>
   <string name="quick_settings_performance_profile_detail_title">Bateria modua</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Blokeo-pantaila ezgaituta.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Blokeo-pantaila gaituta.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Blokeo pantaila ezgaituta.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Blokeo pantaila gaituta.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambient display itzalita.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display piztuta.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display itzalita.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display piztuta.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Jakinarazpen flotatzaileak ezgaituta.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Jakinarazpen flotatzaileak gaituta.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Jakinarazpen flotatzaileak ezgaituta.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Jakinarazpen flotatzaileak gaituta.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Kafeina ez.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Kafeina bai.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Bateria aurrezlea itzalita.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Bateria aurrezlea piztuta.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Bateria aurrezlea itzalita.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Bateria aurrezlea piztuta.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Lauza dinamikoa</string>
   <string name="dynamic_qs_tile_next_alarm_label">Hurrengo alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME hautatzailea</string>
   <string name="dynamic_qs_tile_su_label">Root sarbidea</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay ezgaituta.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modu automatikoa.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: eguna modua.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: gaua modua.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: kaleko modua.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay ezgaituta.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay modu automatikora aldatu da.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay eguna modura aldatu da.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay gaua modura aldatu da.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay kaleko modura aldatu da.</string>
+  <string name="dynamic_qs_tile_themes_label">Gaiak</string>
   <string name="quick_settings_title_advanced_location">Hiru egoeratako kokapena</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Kokaleku txostena: bateria aurrezteko modua.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Kokaleku txostena: sentsoreak besterik ez modua.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Kokaleku txostena: Zehaztasun handiko modua.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Kokaleku modua</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Bateria aurreztea</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Gailua bakarrik</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Zehaztasun handia</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Kokaleku txostena bateria aurrezteko modura aldatu da.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Kokaleku txostena sentsoreak besterik ez modura aldatu da.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Kokaleku txostena zehaztasun handiko modura aldatu da.</string>
   <string name="quick_settings_tiles_category_system">Sistemaren lauzak</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Gehitu lauza bat</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Ezin da sare mugikorretara konektatu hegaldi modua gaituta dagoenean. Desgaitu hegaldi modua eta saiatu berriro.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Linterna piztuta dago</string>
   <string name="quick_settings_tile_flashlight_not_summary">Sakatu itzaltzeko</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">bezero %1$d</item>
+    <item quantity="other">%1$d bezero</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Ez dago datuetarako SIM txartelik</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Oinarriaren bateria, ehuneko <xliff:g id="number">%d</xliff:g>.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Bistaratu erreprodukzio ilara</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Pasatu hatza behera zabaltzeko</string>
+  <string name="swipe_left_hint">Pasatu hatza ezkerrera <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Pasatu hatza eskumara jakinarazpenentzat</string>
 </resources>
diff --git a/packages/SystemUI/res/values-fa/cm_arrays.xml b/packages/SystemUI/res/values-fa/cm_arrays.xml
index 7f3d065..24aeeac 100644
--- a/packages/SystemUI/res/values-fa/cm_arrays.xml
+++ b/packages/SystemUI/res/values-fa/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>ش</item>
+    <!-- North -->
     <item>ش خ</item>
+    <!-- North east -->
     <item>خ</item>
+    <!-- East -->
     <item>ج خ</item>
+    <!-- South east -->
     <item>ج</item>
+    <!-- South -->
     <item>ج ب</item>
+    <!-- South west -->
     <item>ب</item>
+    <!-- West -->
     <item>ش ب</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-fa/cm_strings.xml b/packages/SystemUI/res/values-fa/cm_strings.xml
index 030560e..24235ea 100644
--- a/packages/SystemUI/res/values-fa/cm_strings.xml
+++ b/packages/SystemUI/res/values-fa/cm_strings.xml
@@ -16,12 +16,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s </xliff:g> - <xliff:g id="condition">%2$s </xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">برای %1$s به راست بکشید</string>
   <string name="right_shortcut_hint">برای %1$s به چپ بکشید</string>
   <string name="select_application">انتخاب برنامه</string>
   <string name="lockscreen_choose_action_title">انتخاب عملکرد</string>
   <string name="lockscreen_none_target">هیچ‌کدام</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">انتخاب عملکرد</string>
   <string name="navbar_home_button">دکمه صفحه اصلی</string>
   <string name="navbar_recent_button">دکمه برنامه‌های اخیر</string>
@@ -33,14 +42,25 @@
   <string name="navbar_menu_big_button">دکمه منو</string>
   <string name="accessibility_dpad_left">نشانگر چپ</string>
   <string name="accessibility_dpad_right">نشانگر راست</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">پاک کردن داده‌های برنامه</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">توقف اجباری</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">لغو نصب</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">پروفایل‌ها خاموش.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">پروفایل: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">پروفایل‌ها خاموش شدند.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">پروفایل به <xliff:g id="profile" example="Default">%s</xliff:g> تغییر یافت.</string>
   <string name="quick_settings_compass_init">مقداردهی اولیه\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">این صفحه تا زمانی که آن را از سنجاق درآورید نمایش داده می‌شود. برای از سنجاق درآوردن دکمه بازگشت را نگه دارید.</string>
   <string name="quick_settings_custom_tile_detail_title">کاشی سفارشی</string>
   <string name="quick_settings_remove">حذف کاشی</string>
@@ -51,9 +71,14 @@
   <string name="quick_settings_profiles_off">پروفایل‌ها غیرفعالند</string>
   <string name="quick_settings_heads_up_label">اعلان فوری</string>
   <string name="quick_settings_battery_saver_label">بهینه‌ساز باتری</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">همگام‌سازی خاموش.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">همگام‌سازی روشن.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">همگام‌سازی خاموش شد.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">همگام‌سازی روشن شد.</string>
   <string name="quick_settings_sync_label">همگام‌‌سازی</string>
   <string name="quick_settings_volume_panel_label">پنل صدا</string>
@@ -62,58 +87,102 @@
   <string name="quick_settings_lockscreen_label">قفل صفحه</string>
   <string name="quick_settings_ambient_display_label">نمایش حساس به محیط</string>
   <string name="quick_settings_lockscreen_label_enforced">اجرای قفل صفحه</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">زمان خاموش شدن صفحه: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">زمان خاموش شدن صفحه به <xliff:g id="timeout" example="30 seconds">%s</xliff:g> تغییر یافت.</string>
   <string name="qs_tile_performance">حالت باتری</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">حالت باتری: ذخیره نیرو.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">حالت باتری: متعادل.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">حالت باتری: کارایی.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">حالت باتری: بازدهی.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">حالت باتری: سریع.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">حالت باتری به ذخیره نیرو تغییر یافت.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">حالت باتری به متعادل تغییر یافت.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">حالت باتری به کارایی تغییر یافت.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">حالت باتری به بازدهی تغییر یافت.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">حالت باتری به سریع تغییر یافت.</string>
   <string name="quick_settings_performance_profile_detail_title">حالت باتری</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">قفل صفحه خاموش.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">قفل صفحه روشن.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">قفل صفحه خاموش شد.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">قفل صفحه روشن شد.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">نمایش حساس به محیط خاموش.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">نمایش حساس به محیط روشن.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">نمایش حساس به محیط خاموش شد.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">نمایش حساس به محیط روشن شد.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">اعلان فوری خاموش.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">اعلان فوری روشن.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">اعلان فوری خاموش شد.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">اعلان فوری روشن شد.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">بهینه‌ساز باتری خاموش.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">بهینه‌ساز باتری روشن.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">بهینه‌ساز باتری خاموش شد.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">بهینه‌ساز باتری روشن شد.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">کاشی پویا</string>
   <string name="dynamic_qs_tile_next_alarm_label">هشدار بعدی</string>
   <string name="dynamic_qs_tile_ime_selector_label">انتخابگر تغییر روش ورودی</string>
   <string name="dynamic_qs_tile_su_label">دسترسی روت</string>
-  <string name="accessibility_quick_settings_live_display_off">نمایش پویا خاموش.</string>
-  <string name="accessibility_quick_settings_live_display_auto">نمایش پویا: حالت خودکار.</string>
-  <string name="accessibility_quick_settings_live_display_day">نمایش پویا: حالت روز.</string>
-  <string name="accessibility_quick_settings_live_display_night">نمایش پویا: حالت شب.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">نمایش پویا: حالت فضای باز.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">نمایش پویا خاموش شد.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">نمایش پویا به حالت خودکار تغییر کرد.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">نمایش پویا به حالت روز تغییر کرد.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">نمایش پویا به حالت شب تغییر کرد.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">نمایش پویا به حالت فضای باز تغییر کرد.</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">گزارش مکان: حالت صرفه‌جویی در باتری.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">گزارش مکان: حالت فقط حسگرها.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">گزارش مکان: حالت دقت بالا.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">حالت مکان</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">صرفه‌جویی در باتری</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">فقط دستگاه</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">دقت بالا</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">گزارش مکان به حالت صرفه‌جویی در باتری تغییر یافت.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">گزارش مکان به حالت فقط حسگرها تغییر یافت.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">گزارش مکان به حالت دقت بالا تغییر یافت.</string>
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">باتری داک <xliff:g id="number">%d</xliff:g> درصد.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">نمایش صف پخش</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-fi/cm_arrays.xml b/packages/SystemUI/res/values-fi/cm_arrays.xml
index cf5825b..3110756 100644
--- a/packages/SystemUI/res/values-fi/cm_arrays.xml
+++ b/packages/SystemUI/res/values-fi/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-fi/cm_strings.xml b/packages/SystemUI/res/values-fi/cm_strings.xml
index 56d12e7..c6e454d 100644
--- a/packages/SystemUI/res/values-fi/cm_strings.xml
+++ b/packages/SystemUI/res/values-fi/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Pyyhkäise oikealle %1$s kertaa</string>
   <string name="right_shortcut_hint">Pyyhkäise vasemmalle %1$s kertaa</string>
   <string name="lockscreen_message">Napauta vasenta tai oikeaa kuvaketta määrittääksesi lukitusnäytön pikakuvakkeen.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Valitse sovellus</string>
   <string name="lockscreen_choose_action_title">Valitse tehtävä</string>
   <string name="lockscreen_none_target">Ei mitään</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Valitse käytettävä toiminto</string>
   <string name="navbar_home_button">Kotinäppäin</string>
   <string name="navbar_recent_button">Viimeisimmät-näppäin</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Valikkonäppäin</string>
   <string name="accessibility_dpad_left">Kohdistin vasemmalle</string>
   <string name="accessibility_dpad_right">Kohdistin oikealle</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Tyhjennä tiedot</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Pakota lopetus</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Poista</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Valon kirkkaus</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiilit pois.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profiili: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiilit pois päältä.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profiili <xliff:g id="profile" example="Default">%s</xliff:g> otettiin käyttöön.</string>
   <string name="quick_settings_compass_init">Alustetaan\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Valoasetukset</string>
   <string name="led_notification_text">LED-valo otettu käyttöön asetuksissa</string>
   <string name="qs_tile_edit_header_instruction">Paina tiiltä ja pidä pohjassa järjestääksesi</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Näytä sää</string>
   <string name="quick_settings_title_show_brightness_slider">Näytä kirkkauden liukusäädin</string>
   <string name="quick_settings_title_enlarge_first_row">Pienennä ensimmäinen rivi</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Tämä pitää sen näkyvissä, kunnes poistat kiinnityksen. Paina ja pidä Takasin-näppäintä pohjassa irrottaaksesi.</string>
   <string name="quick_settings_custom_tile_detail_title">Mukautettu tiili</string>
   <string name="quick_settings_remove">Poista tiili</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profiilit pois käytöstä</string>
   <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="quick_settings_battery_saver_label">Virransäästö</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Virransäästö (latautuu)</string>
   <string name="quick_settings_caffeine_label">Kofeiini</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synkronointi pois.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synkronointi päällä.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synkronointi pois päältä.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synkronointi päällä.</string>
   <string name="quick_settings_sync_label">Synkronointi</string>
   <string name="quick_settings_volume_panel_label">Äänenvoimakkuuspaneeli</string>
@@ -81,66 +107,119 @@
   <string name="quick_settings_ambient_display_label">Ambient-näyttö</string>
   <string name="quick_settings_lockscreen_label_enforced">Lukitusnäyttö pakotettu</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Profiili poistanut käytöstä</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Näytön aikakatkaisu: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Näytön aikakatkaisu asettiin aikaan <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Akkutila</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Akkutila: virransäästötila.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Akkutila: tasapainotettu-tila.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Akkutila: suorituskykytila.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Akkutila: virransäästö.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Akkutila: suorituskyky.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Akkutila asetettiin virransäästötilaan.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Akkutila asetettiin tasapainotettu-tilaan.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Akkutila asetettiin suorituskykytilaan.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Akkutila vaihdettu virransäästötilaan.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Akkutila vaihdettu suorituskykytilaan.</string>
   <string name="quick_settings_performance_profile_detail_title">Akkutila</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Lukitusnäyttö pois.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Lukitusnäyttö päällä.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Lukitusnäyttö pois päältä.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Lukitusnäyttö päällä.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambient-näyttö pois.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambient-näyttö päällä.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient-näyttö pois päältä.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient-näyttö päällä.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Heads up pois.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Heads up päällä.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads up pois päältä.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Heads up päällä.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Kofeiini pois.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Kofeiini päällä.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Virransäästö pois.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Virransäästö päällä.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Virransäästö pois käytöstä.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Virransäästö käytössä.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynaamiset tiilet</string>
   <string name="dynamic_qs_tile_next_alarm_label">Seuraava hälytys</string>
   <string name="dynamic_qs_tile_ime_selector_label">Syöttötavan valitsin</string>
   <string name="dynamic_qs_tile_su_label">Root-oikeudet</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay pois.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automaattitila.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: päivätila.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: yötila.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: ulkoilmatila.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay pois päältä.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay asetettu automaattitilaan.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay asetettu päivätilaan.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay asetettu yötilaan.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay asetettu ulkoilmatilaan.</string>
   <string name="quick_settings_title_advanced_location">Sijainnin lisäasetukset</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Sijainnin raportointi: virransäästötila.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Sijainti: Vain laite.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Sijainnin raportointi: korkea tarkkuus.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Sijaintitilat</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Virransäästö</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Vain laite</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Korkea tarkkuus</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Sijaintitila asetettu virransäästötilaan.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Sijaintitila asetettu vain laite-tilaan.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Sijaintitila asetettu korkean tarkkuuden tilaan.</string>
   <string name="quick_settings_tiles_category_system">Järjestelmätiilet</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Lisää tiili</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Yhteyden muodostaminen mobiiliverkkoihin lentokonetilan aikana ei onnistu. Poista lentokonetila käytöstä ja yritä uudelleen.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Taskulamppu on päällä</string>
   <string name="quick_settings_tile_flashlight_not_summary">Paina sammuttaaksesi</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d yhdistetty laite</item>
+    <item quantity="other">%1$d yhdistettyä laitetta</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Ei data-SIMiä</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Telakan akku <xliff:g id="number">%d</xliff:g> prosenttia.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Näytä toistojono</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Pyyhkäise alas laajentaaksesi</string>
+  <string name="swipe_left_hint">Pyyhkäise vasemmalle avataksesi sovelluksen <xliff:g id="app_name">%1$s </xliff:g></string>
+  <string name="swipe_right_hint">Pyyhkäise oikealle avataksesi ilmoitukset</string>
 </resources>
diff --git a/packages/SystemUI/res/values-fil-rPH/cm_arrays.xml b/packages/SystemUI/res/values-fil-rPH/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-fil-rPH/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-fil-rPH/cm_strings.xml b/packages/SystemUI/res/values-fil-rPH/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-fil-rPH/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-fr-rCA/cm_arrays.xml b/packages/SystemUI/res/values-fr-rCA/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-fr-rCA/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-fr-rCA/cm_strings.xml b/packages/SystemUI/res/values-fr-rCA/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-fr-rCA/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-fr/cm_arrays.xml b/packages/SystemUI/res/values-fr/cm_arrays.xml
index cb6fbec..85897e7 100644
--- a/packages/SystemUI/res/values-fr/cm_arrays.xml
+++ b/packages/SystemUI/res/values-fr/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SO</item>
+    <!-- South west -->
     <item>O</item>
+    <!-- West -->
     <item>NO</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-fr/cm_strings.xml b/packages/SystemUI/res/values-fr/cm_strings.xml
index ffcb7e1..178a379 100644
--- a/packages/SystemUI/res/values-fr/cm_strings.xml
+++ b/packages/SystemUI/res/values-fr/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Balayer à droite pour %1$s</string>
   <string name="right_shortcut_hint">Balayer à gauche pour %1$s</string>
   <string name="lockscreen_message">Appuyez sur une icône à gauche ou à droite pour réattribuer un raccourci sur l\'écran de verrouillage.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Sélectionner une application</string>
   <string name="lockscreen_choose_action_title">Choisir une action</string>
   <string name="lockscreen_none_target">Aucune</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Choisir l\'action à assigner</string>
   <string name="navbar_home_button">Bouton d\'accueil</string>
   <string name="navbar_recent_button">Bouton d\'applications récentes</string>
@@ -37,26 +46,38 @@
   <string name="navbar_menu_big_button">Bouton menu</string>
   <string name="accessibility_dpad_left">Curseur gauche</string>
   <string name="accessibility_dpad_right">Curseur droit</string>
-  <string name="advanced_dev_option_wipe_app">Effacer les données de l\'application</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">Effacer données de l\'appli</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Forcer l\'arrêt</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Désinstaller</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Luminosité</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profils désactivés.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil : <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profils désactivés.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil changé  en <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Initialisation\u2026</string>
-  <string name="led_notification_title">Paramètres de la DEL</string>
-  <string name="led_notification_text">DEL activée par les paramètres</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Paramètres du voyant</string>
+  <string name="led_notification_text">LED activée par les paramètres</string>
   <string name="qs_tile_edit_header_instruction">Appuyez et maintenez les raccourcis pour les réorganiser</string>
   <string name="quick_settings_edit_label">Modifier les raccourcis</string>
-  <string name="quick_settings_cannot_delete_edit_tile">Impossible de supprimer le raccourci modifié</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Impossible de supprimer le raccourci Éditer</string>
   <string name="qs_tiles_reset_confirmation">Réinitialiser les raccourcis à la configuration par défaut ?</string>
   <string name="quick_settings_tile_reset_to_default">Réinitialiser à la disposition par défaut</string>
   <string name="quick_settings_title_header">En-tête</string>
   <string name="quick_settings_title_tiles">Raccourcis</string>
   <string name="quick_settings_title_show_weather">Afficher la météo</string>
+  <string name="quick_settings_title_show_brightness_slider">Afficher le curseur de luminosité</string>
   <string name="quick_settings_title_enlarge_first_row">Agrandir la première ligne</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Cela le laisse en vue jusqu\'à ce que vous le détachiez. Appuyez et maintenez le bouton retour pour détacher.</string>
   <string name="quick_settings_custom_tile_detail_title">Raccourci personnalisé</string>
   <string name="quick_settings_remove">Supprimer le raccourci</string>
@@ -67,72 +88,134 @@
   <string name="quick_settings_profiles_off">Profils désactivés</string>
   <string name="quick_settings_heads_up_label">Notifications flottantes</string>
   <string name="quick_settings_battery_saver_label">Économiseur de batterie</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Économiseur de batterie (en charge)</string>
+  <string name="quick_settings_caffeine_label">Caféine</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synchronisation désactivée.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synchronisation activée.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synchronisation désactivée.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synchronisation activée.</string>
-  <string name="quick_settings_sync_label">Synchroniser</string>
+  <string name="quick_settings_sync_label">Synchro</string>
   <string name="quick_settings_volume_panel_label">Panneau de volume</string>
   <string name="quick_settings_usb_tether_label">Modem USB</string>
   <string name="quick_settings_screen_timeout_detail_title">Veille de l\'écran</string>
   <string name="quick_settings_lockscreen_label">Écran de verrouillage</string>
   <string name="quick_settings_ambient_display_label">Affichage en mode veille</string>
   <string name="quick_settings_lockscreen_label_enforced">Écran de verrouillage forcé</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Désactivé par profil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Veille de l\'écran : <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Veille de l\'écran changée à <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Mode batterie</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Mode batterie  : économie d\'énergie.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Mode batterie : équilibré.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Mode batterie : haute performance.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Mode batterie : efficace.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Mode batterie : rapide.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">La batterie est maintenant en mode économie d\'énergie.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">La batterie est maintenant en mode équilibré.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">La batterie est maintenant en mode performances.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Mode batterie changé en mode efficace.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Mode batterie changé en mode rapide.</string>
   <string name="quick_settings_performance_profile_detail_title">Mode batterie</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Écran de verrouillage désactivé.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Écran de verrouillage activé.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Verrouillage d\'écran désactivé.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Verrouillage d\'écran activé.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Affichage en mode veille désactivé.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Affichage en mode veille activé.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Affichage en mode veille désactivé.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Affichage en mode veille activé.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Notifications flottantes désactivées.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Notifications flottantes activées.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Notifications flottantes désactivées.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Notifications flottantes activées.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Caféine éteinte.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Caféine allumée.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Économiseur de batterie désactivé.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Économiseur de batterie activé.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">L\'économiseur de batterie a été désactivé.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">L\'économiseur de batterie a été activé.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Raccourcis dynamiques</string>
   <string name="dynamic_qs_tile_next_alarm_label">Prochaine alarme</string>
-  <string name="dynamic_qs_tile_ime_selector_label">Sélecteur de mode de saisie</string>
+  <string name="dynamic_qs_tile_ime_selector_label">Mode de saisie</string>
   <string name="dynamic_qs_tile_su_label">Accès root</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay désactivé.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay : mode automatique.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay : mode jour.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay : mode nuit.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay : mode plein air.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay désactivé.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay changé en mode automatique.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay changé en mode jour.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay changé en mode nuit.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay changé en mode plein air.</string>
-  <string name="quick_settings_title_advanced_location">Localisation par triangulation</string>
+  <string name="quick_settings_title_advanced_location">Localisation à trois états</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Localisation : mode économie de batterie.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Localisation : mode appareil uniquement.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Localisation : mode haute précision.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Mode de localisation</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Économie de batterie</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Appareil uniquement</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Haute précision</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Localisation changée en mode économie de batterie.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Localisation changée en mode appareil uniquement.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Localisation changée en mode haute précision.</string>
   <string name="quick_settings_tiles_category_system">Raccourcis système</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Ajouter un raccourci</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Impossible de se connecter aux réseaux mobiles quand le mode avion est activé. Désactivez le mode avion et réessayez.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Lampe de poche allumée</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Toucher pour éteindre</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d clients</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Aucune donnée SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Batterie de la station d\'accueil chargée à <xliff:g id="number">%d</xliff:g> pour cent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Voir la file d\'attente de lecture</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-frp-rIT/cm_arrays.xml b/packages/SystemUI/res/values-frp-rIT/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-frp-rIT/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-frp-rIT/cm_strings.xml b/packages/SystemUI/res/values-frp-rIT/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-frp-rIT/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-frp-rIT/strings.xml b/packages/SystemUI/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-frp-rIT/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-fy-rNL/cm_arrays.xml b/packages/SystemUI/res/values-fy-rNL/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-fy-rNL/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-fy-rNL/cm_strings.xml b/packages/SystemUI/res/values-fy-rNL/cm_strings.xml
index 5c05f67..9c17875 100644
--- a/packages/SystemUI/res/values-fy-rNL/cm_strings.xml
+++ b/packages/SystemUI/res/values-fy-rNL/cm_strings.xml
@@ -16,5 +16,82 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="quick_settings_nfc_label">NFC</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-fy-rNL/strings.xml b/packages/SystemUI/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-fy-rNL/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-ga-rIE/cm_arrays.xml b/packages/SystemUI/res/values-ga-rIE/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-ga-rIE/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-ga-rIE/cm_strings.xml b/packages/SystemUI/res/values-ga-rIE/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-ga-rIE/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-ga-rIE/strings.xml b/packages/SystemUI/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-ga-rIE/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-gd-rGB/cm_arrays.xml b/packages/SystemUI/res/values-gd-rGB/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-gd-rGB/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-gd-rGB/cm_strings.xml b/packages/SystemUI/res/values-gd-rGB/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-gd-rGB/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-gd-rGB/strings.xml b/packages/SystemUI/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-gd-rGB/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-gl-rES/cm_arrays.xml b/packages/SystemUI/res/values-gl-rES/cm_arrays.xml
index 3d34bbb..f57af4d 100644
--- a/packages/SystemUI/res/values-gl-rES/cm_arrays.xml
+++ b/packages/SystemUI/res/values-gl-rES/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NL</item>
+    <!-- North east -->
     <item>L</item>
+    <!-- East -->
     <item>SL</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SO</item>
+    <!-- South west -->
     <item>O</item>
+    <!-- West -->
     <item>NO</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-gl-rES/cm_strings.xml b/packages/SystemUI/res/values-gl-rES/cm_strings.xml
index ef89e4c..31232af 100644
--- a/packages/SystemUI/res/values-gl-rES/cm_strings.xml
+++ b/packages/SystemUI/res/values-gl-rES/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Arrastra á dereita para %1$s</string>
   <string name="right_shortcut_hint">Arrastra á esquerda para %1$s</string>
   <string name="lockscreen_message">Toque nunha icona na dereita ou na esquerda para volver a asignar un atallo da pantalla de bloqueo.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Seleccionar aplicación</string>
   <string name="lockscreen_choose_action_title">Escoller acción</string>
   <string name="lockscreen_none_target">Ningunha</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Escoller unha acción que asignar</string>
   <string name="navbar_home_button">Botón de inicio</string>
   <string name="navbar_recent_button">Botón de recentes</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Botón do menú</string>
   <string name="accessibility_dpad_left">Cursor á esquerda</string>
   <string name="accessibility_dpad_right">Cursor á dereita</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Borrar os datos da aplicación</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Forzar a parada</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstalar</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Brillo da luz</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Perfís desactivados.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Perfil: <xliff:g id="profile" example="Predeterminado">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Perfís desactivados.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Perfil cambiado a <xliff:g id="profile" example="Predeterminado">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicializando\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Configuración de luz</string>
   <string name="led_notification_text">Luz LED activada por configuración</string>
   <string name="qs_tile_edit_header_instruction">Prema e sosteña as baldosas para reorganizalas</string>
@@ -56,7 +75,9 @@
   <string name="quick_settings_title_header">Cabeceira</string>
   <string name="quick_settings_title_tiles">Baldosas</string>
   <string name="quick_settings_title_show_weather">Amosar o prognóstico</string>
+  <string name="quick_settings_title_show_brightness_slider">Amosar barra de brillo</string>
   <string name="quick_settings_title_enlarge_first_row">Ampliar a primeira fila</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Amosarase mentres esté fixado. Para deixar de fixalo, mantén tocado o botón Atrás.</string>
   <string name="quick_settings_custom_tile_detail_title">Botón personalizado</string>
   <string name="quick_settings_remove">Retirar botón</string>
@@ -67,9 +88,16 @@
   <string name="quick_settings_profiles_off">Perfís desactivados</string>
   <string name="quick_settings_heads_up_label">Notificacións emerxentes</string>
   <string name="quick_settings_battery_saver_label">Economizador da bateria</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Aforrador de batería (cargando)</string>
+  <string name="quick_settings_caffeine_label">Cafeína</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sincronización apagada.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sincronización acesa.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">A sincronización foi apagada.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">A sincronización foi acendida.</string>
   <string name="quick_settings_sync_label">Sincronización</string>
   <string name="quick_settings_volume_panel_label">Panel de volume</string>
@@ -78,62 +106,121 @@
   <string name="quick_settings_lockscreen_label">Bloqueo de pantalla</string>
   <string name="quick_settings_ambient_display_label">Visualización de ambiente</string>
   <string name="quick_settings_lockscreen_label_enforced">Bloqueo de pantalla estabelecido</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Desactivado polo perfil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Tempo de espera da pantalla: <xliff:g id="timeout" example="30 segundos">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Tempo de espera da pantalla cambiado a <xliff:g id="timeout" example="30 segundos">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Modo da batería</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Modo da batería: modo de aforro de enerxía.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Modo da batería: modo equilibrado.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Modo da batería: modo rendemento.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Modo da bateria: modo eficiente.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Modo da bateria: modo rápido.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">O modo da batería cambiou a modo de aforro de enerxía.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">O modo da batería cambiou a modo equilibrado.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">O modo da batería cambiou a modo rendemento.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">O modo da batería cambiou a modo eficiente.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">O modo da batería cambiou a modo rápido.</string>
   <string name="quick_settings_performance_profile_detail_title">Modo da batería</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Bloqueo de pantalla desactivado.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Bloqueo de pantalla activado.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Bloqueo de pantalla desactivado.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Bloqueo de pantalla activado.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Visualización de ambiente desactivada.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Visualización de ambiente activada.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">A visualización de ambiente foi desactivada.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">A visualización de ambiente foi activada.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Notificacións emerxentes desactivadas.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Notificacións emerxentes activadas.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">As notificacións emerxentes foron desactivadas.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">As notificacións emerxentes foron activadas.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Deshabilitar Cafeína.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Habilitar Cafeína.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Economizador da batería apagado.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Economizador da bateria aceso.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">O economizador da batería foi apagado.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">O economizador da batería foi acendido.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Botón dinámico</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próxima alarma</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
   <string name="dynamic_qs_tile_su_label">Acceso de superusuario</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay desactivado.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modo automático.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: modo día.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: modo noite.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modo exteriores.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay desactivado.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay cambiado a modo automático.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay cambiado a modo día.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay cambiado a modo noite.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay cambiado a modo exteriores.</string>
+  <string name="dynamic_qs_tile_themes_label">Temas</string>
   <string name="quick_settings_title_advanced_location">Localización por triangulación</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Informe de localización: en modo aforro de batería.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Informe de localización: en modo de sensores.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Informe de localización: en modo de alta precisión.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Modo de localización</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Aforro de batería</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Só dispositivo</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Alta precisión</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Informe de localización cambiado a modo aforro de batería.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Informe de localización cambiado a modo sensores.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Informe de localización cambiado a modo alta precisión.</string>
+  <string name="quick_settings_tiles_category_system">Baldosas do sistema</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Engadir unha baldosa</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Non é posíbel conectar a rede móbil mentres o modo Avión está activado. Desactívao e téntao de novo.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">A lanterna está acesa</string>
   <string name="quick_settings_tile_flashlight_not_summary">Toca para apagala</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d cliente</item>
+    <item quantity="other">%1$d clientes</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">SIM sen datos</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Batería do conector <xliff:g id="number">%d</xliff:g> %.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Amosar a cola de reproducción</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Esvarar cara abaixo para expandir</string>
+  <string name="swipe_left_hint">Esvarar cara a esquerda para <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Esvarar cara a dereita para ver as notificacións</string>
 </resources>
diff --git a/packages/SystemUI/res/values-gu-rIN/cm_arrays.xml b/packages/SystemUI/res/values-gu-rIN/cm_arrays.xml
new file mode 100644
index 0000000..606537e
--- /dev/null
+++ b/packages/SystemUI/res/values-gu-rIN/cm_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>ઉ</item>
+    <!-- North -->
+    <item>ઉ.પૂર્વ</item>
+    <!-- North east -->
+    <item>પૂર્વ</item>
+    <!-- East -->
+    <item>દ.પૂર્વ</item>
+    <!-- South east -->
+    <item>દ</item>
+    <!-- South -->
+    <item>દ. પ</item>
+    <!-- South west -->
+    <item>પ</item>
+    <!-- West -->
+    <item>ઉ. પ</item>
+    <!-- North west -->
+  </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-gu-rIN/cm_strings.xml b/packages/SystemUI/res/values-gu-rIN/cm_strings.xml
new file mode 100644
index 0000000..ba08659
--- /dev/null
+++ b/packages/SystemUI/res/values-gu-rIN/cm_strings.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">%1$s માટે જમણી બાજુ સ્વાઇપ કરો</string>
+  <string name="right_shortcut_hint">%1$s માટે ડાબી બાજુ સ્વાઇપ કરો</string>
+  <string name="lockscreen_message">લૉકસ્ક્રીન શોર્ટકટની પુન:ફાળવણી કરવા માટે આઇકૉનને ડાબે અથવા જમણે ટૅપ કરો.</string>
+  <string name="lockscreen_default_target">ડિફોલ્ટ</string>
+  <string name="select_application">એપ્લિકેશન પસંદ કરો</string>
+  <string name="lockscreen_choose_action_title">ક્રિયા પસંદ કરો</string>
+  <string name="lockscreen_none_target">કોઈ નહીં</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">ફાળવણી માટે ક્રિયા પસંદ કરો</string>
+  <string name="navbar_home_button">હોમ બટન</string>
+  <string name="navbar_recent_button">રીસન્ટ બટન</string>
+  <string name="navbar_search_button">સર્ચ બટન</string>
+  <string name="navbar_back_button">બૅક બટન</string>
+  <string name="navbar_empty_button">એમ્પ્ટી બટન</string>
+  <string name="navbar_menu_conditional_button">મેન્યૂ (ઑટોહાઇડ) બટન</string>
+  <string name="navbar_menu_always_button">મેન્યૂ (ઑટોહાઇડ) બટન</string>
+  <string name="navbar_menu_big_button">મેનુ બટન</string>
+  <string name="accessibility_dpad_left">કર્સર ડાબું</string>
+  <string name="accessibility_dpad_right">કર્સર જમણું</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">એપ્લિકેશન ડેટા સાફ કરો</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">ફરજિયાત બંધ કરો</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">અનઇન્સ્ટોલ કરો</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">લાઇટ બ્રાઇટનેસ</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">પ્રોફાઇલ્સ બંધ.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">પ્રોફાઇલ: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">પ્રોફાઇલ્સ બંધ કરાયું.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">પ્રોફાઇલ્સ બદલીને <xliff:g id="profile" example="Default">%s</xliff:g>કરાયું.</string>
+  <string name="quick_settings_compass_init">શરૂ થાય છે\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">લાઇટ સેટિંગ્સ</string>
+  <string name="led_notification_text">સેટિંગ્સ દ્વારા LED લાઇટ સક્ષમ થઈ</string>
+  <string name="qs_tile_edit_header_instruction">પુન:ગોઠવવા માટે ટાઇલ્સ દબાવો અને પકડી રાખો</string>
+  <string name="quick_settings_edit_label">ટાઇલ્સ એડિટ કરો</string>
+  <string name="quick_settings_cannot_delete_edit_tile">સંપાદન ટાઇલ ભૂંસી શકાતી નથી</string>
+  <string name="qs_tiles_reset_confirmation">ક્વિક સેટિંગ્સ ટાઇલ્સને ડિફૉલ્ટ કન્ફિગ્યુરેશન પર રિસેટ કરો?</string>
+  <string name="quick_settings_tile_reset_to_default">ડિફૉલ્ટ લેઆઉટ પર રિસેટ કરો</string>
+  <string name="quick_settings_title_header">હેડર</string>
+  <string name="quick_settings_title_tiles">ટાઇલ્સ</string>
+  <string name="quick_settings_title_show_weather">હવામાન દર્શાવો</string>
+  <string name="quick_settings_title_show_brightness_slider">બ્રાઇટનેસ સ્લાઇડર દર્શાવો</string>
+  <string name="quick_settings_title_enlarge_first_row">પ્રથમ પંક્તિ મોટી કરો</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">તમે અનપીન કરો નહી ત્યાં સુધી આ બાબત તેને નજર સામે રાખે છે. અનપિન કરવા માટે બૅક બટન ટચ કરીને પકડી રાખો.</string>
+  <string name="quick_settings_custom_tile_detail_title">કસ્ટમ ટાઇલ</string>
+  <string name="quick_settings_remove">ટાઇલ કાઢી નાંખો</string>
+  <string name="quick_settings_network_adb_label">નેટવર્ક પર ADB</string>
+  <string name="quick_settings_compass_label">કમ્પાસ</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">સિસ્ટમ પ્રોફાઇલ્સ</string>
+  <string name="quick_settings_profiles_off">પ્રોફાઇલ્સ અક્ષમ કરાઇ</string>
+  <string name="quick_settings_heads_up_label">હેડ્સ અપ</string>
+  <string name="quick_settings_battery_saver_label">બૅટરી સેવર</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">કેફીન</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">સિંક્રનાઇઝ બંધ.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">સિંક્રનાઇઝ ચાલુ.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">સિંક્રનાઇઝ બંધ કરાયું.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">સિંક્રનાઇઝ ચાલુ કરાયું.</string>
+  <string name="quick_settings_sync_label">સમન્વયન</string>
+  <string name="quick_settings_volume_panel_label">વૉલ્યુમ પૅનલ.</string>
+  <string name="quick_settings_usb_tether_label">USB ટિથરિંગ</string>
+  <string name="quick_settings_screen_timeout_detail_title">સ્ક્રીન સમય સમાપ્તિ</string>
+  <string name="quick_settings_lockscreen_label">સ્ક્રીન લોક કરો</string>
+  <string name="quick_settings_ambient_display_label">વ્યાપક ડિસ્પ્લે</string>
+  <string name="quick_settings_lockscreen_label_enforced">લૉક સ્ક્રીન અમલી</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">પ્રોફાઇલ દ્વારા અક્ષમ</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">સ્ક્રીન સમય સમાપ્તિ: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">સ્ક્રીન સમય સમાપ્તિ બદલીને <xliff:g id="timeout" example="30 seconds">%s</xliff:g>કરાઇ.</string>
+  <string name="qs_tile_performance">બૅટરી મોડ</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">બૅટરી મોડ: પાવર બચત મોડ.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">બૅટરી મોડ: સમતુલિત મોડ.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">બૅટરી મોડ: કામગીરી મોડ.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">બૅટરી મોડ: કાર્યક્ષમતા મોડ.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">બૅટરી મોડ: ઝડપી મોડ.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">બૅટરી મોડ પાવર બચત મોડ તરીકે બદલાયું.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">બૅટરી મોડ સમતુલિત મોડ તરીકે બદલાયું.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">બૅટરી મોડ કામગીરી મોડ તરીકે બદલાયું.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">બૅટરી મોડ કાર્યક્ષમતા મોડ તરીકે બદલાયું.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">બૅટરી મોડ ઝડપી મોડ તરીકે બદલાયું.</string>
+  <string name="quick_settings_performance_profile_detail_title">બૅટરી મોડ</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">લૉક સ્ક્રીન બંધ.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">લૉક સ્ક્રીન ચાલુ.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">લૉક સ્ક્રીન બંધ કરાયું.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">લૉક સ્ક્રીન ચાલુ કરાયું.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">વ્યાપક પ્રદર્શન બંધ.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">વ્યાપક પ્રદર્શન ચાલુ.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">વ્યાપક પ્રદર્શન બંધ કરાયું.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">વ્યાપક પ્રદર્શન ચાલુ કરાયું.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">હેડ્સ અપ બંધ.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">હેડ્સ અપ ચાલુ.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">હેડ્સ અપ બંધ કરાયું.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">હેડ્સ અપ ચાલુ કરાયું.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">કેફીન બંધ.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">કેફીન ચાલુ.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">બૅટરી સેવર બંધ.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">બૅટરી સેવર ચાલુ.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">બૅટરી સેવર બંધ કરાયું.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">બૅટરી સેવર ચાલુ કરાયું.</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">ડાયનેમિક ટાઇલ</string>
+  <string name="dynamic_qs_tile_next_alarm_label">આગામી ઍલાર્મ</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME સિલેક્ટર</string>
+  <string name="dynamic_qs_tile_su_label">રૂટ ઍક્સેસ</string>
+  <string name="quick_settings_title_advanced_location">Tri-state સ્થાન</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">સ્થાન રિપોર્ટિંગ: બૅટરી બચત મોડ.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">સ્થાન રિપોર્ટિંગ: ફક્ત સેન્સર્સ મોડ.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">સ્થાન રિપોર્ટિંગ: ઉચ્ચ સચોટતા મોડ.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">સ્થાન મોડ</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">બૅટરી બચત</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">ફક્ત ઉપકરણ</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">ઉચ્ચ સચોટતા</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">સ્થાન રિપોર્ટિંગ બૅટરી બચત મોડ પર બદલવામાં આવ્યું.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">સ્થાન રિપોર્ટિંગ ફક્ત સેન્સર્સ મોડ પર બદલવામાં આવ્યું.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">સ્થાન રિપોર્ટિંગ ઉચ્ચ સચોટતા મોડ પર બદલવામાં આવ્યું.</string>
+  <string name="quick_settings_tiles_category_system">સિસ્ટમ ટાઇલ્સ</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">ટાઇલ ઍડ કરો</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">એરપ્લેન મોડ સક્ષમ કરવામાં આવે ત્યારે મોબાઇલ નેટવર્ક્સ સાથે જોડાવામાં અક્ષમ. એરપ્લેન મોડ અક્ષમ કરો અને ફરી પ્રયાસ કરો.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ફ્લૅશલાઇટ ચાલુ છે</string>
+  <string name="quick_settings_tile_flashlight_not_summary">બંધ કરવા ટૅપ કરો</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d clients</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">કોઈ ડેટા SIM નથી</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">ડૉક બેટરી <xliff:g id="number">%d</xliff:g> ટકા.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">પ્લે હરોળ દર્શાવો</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-hi/cm_arrays.xml b/packages/SystemUI/res/values-hi/cm_arrays.xml
index e44502d..1e8bded 100644
--- a/packages/SystemUI/res/values-hi/cm_arrays.xml
+++ b/packages/SystemUI/res/values-hi/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>उ</item>
+    <!-- North -->
     <item>उपू</item>
+    <!-- North east -->
     <item>पू</item>
+    <!-- East -->
     <item>दपू</item>
+    <!-- South east -->
     <item>द</item>
+    <!-- South -->
     <item>दप</item>
+    <!-- South west -->
     <item>प</item>
+    <!-- West -->
     <item>उप</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-hi/cm_strings.xml b/packages/SystemUI/res/values-hi/cm_strings.xml
index fd86432..3502636 100644
--- a/packages/SystemUI/res/values-hi/cm_strings.xml
+++ b/packages/SystemUI/res/values-hi/cm_strings.xml
@@ -16,12 +16,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">%1$s के लिए दायाँ स्वाइप करें</string>
   <string name="right_shortcut_hint">%1$s के लिए बायाँ स्वाइप करें</string>
   <string name="select_application">अनुप्रयोग चुनें</string>
   <string name="lockscreen_choose_action_title">कार्य चुनें</string>
   <string name="lockscreen_none_target">कोई नहीं</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">निर्दिष्ट करने के लिए कार्य चुनें</string>
   <string name="navbar_home_button">होम बटन</string>
   <string name="navbar_recent_button">हाल का बटन</string>
@@ -33,14 +42,25 @@
   <string name="navbar_menu_big_button">मेनू बटन</string>
   <string name="accessibility_dpad_left">कर्सर बायाँ</string>
   <string name="accessibility_dpad_right">कर्सर दायाँ</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">ऐप डेटा को साफ़ करें</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">ज़बर्दस्ती बंद करें</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">विस्थापित करें</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">प्रोफ़ाइलें बंद है।</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">प्रोफ़ाइल: <xliff:g id="profile" example="Default">%s</xliff:g>।</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">प्रोफाइलों को बंद किया गया है।</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">प्रोफ़ाइल को <xliff:g id="profile" example="Default">%s</xliff:g> में बदला गया।</string>
   <string name="quick_settings_compass_init">प्रारंभ कर रहे हैं\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">यह इसे तब तक दृश्य में रखता है जब तक आप अनपिन नहीं करते। अनपिन करने के लिए बैक बटन को कुछ देर छूते रहें।</string>
   <string name="quick_settings_custom_tile_detail_title">मनपसंद टाइल</string>
   <string name="quick_settings_remove">टाइल हटाएँ</string>
@@ -50,9 +70,14 @@
   <string name="quick_settings_profiles">सिस्टम प्रोफ़ाइलें</string>
   <string name="quick_settings_profiles_off">प्रोफ़ाइलें अक्षम हैं</string>
   <string name="quick_settings_heads_up_label">हेड्स अप।</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">संकालन बंद है।</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">संकालन चालू है।</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">संकालन को बंद किया गया है।</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">संकालन को चालू किया गया है।</string>
   <string name="quick_settings_sync_label">संकालन</string>
   <string name="quick_settings_usb_tether_label">यूएसबी टेदरिंग</string>
@@ -60,48 +85,91 @@
   <string name="quick_settings_lockscreen_label">स्क्रीन को लॉक करें</string>
   <string name="quick_settings_ambient_display_label">परिवेशी प्रदर्शन</string>
   <string name="quick_settings_lockscreen_label_enforced">स्क्रीन को लॉक करें प्रवर्तित</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">स्क्रीन समय-समाप्ति: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>।</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">स्क्रीन समय-समाप्ति को <xliff:g id="timeout" example="30 seconds">%s</xliff:g> में बदला गया।</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">बैटरी मोड: पावर बचाव मोड।</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">बैटरी मोड: संतुलित मोड।</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">बैटरी मोड: निष्पादन मोड।</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">बैटरी मोड को पावर बचाव मोड में बदला गया।</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">बैटरी मोड को संतुलित मोड में बदला गया।</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">बैटरी मोड को निष्पादन मोड में बदला गया।</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">स्क्रीन को लॉक करें बंद है।</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">स्क्रीन को लॉक करें चालू है।</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">स्क्रीन को लॉक करें को बंद किया गया है।</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">स्क्रीन को लॉक करें को चालू किया गया है।</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">परिवेशी प्रदर्शन बंद है।</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">परिवेशी प्रदर्शन चालू है।</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">परिवेशी प्रदर्शन को बंद किया गया है।</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">परिवेशी प्रदर्शन को चालू किया गया।</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">हेड्स अप बंद है।</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">हेड्स अप चालू है।</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">हेड्स अप को बंद किया गया है।</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">हेड्स अप को चालू किया गया।</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">गतिशील टाइल</string>
   <string name="dynamic_qs_tile_next_alarm_label">अलगा अलार्म</string>
   <string name="dynamic_qs_tile_ime_selector_label">आईएमई चयनक</string>
   <string name="dynamic_qs_tile_su_label">मूल पहुँच</string>
-  <string name="accessibility_quick_settings_live_display_off">लाइवडिस्प्ले बंद है।</string>
-  <string name="accessibility_quick_settings_live_display_auto">लाइवडिस्प्ले: स्वतः मोड।</string>
-  <string name="accessibility_quick_settings_live_display_day">लाइवडिस्प्ले: दिन मोड।</string>
-  <string name="accessibility_quick_settings_live_display_night">लाइवडिस्प्ले: रात मोड।</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">लाइवडिस्प्ले: बाहरी मोड।</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">लाइवडिस्प्ले को बंद किया गया है।</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">लाइवडिस्प्ले को स्वतः मोड में बदला गया।</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">लाइवडिस्प्ले को दिन मोड में बदला गया।</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">लाइवडिस्प्ले को रात मोड में बदला गया।</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">लाइवडिस्प्ले को बाहरी मोड में बदला गया।</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">स्थान रिपोर्टिंग: बैटरी बचानेवाला मोड।</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">स्थान रिपोर्टिंग: केवल सेंसर मोड।</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">स्थान रिपोर्टिंग: उच्च सटीकता मोड।</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">स्थान मोड</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">बैटरी बचानेवाला</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">केवल उपकरण</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">उच्च सटीकता</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">स्थान रिपोर्टिंग को बैटरी बचाव मोड में बदला गया।</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">स्थान रिपोर्टिंग में केवल संवेदक मोड में बदला गया।</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">स्थान रिपोर्टिंग को उच्च सटीकता मोड में बदला गया।</string>
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">बैटरी <xliff:g id="number">%d</xliff:g> प्रतिशत को डॉक करें।</string>
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-hr/cm_arrays.xml b/packages/SystemUI/res/values-hr/cm_arrays.xml
index f4c09d0..ebe3e06 100644
--- a/packages/SystemUI/res/values-hr/cm_arrays.xml
+++ b/packages/SystemUI/res/values-hr/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>S</item>
+    <!-- North -->
     <item>SI</item>
+    <!-- North east -->
     <item>I</item>
+    <!-- East -->
     <item>JI</item>
+    <!-- South east -->
     <item>J</item>
+    <!-- South -->
     <item>JZ</item>
+    <!-- South west -->
     <item>Z</item>
+    <!-- West -->
     <item>SZ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-hr/cm_strings.xml b/packages/SystemUI/res/values-hr/cm_strings.xml
index 5edba96..371f4db 100644
--- a/packages/SystemUI/res/values-hr/cm_strings.xml
+++ b/packages/SystemUI/res/values-hr/cm_strings.xml
@@ -16,18 +16,27 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Kliznite desno za %1$s</string>
   <string name="right_shortcut_hint">Kliznite lijevo za %1$s</string>
-  <string name="lockscreen_message">Dodirnite ikonu na lijevo ili desno kako bi preraspodijelili prečac zaključanog zaslona.</string>
+  <string name="lockscreen_message">Dodirnite ikonu na lijevoj ili desnoj strani da biste postavili prečac zaključanog zaslona.</string>
   <string name="lockscreen_default_target">Zadano</string>
   <string name="select_application">Odaberite aplikaciju</string>
   <string name="lockscreen_choose_action_title">Odaberite radnju</string>
   <string name="lockscreen_none_target">Nijedan</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Odaberi radnju</string>
-  <string name="navbar_home_button">Home tipka</string>
+  <string name="navbar_home_button">Gumb za početni zaslon</string>
   <string name="navbar_recent_button">Tipka nedavno</string>
   <string name="navbar_search_button">Tipka za pretraživanje</string>
   <string name="navbar_back_button">Tipka nazad</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Tipka izbornika</string>
   <string name="accessibility_dpad_left">Kursor lijevo</string>
   <string name="accessibility_dpad_right">Kursor desno</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Izbriši podatke aplikacije</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Prisilno zaustavi</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Deinstaliraj</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Osvjetljenje svjetla</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profili isklučeni.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profili su isključeni.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil promijenjen u <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicijalizacija\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Postavke svjetla</string>
   <string name="led_notification_text">LED svjetlo omogućeno postavkama</string>
   <string name="qs_tile_edit_header_instruction">Pritisnite i držite pločicu za uređivanje</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Pokaži prognozu</string>
   <string name="quick_settings_title_show_brightness_slider">Pokaži klizač osvjetljenja</string>
   <string name="quick_settings_title_enlarge_first_row">Povećaj prvi red</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Ovo drži u pogledu dok ne otkvačite. Dodirnite i držite gumb natrag da bi otkvačili.</string>
   <string name="quick_settings_custom_tile_detail_title">Prilagodljive pločice</string>
   <string name="quick_settings_remove">Uklanjanje pločice</string>
@@ -66,12 +86,18 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Profili sustava</string>
   <string name="quick_settings_profiles_off">Profili onemogućeni</string>
-  <string name="quick_settings_heads_up_label">Heads up</string>
+  <string name="quick_settings_heads_up_label">Plutajuće obavijesti</string>
   <string name="quick_settings_battery_saver_label">Ušteda baterije</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Ušteda baterije (punjenje)</string>
   <string name="quick_settings_caffeine_label">Kofein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sinkronizacija isključena.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sinkronizacija uključena.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sinkronizacija je isključena.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sinkronizacija je uključena.</string>
   <string name="quick_settings_sync_label">Sinkroniziranje</string>
   <string name="quick_settings_volume_panel_label">Zvučna ploča</string>
@@ -81,66 +107,121 @@
   <string name="quick_settings_ambient_display_label">Ambijentni zaslon</string>
   <string name="quick_settings_lockscreen_label_enforced">Provođenje zaključavanja zaslona</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Onemogućeno od strane profila</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Isključivanje zaslona: <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Isključivanje zaslona promijenjeno u <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
   <string name="qs_tile_performance">Način rada baterije</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Baterija: način uštede energije.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Baterija: uravnoteženo.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Baterija: performanse.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Baterija: učinkoviti način.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Baterija: brzo.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Rad baterije promijenjen u način uštede.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Rad baterije promijenjen u uravnotežen način.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Rad baterije promijenjen u performanse.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Način baterije promijenjen u učinkoviti.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Način baterije promijenjen u brzi.</string>
   <string name="quick_settings_performance_profile_detail_title">Način rada baterije</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Zaključani zaslon isključen.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Zaključani zaslon uključen.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Zaključani zaslon je isključen.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Zaključani zaslon je uključen.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambijentni zaslon isključen.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambijentni zaslon uključen.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambijentni zaslon je isključen.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambijentni zaslon je uključen.</string>
-  <string name="accessibility_quick_settings_heads_up_off">Heads up isključen.</string>
-  <string name="accessibility_quick_settings_heads_up_on">Heads up uključen.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up je isključen.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up je uključen.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Plutajuće su obavijesti isključene.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Plutajuće su obavijesti uključene.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Plutajuće su obavijesti isključene.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Plutajuće su obavijesti uključene.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Kofein isključen.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Kofein uključen.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Ušteda baterije isključena.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Ušteda baterije uključena.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Ušteda baterije je isključena.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Ušteda baterije je uključena.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dinamične pločice</string>
   <string name="dynamic_qs_tile_next_alarm_label">Sljedeći alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME za odabir</string>
   <string name="dynamic_qs_tile_su_label">Root pristup</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay isključen.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: auto.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: dnevni način.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: noćni način.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: vanjski način.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay isključen.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay promijenjen u auto.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay promijenjen u dnevni način.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay promijenjen u noćni način rada.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay promijenjen u vanjski način.</string>
+  <string name="dynamic_qs_tile_themes_label">Teme</string>
   <string name="quick_settings_title_advanced_location">Način lokacije</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Prijavljivanje lokacije: štednja baterije.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Prijavljivanje lokacije: samo senzori.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Prijavljivanje lokacije: visoka preciznost.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Način rada lokacije</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Štednja baterije</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Samo uređaj</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Visoka preciznost</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Prijavljivanje lokacije promijenjeno u način uštede baterije.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Prijavljivanje lokacije promijenjeno u samo senzori.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Prijavljivanje lokacije promijenjeno u način visoke preciznosti.</string>
   <string name="quick_settings_tiles_category_system">Sistemske pločice</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Dodaj pločicu</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Nije moguće povezivanje s mobilnim mrežama dok je omogućen način rada u zrakoplovu. Onemogućite način rada u zrakoplovu i pokušajte ponovno.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Svjetiljka je uključena</string>
   <string name="quick_settings_tile_flashlight_not_summary">Dodirnite za isključivanje</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klijent</item>
+    <item quantity="few">%1$d klijenta</item>
+    <item quantity="other">%1$d klijenata</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Nema SIM podatkovne kartice</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dock baterija <xliff:g id="number">%d</xliff:g> postotak.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Prikaži listu za reprodukciju</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Prijeđite prstom prema dolje da biste proširili</string>
+  <string name="swipe_left_hint">Prijeđite prstom lijevo za <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Prijeđite prstom desno za obavijesti</string>
 </resources>
diff --git a/packages/SystemUI/res/values-hu/cm_arrays.xml b/packages/SystemUI/res/values-hu/cm_arrays.xml
index 60b4d1b..9ff5fe9 100644
--- a/packages/SystemUI/res/values-hu/cm_arrays.xml
+++ b/packages/SystemUI/res/values-hu/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>É</item>
+    <!-- North -->
     <item>ÉK</item>
+    <!-- North east -->
     <item>K</item>
+    <!-- East -->
     <item>DK</item>
+    <!-- South east -->
     <item>D</item>
+    <!-- South -->
     <item>DNy</item>
+    <!-- South west -->
     <item>Ny</item>
+    <!-- West -->
     <item>ÉNy</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-hu/cm_strings.xml b/packages/SystemUI/res/values-hu/cm_strings.xml
index 5a3f211..cbc98da 100644
--- a/packages/SystemUI/res/values-hu/cm_strings.xml
+++ b/packages/SystemUI/res/values-hu/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Csúsztasson jobbra ezért: %1$s</string>
   <string name="right_shortcut_hint">Csúsztasson balra ezért: %1$s</string>
   <string name="lockscreen_message">Érintsen meg egy ikont jobb vagy bal oldalt a zárképernyő hivatkozások ismételt hozzárendeléséhez.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Válasszon alkalmazást</string>
   <string name="lockscreen_choose_action_title">Válasszon eseményt</string>
   <string name="lockscreen_none_target">Nincs</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Válasszon eseményt</string>
   <string name="navbar_home_button">Kezdőgomb</string>
   <string name="navbar_recent_button">Alkalmazás előzmények gomb</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Menü gomb</string>
   <string name="accessibility_dpad_left">Kurzor balra</string>
   <string name="accessibility_dpad_right">Kurzor jobbra</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Alkalmazások adatok törlése</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Kényszerített leállítás</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Eltávolítás</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">LED fényereje</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profilok ki.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profilok kikapcsolva.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil megváltoztatva: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicializálás\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">LED beállítások</string>
   <string name="led_notification_text">LED fény engedélyezve</string>
   <string name="qs_tile_edit_header_instruction">Nyomja meg és tartsa nyomva a csempéket az átrendezéséhez</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Időjárás megjelenítése</string>
   <string name="quick_settings_title_show_brightness_slider">Fényerő csúszka megjelenítése</string>
   <string name="quick_settings_title_enlarge_first_row">Első sor nagyítása</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Ez a nézetben tartja, amíg a rögzítést fel nem oldja. Érintse meg és tartsa nyomva a Vissza gombot a rögzítés feloldásához.</string>
   <string name="quick_settings_custom_tile_detail_title">Egyéni csempe</string>
   <string name="quick_settings_remove">Csempe eltávolítása</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profilok letiltva</string>
   <string name="quick_settings_heads_up_label">Lebegő értesítés</string>
   <string name="quick_settings_battery_saver_label">Akkumulátor kímélő</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Akkumulátor kímélő (töltés)</string>
   <string name="quick_settings_caffeine_label">Caffeine</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Szinkronizálás ki.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Szinkronizálás be.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Szinkronizálás kikapcsolva.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Szinkronizálás bekapcsolva.</string>
   <string name="quick_settings_sync_label">Szinkronizálás</string>
   <string name="quick_settings_volume_panel_label">Hangerőszabályzás</string>
@@ -81,66 +107,120 @@
   <string name="quick_settings_ambient_display_label">Környezeti kijelző</string>
   <string name="quick_settings_lockscreen_label_enforced">A képernyő zárolásának kényszerítése</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Profil által letiltva</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Képernyő időkorlát: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Képernyő időkorlátja megváltoztatva: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Akkumulátor mód</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Akkumulátor mód: energiatakarékos.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Akkumulátor mód: kiegyensúlyozott.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Akkumulátor mód: teljesítménycentrikus.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Akkumulátor mód: hatékony mód.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Akkumulátor mód: teljesítmény mód.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Akkumulátor mód energiatakarékosra változtatva.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Akkumulátor mód kiegyensúlyozottra változtatva.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Akkumulátor mód teljesítménycentrikusra változtatva.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Akkumulátor mód átváltva hatékony módra.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Akkumulátor mód átváltva teljesítmény módra.</string>
   <string name="quick_settings_performance_profile_detail_title">Akkumulátor mód</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Képernyőzár ki.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Képernyőzár be.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Képernyőzár kikapcsolva.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Képernyőzár bekapcsolva.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Környezeti kijelző ki.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Környezeti kijelző be.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Környezeti kijelző kikapcsolva.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Környezeti kijelző bekapcsolva.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Lebegő értesítés ki.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Lebegő értesítés be.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Lebegő értesítés kikapcsolva.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Lebegő értesítés bekapcsolva.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Caffeine ki.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Caffeine be.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Akkumulátor kímélő ki.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Akkumulátor kímélő be.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Akkumulátor kímélő kikapcsolva.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Akkumulátor kímélő bekapcsolva.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dinamikus csempe</string>
   <string name="dynamic_qs_tile_next_alarm_label">Következő riasztás</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME választó</string>
   <string name="dynamic_qs_tile_su_label">Rendszergazda hozzáférés</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay ki.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automatikus mód.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: nappali mód.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: éjszakai mód.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: szabadtéri mód.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay kikapcsolva.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay automatikus módra változtatva.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay nappali módra változtatva.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay éjszakai módra változtatva.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay szabadtéri módra változtatva.</string>
+  <string name="dynamic_qs_tile_themes_label">Témák</string>
   <string name="quick_settings_title_advanced_location">Bővített helymeghatározás</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Helymeghatározás jelentése: energiatakarékos.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Helymeghatározás jelentése: csak GPS.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Helymeghatározás jelentése: nagyon pontos.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Helymeghatározási módok</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Energiatakarékos</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Csak készülék</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Nagy pontosság</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Helymeghatározás jelentése energiatakarékosra változtatva.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Helymeghatározás jelentése csak GPS-re változtatva.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Helymeghatározás jelentése nagyon pontosra változtatva.</string>
   <string name="quick_settings_tiles_category_system">Rendszer csempék</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Csempe hozzáadása</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Nem lehet csatlakozni a mobil hálózatokra, míg a repülőgép üzemmód engedélyezve van. Tiltsa le a repülőgép üzemmódot és próbálja újra.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Zseblámpa bekapcsolva</string>
   <string name="quick_settings_tile_flashlight_not_summary">Kikapcsoláshoz érintse meg</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d kliens</item>
+    <item quantity="other">%1$d kliens</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Nincs adat SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dokkoló akkumulátor: <xliff:g id="number">%d</xliff:g> százalék.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Lejátszási lista megjelenítése</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Csúsztasson lefelé a kiterjesztéshez</string>
+  <string name="swipe_left_hint">Csúsztasson balra: <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Csúsztasson jobbra az értesítésekhez</string>
 </resources>
diff --git a/packages/SystemUI/res/values-hy-rAM/cm_arrays.xml b/packages/SystemUI/res/values-hy-rAM/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-hy-rAM/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-hy-rAM/cm_strings.xml b/packages/SystemUI/res/values-hy-rAM/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-hy-rAM/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-in/cm_arrays.xml b/packages/SystemUI/res/values-in/cm_arrays.xml
index be24560..279bb0d 100644
--- a/packages/SystemUI/res/values-in/cm_arrays.xml
+++ b/packages/SystemUI/res/values-in/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>U</item>
+    <!-- North -->
     <item>TL</item>
+    <!-- North east -->
     <item>T</item>
+    <!-- East -->
     <item>TG</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>BD</item>
+    <!-- South west -->
     <item>B</item>
+    <!-- West -->
     <item>BL</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-in/cm_strings.xml b/packages/SystemUI/res/values-in/cm_strings.xml
index f7c1570..38880b4 100644
--- a/packages/SystemUI/res/values-in/cm_strings.xml
+++ b/packages/SystemUI/res/values-in/cm_strings.xml
@@ -16,16 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Geser ke kanan untuk %1$s</string>
   <string name="right_shortcut_hint">Geser ke kiri untuk %1$s</string>
+  <string name="lockscreen_message">Ketuk ikon di sebelah kiri atau kanan untuk menugaskan kembali pintasan layar kunci.</string>
+  <string name="lockscreen_default_target">Standar</string>
   <string name="select_application">Pilih aplikasi</string>
   <string name="lockscreen_choose_action_title">Pilih tindakan</string>
   <string name="lockscreen_none_target">Tidak Ada</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Pilih tindakan untuk ditambahkan</string>
-  <string name="navbar_home_button">Tombol home</string>
-  <string name="navbar_recent_button">Tombol recent</string>
-  <string name="navbar_search_button">Tombol cari</string>
+  <string name="navbar_home_button">Tombol beranda</string>
+  <string name="navbar_recent_button">Tombol riwayat</string>
+  <string name="navbar_search_button">Tombol penelusuran</string>
   <string name="navbar_back_button">Tombol kembali</string>
   <string name="navbar_empty_button">Tombol kosong</string>
   <string name="navbar_menu_conditional_button">Tombol menu (sembunyi otomatis)</string>
@@ -33,75 +46,179 @@
   <string name="navbar_menu_big_button">Tombol menu</string>
   <string name="accessibility_dpad_left">Kursor kiri</string>
   <string name="accessibility_dpad_right">Kursor kanan</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Hapus data aplikasi</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Paksa berhenti</string>
-  <string name="advanced_dev_option_uninstall">Copot pemasangan</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">Hapus instalasi</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Kecerahan cahaya</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profil mati.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profil dimatikan.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil diubah menjadi <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Menginisialisasi\u2026</string>
-  <string name="screen_pinning_description_no_navbar">Hal ini membuatnya tetap dalam pandangan sampai anda melepas sematan. Sentuh dan tahan tombol kembali untuk melepas sematan.</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Pengaturan cahaya</string>
+  <string name="led_notification_text">Lampu LED diaktifkan oleh pengaturan</string>
+  <string name="qs_tile_edit_header_instruction">Tekan dan tahan tile untuk mengatur ulang</string>
+  <string name="quick_settings_edit_label">Edit tile</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Tidak dapat menghapus tile</string>
+  <string name="qs_tiles_reset_confirmation">Setel ulang pengaturan tile ke konfigurasi standar?</string>
+  <string name="quick_settings_tile_reset_to_default">Atur ulang ke standar</string>
+  <string name="quick_settings_title_header">Kepala</string>
+  <string name="quick_settings_title_tiles">Tiles</string>
+  <string name="quick_settings_title_show_weather">Tampilkan cuaca</string>
+  <string name="quick_settings_title_show_brightness_slider">Tampilkan panel kecerahan</string>
+  <string name="quick_settings_title_enlarge_first_row">Perbesar baris pertama</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Hal ini membuatnya tetap dalam pandangan sampai Anda melepas sematan. Sentuh dan tahan tombol kembali untuk melepas sematan.</string>
   <string name="quick_settings_custom_tile_detail_title">Tile kustom</string>
   <string name="quick_settings_remove">Hapus tile</string>
   <string name="quick_settings_network_adb_label">ADB melalui jaringan</string>
   <string name="quick_settings_compass_label">Kompas</string>
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">Profil sistem</string>
-  <string name="quick_settings_profiles_off">Profil dinonaktifkan</string>
-  <string name="quick_settings_heads_up_label">Heads up</string>
-  <string name="accessibility_quick_settings_sync_off">Singkron mati.</string>
-  <string name="accessibility_quick_settings_sync_on">Singkron aktif.</string>
-  <string name="accessibility_quick_settings_sync_changed_off">Singkron dimatikan.</string>
-  <string name="accessibility_quick_settings_sync_changed_on">Singkron diaktifkan.</string>
-  <string name="quick_settings_sync_label">Singkron</string>
-  <string name="quick_settings_usb_tether_label">Peranggitan USB</string>
+  <string name="quick_settings_profiles_off">Profil dimatikan</string>
+  <string name="quick_settings_heads_up_label">Notifikasi mengambang</string>
+  <string name="quick_settings_battery_saver_label">Penghemat baterai</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Penghemat baterai (mengisi)</string>
+  <string name="quick_settings_caffeine_label">Kafein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">Sinkronisasi mati.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">Sinkronisasi hidup.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">Sinkronisasi dimatikan.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">Sinkronisasi dihidupkan.</string>
+  <string name="quick_settings_sync_label">Sinkronisasi</string>
+  <string name="quick_settings_volume_panel_label">Panel volume</string>
+  <string name="quick_settings_usb_tether_label">Tethering USB</string>
   <string name="quick_settings_screen_timeout_detail_title">Waktu layar mati</string>
   <string name="quick_settings_lockscreen_label">Kunci layar</string>
-  <string name="quick_settings_ambient_display_label">Tampilan Ambient</string>
+  <string name="quick_settings_ambient_display_label">Tampilan ambien</string>
   <string name="quick_settings_lockscreen_label_enforced">Kunci layar diterapkan</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Dimatikan oleh profil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Batas waktu layar: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Batas waktu layar diubah menjadi <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
-  <string name="accessibility_quick_settings_perf_profile_pwrsv">Modus baterai: modus hemat daya.</string>
-  <string name="accessibility_quick_settings_perf_profile_bal">Modus Baterai: modus seimbang.</string>
-  <string name="accessibility_quick_settings_perf_profile_perf">Modus Baterai: Modus Performa.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Modus baterai diubah menjadi modus hemat daya.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_bal">Modus baterai diubah menjadi modus seimbang.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_perf">Modus baterai diubah menjadi modus performa.</string>
+  <string name="qs_tile_performance">Mode Baterai</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">Mode baterai: hemat daya.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">Mode Baterai: seimbang.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">Mode Baterai: Performa.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Mode baterai: efisien.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">Mode baterai: mode cepat.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Mode baterai diubah menjadi mode hemat daya.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">Mode baterai diubah menjadi mode seimbang.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">Mode baterai diubah menjadi mode performa.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Mode baterai diubah menjadi mode efisien.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Mode baterai diubah menjadi mode cepat.</string>
+  <string name="quick_settings_performance_profile_detail_title">Mode Baterai</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Kunci layar mati.</string>
-  <string name="accessibility_quick_settings_lock_screen_on">Kunci layar aktif.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">Kunci layar hidup.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Kunci layar dimatikan.</string>
-  <string name="accessibility_quick_settings_lock_screen_changed_on">Kunci layar diaktifkan.</string>
-  <string name="accessibility_quick_settings_ambient_display_off">Tampilan Ambient nonaktif.</string>
-  <string name="accessibility_quick_settings_ambient_display_on">Tampilan Ambient aktif.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_off">Tampilan Ambient dinonaktifkan.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_on">Tampilan Ambient diaktifkan.</string>
-  <string name="accessibility_quick_settings_heads_up_off">Heads up nonaktif.</string>
-  <string name="accessibility_quick_settings_heads_up_on">Heads up aktif.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up dinonaktifkan.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up diaktifkan.</string>
-  <string name="quick_settings_dynamic_tile_detail_title">Petak Dinamis</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Kunci layar dihidupkan.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">Tampilan ambien mati.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">Tampilan ambien hidup.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Tampilan ambien dimatikan.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Tampilan ambien dihidupkan.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Notifikasi mengambang mati.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Notifikasi mengambang hidup.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Notifikasi mengambang dimatikan.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Notifikasi mengambang dihidupkan.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Kafein mati.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Kafein hidup.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">Penghemat baterai mati.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">Penghemat baterai hidup.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">Penghemat baterai dimatikan.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">Penghemat baterai dihidupkan.</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">Tile Dinamis</string>
   <string name="dynamic_qs_tile_next_alarm_label">Alarm selanjutnya</string>
   <string name="dynamic_qs_tile_ime_selector_label">Pemilih IME</string>
-  <string name="dynamic_qs_tile_su_label">Akses Root</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay mati.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modus otomatis.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: modus pagi.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: modus malam.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modus luar ruangan.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay dimatikan.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay diubah menjadi modus otomatis.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay diubah menjadi modus pagi.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay diubah menjadi modus malam.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay diubah menjadi modus luar ruangan.</string>
+  <string name="dynamic_qs_tile_su_label">Akses root</string>
+  <string name="quick_settings_title_advanced_location">Lokasi Tri-state</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Laporan Lokasi: mode hemat baterai.</string>
-  <string name="accessibility_quick_settings_location_gps_only">Laporan Lokasi: hanya mode sensor.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">Laporan Lokasi: mode hanya sensor.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Laporan Lokasi: mode akurasi tinggi.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Mode lokasi</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Hemat baterai</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Hanya perangkat</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Akurasi tinggi</string>
-  <string name="accessibility_quick_settings_location_changed_battery_saving">Pelaporan lokasi diubah menjadi modus hemat baterai.</string>
-  <string name="accessibility_quick_settings_location_changed_gps_only">Pelaporan lokasi diubah menjadi modus hanya sensor.</string>
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">Pelaporan lokasi diubah menjadi modus akurasi tinggi.</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">Laporan lokasi diubah menjadi mode hemat baterai.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">Laporan lokasi diubah menjadi mode hanya sensor.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">Laporan lokasi diubah menjadi mode akurasi tinggi.</string>
+  <string name="quick_settings_tiles_category_system">Tiles sistem</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Tambahkan tile</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Tidak dapat tersambung ke jaringan seluler ketika mode Pesawat diaktifkan. Nonaktifkan mode Pesawat dan coba lagi.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Senter aktif</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Ketuk untuk mematikan</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="other">%1$d klien</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Tidak ada data SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dok baterai <xliff:g id="number">%d</xliff:g> persen.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Tampilkan antrean</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g><xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Geser ke bawah untuk memperluas</string>
+  <string name="swipe_left_hint">Geser ke kiri untuk <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Geser ke kanan untuk notifikasi</string>
 </resources>
diff --git a/packages/SystemUI/res/values-is-rIS/cm_arrays.xml b/packages/SystemUI/res/values-is-rIS/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-is-rIS/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-is-rIS/cm_strings.xml b/packages/SystemUI/res/values-is-rIS/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-is-rIS/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-it/cm_arrays.xml b/packages/SystemUI/res/values-it/cm_arrays.xml
index cb6fbec..85897e7 100644
--- a/packages/SystemUI/res/values-it/cm_arrays.xml
+++ b/packages/SystemUI/res/values-it/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SO</item>
+    <!-- South west -->
     <item>O</item>
+    <!-- West -->
     <item>NO</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-it/cm_strings.xml b/packages/SystemUI/res/values-it/cm_strings.xml
index bc2e384..17afa8b 100644
--- a/packages/SystemUI/res/values-it/cm_strings.xml
+++ b/packages/SystemUI/res/values-it/cm_strings.xml
@@ -16,16 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Scorri a destra per %1$s</string>
   <string name="right_shortcut_hint">Scorri a sinistra per %1$s</string>
-  <string name="lockscreen_message">Tocca un\'icona alla sinistra per riassegnare un collegamento alla schermata di sblocco.</string>
+  <string name="lockscreen_message">Tocca un\'icona per riassegnare un collegamento nel blocco schermo.</string>
   <string name="lockscreen_default_target">Predefinito</string>
   <string name="select_application">Seleziona applicazione</string>
   <string name="lockscreen_choose_action_title">Scegli un\'azione</string>
   <string name="lockscreen_none_target">Nessuno</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Azione da associare</string>
   <string name="navbar_home_button">Pulsante Home</string>
   <string name="navbar_recent_button">Pulsante Recenti</string>
@@ -37,27 +46,38 @@
   <string name="navbar_menu_big_button">Pulsante Menu</string>
   <string name="accessibility_dpad_left">Cursore a sinistra</string>
   <string name="accessibility_dpad_right">Cursore a destra</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Cancella dati</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Arresto forzato</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Disinstalla</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Luminosità</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profili OFF.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profilo: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profili disattivati.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profilo cambiato in <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inizializzazione\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Impostazioni luci</string>
   <string name="led_notification_text">Luce notifica attivata dalle impostazioni</string>
   <string name="qs_tile_edit_header_instruction">Premi e trascina i tile per riordinarli</string>
   <string name="quick_settings_edit_label">Modifica tile</string>
   <string name="quick_settings_cannot_delete_edit_tile">Non puoi rimuovere Modifica tile</string>
-  <string name="qs_tiles_reset_confirmation">Ripristinare la configurazione dei tiles predefinita?</string>
+  <string name="qs_tiles_reset_confirmation">Ripristinare la configurazione dei tile predefinita?</string>
   <string name="quick_settings_tile_reset_to_default">Ripristina il layout predefinito</string>
   <string name="quick_settings_title_header">Intestazione</string>
   <string name="quick_settings_title_tiles">Tile</string>
   <string name="quick_settings_title_show_weather">Mostra meteo</string>
   <string name="quick_settings_title_show_brightness_slider">Visualizza selettore luminosità</string>
   <string name="quick_settings_title_enlarge_first_row">Allarga la prima riga</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Tienilo in vista fino a quando non sblocchi. Tieni premuto il tasto Indietro per sbloccare.</string>
   <string name="quick_settings_custom_tile_detail_title">Tile personalizzato</string>
   <string name="quick_settings_remove">Rimuovi tile</string>
@@ -68,79 +88,139 @@
   <string name="quick_settings_profiles_off">Profili disattivati</string>
   <string name="quick_settings_heads_up_label">Heads Up</string>
   <string name="quick_settings_battery_saver_label">Risparmio batteria</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Risparmio batteria (ricarica)</string>
   <string name="quick_settings_caffeine_label">Caffeina</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sincronia OFF</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sincronia ON.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sincronizzazione spenta.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sincronizzazione attivata.</string>
   <string name="quick_settings_sync_label">Sincronizzazione</string>
   <string name="quick_settings_volume_panel_label">Pannello volume</string>
   <string name="quick_settings_usb_tether_label">Tethering USB</string>
   <string name="quick_settings_screen_timeout_detail_title">Sospensione schermo</string>
-  <string name="quick_settings_lockscreen_label">Schermata di blocco</string>
+  <string name="quick_settings_lockscreen_label">Blocco schermo</string>
   <string name="quick_settings_ambient_display_label">Ambient display</string>
-  <string name="quick_settings_lockscreen_label_enforced">Schermata di blocco forzata</string>
+  <string name="quick_settings_lockscreen_label_enforced">Blocco schermo forzato</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Disattivato da profilo</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Sospensione schermo: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Sospensione schermo cambiato in <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
-  <string name="qs_tile_performance">Modalità batteria</string>
-  <string name="accessibility_quick_settings_perf_profile_pwrsv">Modalità batteria: modalità risparmio energetico.</string>
-  <string name="accessibility_quick_settings_perf_profile_bal">Modalità batteria: modalità bilanciato.</string>
-  <string name="accessibility_quick_settings_perf_profile_perf">Modalità batteria: modalità prestazioni.</string>
-  <string name="accessibility_quick_settings_perf_profile_bias_power">Modalità batteria: modalità efficienza.</string>
-  <string name="accessibility_quick_settings_perf_profile_bias_perf">Modalità batteria: modalità prestazioni.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Modalità batteria cambiato in risparmio energetico.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_bal">Modalità batteria cambiato in modalità bilanciato.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_perf">Modalità batteria cambiato in modalità prestazioni.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">La batteria è ora in modalità efficienza.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">La batteria è ora in modalità prestazioni.</string>
-  <string name="quick_settings_performance_profile_detail_title">Modalità batteria</string>
+  <string name="qs_tile_performance">Profilo batteria</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">Profilo batteria: risparmio energetico.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">Profilo batteria: bilanciato.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">Profilo batteria: prestazioni.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">Profilo batteria: efficienza.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">Profilo batteria: rapido.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Profilo batteria cambiato in risparmio energetico.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">Profilo batteria cambiato in bilanciato.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">Profilo batteria cambiato in prestazioni.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Profilo batteria cambiato in efficienza.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Profilo batteria cambiato in rapido.</string>
+  <string name="quick_settings_performance_profile_detail_title">Profilo batteria</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Blocco schermo OFF.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Blocco schermo ON.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Blocco schermo disattivato.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Blocco schermo attivato.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambient display disattivato.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display attivato.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display disattivato.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display attivato.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Heads Up disattivato.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Heads Up attivo.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads Up disattivato.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Heads Up attivato.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Caffeina off.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Caffeina on.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Risparmio batteria OFF.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Risparmio batteria ON.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Risparmio batteria disattivato.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Risparmio batteria attivato.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Tile dinamici</string>
   <string name="dynamic_qs_tile_next_alarm_label">Prossima sveglia</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selettore IME</string>
   <string name="dynamic_qs_tile_su_label">Accesso root</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay OFF.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modalità automatica.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: modalità giorno.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: modalità notte.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modalità esterno.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay disattivato.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay cambiato in modalità automatica.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay cambiato in modalità giorno.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay cambiato in modalità notte.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay cambiato in modalità esterno.</string>
+  <string name="dynamic_qs_tile_themes_label">Temi</string>
   <string name="quick_settings_title_advanced_location">Localizzazione avanzata</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Geolocalizzazione: modalità risparmio batteria.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Geolocalizzazione: modalità solo sensori.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Geolocalizzazione: modalità alta precisione.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Geolocalizzazione</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Risparmio batteria</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Solo dispositivo</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Alta precisione</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Segnalatore posizione cambiato in modalità risparmio batteria.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Segnalatore posizione cambiato in modalità solo sensori.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Segnalatore posizione cambiato in modalità alta precisione.</string>
   <string name="quick_settings_tiles_category_system">Tile di sistema</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Aggiungi tile</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Impossibile connettersi alle reti mobili quando la modalità aereo è attiva. Disattiva la modalità aereo e riprova.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Torcia accesa</string>
   <string name="quick_settings_tile_flashlight_not_summary">Tocca per spegnere</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d client</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">SIM senza dati mobili</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Batteria Dock <xliff:g id="number">%d</xliff:g> percento.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Visualizza coda di riproduzione</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Scorri verso il basso per espandere</string>
+  <string name="swipe_left_hint">Scorri verso sinistra per <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Scorri verso destra per notifiche</string>
 </resources>
diff --git a/packages/SystemUI/res/values-iw/cm_arrays.xml b/packages/SystemUI/res/values-iw/cm_arrays.xml
index ecf2e20..a673711 100644
--- a/packages/SystemUI/res/values-iw/cm_arrays.xml
+++ b/packages/SystemUI/res/values-iw/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>צפ\'</item>
+    <!-- North -->
     <item>צפ\'-מז\'</item>
+    <!-- North east -->
     <item>מז\'</item>
+    <!-- East -->
     <item>דר\'-מז\'</item>
+    <!-- South east -->
     <item>דר\'</item>
+    <!-- South -->
     <item>דר\'-מע\'</item>
+    <!-- South west -->
     <item>מע\'</item>
+    <!-- West -->
     <item>צפ\'-מע\'</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-iw/cm_strings.xml b/packages/SystemUI/res/values-iw/cm_strings.xml
index 0975891..1f1d051 100644
--- a/packages/SystemUI/res/values-iw/cm_strings.xml
+++ b/packages/SystemUI/res/values-iw/cm_strings.xml
@@ -16,17 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
-  <string name="left_shortcut_hint">החלק ימינה בשביל %1$s</string>
-  <string name="right_shortcut_hint">החלק שמאלה בשביל %1$s</string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">החלק ימינה ל- %1$s</string>
+  <string name="right_shortcut_hint">החלקה שמאלה ל- %1$s</string>
   <string name="lockscreen_message">הקש על סמל בצד שמאל או ימין כדי להקצות מחדש קיצור דרך של מסך הנעילה.</string>
   <string name="lockscreen_default_target">ברירת מחדל</string>
   <string name="select_application">בחר יישום</string>
   <string name="lockscreen_choose_action_title">בחר פעולה</string>
   <string name="lockscreen_none_target">ללא</string>
-  <string name="navbar_dialog_title">בחר את הפעולה להקצאה</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">בחירת הפעולה להקצאה</string>
   <string name="navbar_home_button">לחצן הבית</string>
   <string name="navbar_recent_button">לחצן יישומים אחרונים</string>
   <string name="navbar_search_button">לחצן חיפוש</string>
@@ -37,28 +46,39 @@
   <string name="navbar_menu_big_button">לחצן התפריט</string>
   <string name="accessibility_dpad_left">סמן שמאלה</string>
   <string name="accessibility_dpad_right">סמן ימינה</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">מחק נתוני יישום</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">אלץ עצירה</string>
-  <string name="advanced_dev_option_uninstall">הסרה</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">הסרת התקנה</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">בהירות נורית</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">פרופילים כבויים.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">פרופיל: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">פרופילים כובו.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">פרופיל שונה ל-<xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">מאתחל\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">הגדרות נורית</string>
-  <string name="led_notification_text">נורית LED מופעלת בידי ההגדרות</string>
-  <string name="qs_tile_edit_header_instruction">יש לגעת ולהחזיק את האריחים לסידור מחדש</string>
+  <string name="led_notification_text">נורית LED מופעלת על ידי ההגדרות</string>
+  <string name="qs_tile_edit_header_instruction">לחץ והחזק באריחים לסידור מחדש</string>
   <string name="quick_settings_edit_label">ערוך אריחים</string>
   <string name="quick_settings_cannot_delete_edit_tile">לא ניתן למחוק את אריח העריכה</string>
-  <string name="qs_tiles_reset_confirmation">האם לאפס את אריחי ההגדרות המהירות לברירת המחדל?</string>
+  <string name="qs_tiles_reset_confirmation">לאפס את אריחי ההגדרות המהירות לברירת המחדל?</string>
   <string name="quick_settings_tile_reset_to_default">איפוס לפריסת ברירת המחדל</string>
   <string name="quick_settings_title_header">כותרת</string>
   <string name="quick_settings_title_tiles">אריחים</string>
   <string name="quick_settings_title_show_weather">הצג מזג אוויר</string>
   <string name="quick_settings_title_show_brightness_slider">הצג מד בהירות</string>
   <string name="quick_settings_title_enlarge_first_row">הגדל את השורה הראשונה</string>
-  <string name="screen_pinning_description_no_navbar">פעולה זאת תשמור אותו מוצג עד שתבטל את ההצמדה. לחץ והחזק את כפתור \"הקודם\" כדי לבטל את ההצמדה.</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">הפעולה שומרת זאת בתצוגה עד שתבטל את ההצמדה. גע והחזק את לחצן \"הקודם\" כדי לבטל את ההצמדה.</string>
   <string name="quick_settings_custom_tile_detail_title">אריח מותאם אישית</string>
   <string name="quick_settings_remove">הסר אריח</string>
   <string name="quick_settings_network_adb_label">ADB דרך רשת</string>
@@ -66,81 +86,143 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">פרופילי מערכת</string>
   <string name="quick_settings_profiles_off">פרופילים מושבתים</string>
-  <string name="quick_settings_heads_up_label">התראות קופצת</string>
+  <string name="quick_settings_heads_up_label">התראות קופצות</string>
   <string name="quick_settings_battery_saver_label">שומר סוללה</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">שומר הסוללה (בטעינה)</string>
   <string name="quick_settings_caffeine_label">קפאין</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">סנכרון כבוי.</string>
-  <string name="accessibility_quick_settings_sync_on">סנכרון פעיל.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">סנכרון מופעל.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">סנכרון כובה.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">סנכרון הופעל.</string>
   <string name="quick_settings_sync_label">סנכרון</string>
-  <string name="quick_settings_volume_panel_label">לוח עוצמות שמע</string>
+  <string name="quick_settings_volume_panel_label">לוח עוצמת קול</string>
   <string name="quick_settings_usb_tether_label">קשירת USB</string>
-  <string name="quick_settings_screen_timeout_detail_title">משך זמן מסך</string>
+  <string name="quick_settings_screen_timeout_detail_title">זמן קצוב למסך</string>
   <string name="quick_settings_lockscreen_label">מסך נעילה</string>
-  <string name="quick_settings_ambient_display_label">התראות ברקע</string>
+  <string name="quick_settings_ambient_display_label">תצוגת התראות עמומה</string>
   <string name="quick_settings_lockscreen_label_enforced">מסך הנעילה נאכף</string>
-  <string name="quick_settings_lockscreen_label_locked_by_profile">מושבת על ידי הפרופיל</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">הושבת על-ידי הפרופיל</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">משך זמן מסך: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">משך זמן מסך השתנה ל-<xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">מצב סוללה</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">מצב סוללה: מצב חיסכון סוללה.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">מצב סוללה: מצב מאוזן.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">מצב סוללה: מצב ביצועים.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">מצב סוללה: מצב יעילות.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">מצב סוללה: מצב מהיר.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">מצב הסוללה שונה למצב חיסכון סוללה.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">מצב הסוללה שונה למצב מאוזן.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">מצב הסוללה שונה למצב ביצועים.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">מצב סוללה שונה למצב יעילות.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">מצב סוללה שונה למצב מהיר.</string>
   <string name="quick_settings_performance_profile_detail_title">מצב סוללה</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">מסך נעילה כבוי.</string>
-  <string name="accessibility_quick_settings_lock_screen_on">מסך נעילה פעיל.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">מסך נעילה מופעל.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">מסך נעילה כובה.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">מסך נעילה הופעל.</string>
-  <string name="accessibility_quick_settings_ambient_display_off">תצוגת התראות ברקע כבויה.</string>
-  <string name="accessibility_quick_settings_ambient_display_on">תצוגת התראות ברקע פעילה.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_off">תצוגת התראות ברקע כובתה.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_on">תצוגת התראות ברקע הופעלה.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">תצוגת התראות עמומה כבויה.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">תצוגת התראות עמומה פעילה.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">תצוגת התראות עמומה כובתה.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">תצוגת התראות עמומה הופעלה.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">התראות קופצות כבויות.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">התראות קופצות פעילות.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">התראות קופצות כובו.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">התראות קופצות הופעלו.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">קפאין כבוי.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">קפאין פועל.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">שומר סוללה כבוי.</string>
-  <string name="accessibility_quick_settings_battery_saver_on">שומר סוללה פעיל.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">שומר סוללה מופעל.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">שומר סוללה כובה.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">שומר סוללה הופעל.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">אריחים דינמיים</string>
-  <string name="dynamic_qs_tile_next_alarm_label">ההתראה הבאה</string>
+  <string name="dynamic_qs_tile_next_alarm_label">השעון המעורר הבא</string>
   <string name="dynamic_qs_tile_ime_selector_label">בורר שיטות קלט</string>
   <string name="dynamic_qs_tile_su_label">גישת שורש</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay כבוי.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: מצב אוטומטי.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: מצב יום.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: מצב לילה.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: מצב חוץ.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay כובה.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay שונה למצב אוטומטי.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay שונה למצב יום.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay שונה למצב לילה.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay שונה למצב חוץ.</string>
+  <string name="dynamic_qs_tile_themes_label">ערכות עיצוב</string>
   <string name="quick_settings_title_advanced_location">שלושה מצבי מיקום</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">דיווח מיקום: מצב חיסכון בסוללה.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">דיווח מיקום: מצב חיישנים בלבד.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">דיווח מיקום: מצב רמת דיוק גבוהה.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">מצב מיקום</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">חיסכון בסוללה</string>
-  <string name="quick_settings_location_gps_only_label">התקן בלבד</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">מכשיר בלבד</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">דיוק מרבי</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">דיווח מיקום השתנה למצב חיסכון סוללה.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">דיווח מיקום השתנה למצב חיישנים בלבד.</string>
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">דיווח מיקום השתנה למצב דיוק גבוה.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">דיווח מיקום השתנה למצב רמת דיוק גבוהה.</string>
   <string name="quick_settings_tiles_category_system">אריחי מערכת</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">הוסף אריח</string>
-  <string name="hotspot_apm_message">לא ניתן להתחבר לרשתות סלולריות כאשר מצב טיסה פעיל. בטל את מצב הטיסה ונסה שנית.</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">לא ניתן להתחבר לרשתות סלולריות כאשר מצב טיסה פעיל. השבת את מצב הטיסה ונסה שנית.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">פנס מופעל</string>
-  <string name="quick_settings_tile_flashlight_not_summary">לחץ לכיבוי</string>
+  <string name="quick_settings_tile_flashlight_not_summary">הקש לכיבוי</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">לקוח %1$d</item>
+    <item quantity="two">%1$d לקוחות</item>
+    <item quantity="many">%1$d לקוחות</item>
+    <item quantity="other">%1$d לקוחות</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">אין נתוני SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">סוללה חיצונית - <xliff:g id="number">%d</xliff:g> אחוז.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">הצג תור השמעה</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">החלק מטה להרחבה</string>
+  <string name="swipe_left_hint">החלק שמאלה להפעלת <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">החלק ימינה להתראות</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ja/cm_arrays.xml b/packages/SystemUI/res/values-ja/cm_arrays.xml
index ca179e3..46ed55e 100644
--- a/packages/SystemUI/res/values-ja/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ja/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>北</item>
+    <!-- North -->
     <item>北東</item>
+    <!-- North east -->
     <item>東</item>
+    <!-- East -->
     <item>南東</item>
+    <!-- South east -->
     <item>南</item>
+    <!-- South -->
     <item>南西</item>
+    <!-- South west -->
     <item>西</item>
+    <!-- West -->
     <item>北西</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ja/cm_strings.xml b/packages/SystemUI/res/values-ja/cm_strings.xml
index 910111e..a8e2279 100644
--- a/packages/SystemUI/res/values-ja/cm_strings.xml
+++ b/packages/SystemUI/res/values-ja/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">右にスワイプして%1$s</string>
   <string name="right_shortcut_hint">左にスワイプして%1$s</string>
   <string name="lockscreen_message">左右のアイコンをタップしてロック画面のショートカットを変更します。</string>
@@ -26,9 +34,10 @@
   <string name="select_application">アプリケーションを選択</string>
   <string name="lockscreen_choose_action_title">動作を選択</string>
   <string name="lockscreen_none_target">なし</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">設定する動作を選択</string>
   <string name="navbar_home_button">ホームボタン</string>
-  <string name="navbar_recent_button">最近使ったアプリボタン</string>
+  <string name="navbar_recent_button">履歴ボタン</string>
   <string name="navbar_search_button">検索ボタン</string>
   <string name="navbar_back_button">戻るボタン</string>
   <string name="navbar_empty_button">ボタンなし</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">メニューボタン</string>
   <string name="accessibility_dpad_left">カーソルを左へ</string>
   <string name="accessibility_dpad_right">カーソルを右へ</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">アプリのデータを消去</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">強制停止</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">アンインストール</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">ライトの明るさ</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">プロファイルはOFFです。</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">プロファイル: <xliff:g id="profile" example="Default">%s</xliff:g>です。</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">プロファイルがOFFになりました。</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">プロファイルが<xliff:g id="profile" example="Default">%s</xliff:g>に変更されました。</string>
   <string name="quick_settings_compass_init">初期化中\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">ライトの設定</string>
   <string name="led_notification_text">LEDライトが設定によって有効になっています</string>
   <string name="qs_tile_edit_header_instruction">タイルを長押しして並べ替えます</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">天気を表示</string>
   <string name="quick_settings_title_show_brightness_slider">明るさスライダーを表示</string>
   <string name="quick_settings_title_enlarge_first_row">1行目を拡大</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">固定を解除するまで表示し続けます。固定を解除するには戻るボタンを押し続けます。</string>
   <string name="quick_settings_custom_tile_detail_title">カスタムタイル</string>
   <string name="quick_settings_remove">タイルを削除</string>
@@ -68,79 +88,138 @@
   <string name="quick_settings_profiles_off">プロファイル無効</string>
   <string name="quick_settings_heads_up_label">ヘッドアップ</string>
   <string name="quick_settings_battery_saver_label">バッテリーセーバー</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">バッテリーセーバー（充電中）</string>
   <string name="quick_settings_caffeine_label">カフェイン</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">同期はOFFです。</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">同期はONです。</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">同期がOFFになりました。</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">同期がONになりました。</string>
   <string name="quick_settings_sync_label">同期</string>
   <string name="quick_settings_volume_panel_label">音量パネル</string>
   <string name="quick_settings_usb_tether_label">USBテザリング</string>
   <string name="quick_settings_screen_timeout_detail_title">画面のタイムアウト</string>
   <string name="quick_settings_lockscreen_label">ロック画面</string>
-  <string name="quick_settings_ambient_display_label">アンビエント表示</string>
+  <string name="quick_settings_ambient_display_label">常に画面表示ディスプレイ</string>
   <string name="quick_settings_lockscreen_label_enforced">ロック画面強制</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">プロファイルによって無効になっています</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">画面のタイムアウト: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>です。</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">画面のタイムアウトが<xliff:g id="timeout" example="30 seconds">%s</xliff:g>に変更されました。</string>
   <string name="qs_tile_performance">バッテリーモード</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">バッテリーモード: 省電力モードです。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">バッテリーモード: バランスモードです。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">バッテリーモード: パフォーマンスモードです。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">バッテリーモード: 効率モードです。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">バッテリーモード: クイックモードです。</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">バッテリーモードが省電力モードに変更されました。</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">バッテリーモードがバランスモードに変更されました。</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">バッテリーモードがパフォーマンスモードに変更されました。</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">バッテリーモードが効率モードに変更されました。</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">バッテリーモードがクイックモードに変更されました。</string>
   <string name="quick_settings_performance_profile_detail_title">バッテリーモード</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">ロック画面はOFFです。</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">ロック画面はONです。</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">ロック画面がOFFになりました。</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">ロック画面がONになりました。</string>
-  <string name="accessibility_quick_settings_ambient_display_off">アンビエント表示はOFFです。</string>
-  <string name="accessibility_quick_settings_ambient_display_on">アンビエント表示はONです。</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_off">アンビエント表示がOFFになりました。</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_on">アンビエント表示がONになりました。</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">常に画面表示ディスプレイはOFFです。</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">常に画面表示ディスプレイはONです。</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">常に画面表示ディスプレイがOFFになりました。</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">常に画面表示ディスプレイがONになりました。</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">ヘッドアップはOFFです。</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">ヘッドアップはONです。</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">ヘッドアップがOFFになりました。</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">ヘッドアップがONになりました。</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">カフェインはOFFです。</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">カフェインはONです。</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">バッテリーセーバーはOFFです。</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">バッテリーセーバーはONです。</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">バッテリーセーバーがOFFになりました。</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">バッテリーセーバーがONになりました。</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">自動タイル</string>
   <string name="dynamic_qs_tile_next_alarm_label">次のアラーム</string>
   <string name="dynamic_qs_tile_ime_selector_label">入力方法の選択</string>
   <string name="dynamic_qs_tile_su_label">ルートアクセス</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplayはOFFです。</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: 自動モードです。</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: 昼モードです。</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: 夜モードです。</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: 屋外モードです。</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplayがOFFになりました。</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplayが自動モードに変更されました。</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplayが昼モードに変更されました。</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplayが夜モードに変更されました。</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplayが屋外モードに変更されました。</string>
-  <string name="quick_settings_title_advanced_location">3種類の位置情報</string>
+  <string name="dynamic_qs_tile_themes_label">テーマ</string>
+  <string name="quick_settings_title_advanced_location">3方式の位置情報</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">位置情報レポート: バッテリー節約モードです。</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">位置情報レポート: 端末のみモードです。</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">位置情報レポート: 高精度モードです。</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">位置情報モード</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">バッテリー節約</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">端末のみ</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">高精度</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">位置情報レポートがバッテリー節約モードに変更されました。</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">位置情報レポートが端末のみモードに変更されました。</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">位置情報レポートが高精度モードに変更されました。</string>
   <string name="quick_settings_tiles_category_system">システムのタイル</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">タイルを追加</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">機内モードが有効になっている間はモバイルネットワークに接続することはできません。機内モードを無効にしてから再試行してください。</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">フラッシュライトが点灯しています</string>
   <string name="quick_settings_tile_flashlight_not_summary">タップして消灯する</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="other">%1$d台</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">データSIMなし</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">ホルダーの電池は<xliff:g id="number">%d</xliff:g>パーセントです。</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">再生キューを表示</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="condition">%2$s</xliff:g> <xliff:g id="temp">%1$s</xliff:g></string>
+  <string name="expand_hint">下にスワイプして拡張</string>
+  <string name="swipe_left_hint">左にスワイプして<xliff:g id="app_name">%1$s</xliff:g>を起動</string>
+  <string name="swipe_right_hint">左にスワイプして通知を表示</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ka-rGE/cm_arrays.xml b/packages/SystemUI/res/values-ka-rGE/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-ka-rGE/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-ka-rGE/cm_strings.xml b/packages/SystemUI/res/values-ka-rGE/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-ka-rGE/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-kk-rKZ/cm_arrays.xml b/packages/SystemUI/res/values-kk-rKZ/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-kk-rKZ/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-kk-rKZ/cm_strings.xml b/packages/SystemUI/res/values-kk-rKZ/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-kk-rKZ/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-km-rKH/cm_arrays.xml b/packages/SystemUI/res/values-km-rKH/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-km-rKH/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-km-rKH/cm_strings.xml b/packages/SystemUI/res/values-km-rKH/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-km-rKH/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-kn-rIN/cm_arrays.xml b/packages/SystemUI/res/values-kn-rIN/cm_arrays.xml
index 00014e3..65a842c 100644
--- a/packages/SystemUI/res/values-kn-rIN/cm_arrays.xml
+++ b/packages/SystemUI/res/values-kn-rIN/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>ಉ</item>
+    <!-- North -->
     <item>ಈಶಾ</item>
+    <!-- North east -->
     <item>ಪೂ</item>
+    <!-- East -->
     <item>ಆಗ್ನೇ</item>
+    <!-- South east -->
     <item>ದ</item>
+    <!-- South -->
     <item>ನೈಋ</item>
+    <!-- South west -->
     <item>ಪ</item>
+    <!-- West -->
     <item>ವಾಯು</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-kn-rIN/cm_strings.xml b/packages/SystemUI/res/values-kn-rIN/cm_strings.xml
index 396cb3a..ed69527 100644
--- a/packages/SystemUI/res/values-kn-rIN/cm_strings.xml
+++ b/packages/SystemUI/res/values-kn-rIN/cm_strings.xml
@@ -16,12 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">%1$sಗಾಗಿ ಬಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
   <string name="right_shortcut_hint">%1$sಗಾಗಿ ಎಡಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
+  <string name="lockscreen_message">ಲಾಕ್‌ ಸ್ಕ್ರೀನ್ ಶಾರ್ಟ್‌ಕಟ್‌ ಮರು ಅಸೈನ್‌ ಮಾಡಲು ಎಡ ಅಥವಾ ಬಲಕ್ಕೆ ಐಕಾನ್ ತಟ್ಟಿ.</string>
+  <string name="lockscreen_default_target">ಡೀಫಾಲ್ಟ್</string>
   <string name="select_application">ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ</string>
   <string name="lockscreen_choose_action_title">ಕ್ರಿಯೆಯನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
   <string name="lockscreen_none_target">ಶೂನ್ಯ</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">ನಿಯೋಜಿಸಲು ಕ್ರಿಯೆಯನ್ನು ಆರಿಸಿ</string>
   <string name="navbar_home_button">ಹೋಮ್ ಬಟನ್</string>
   <string name="navbar_recent_button">ಇತ್ತೀಚಿನ ಬಟನ್</string>
@@ -33,14 +46,38 @@
   <string name="navbar_menu_big_button">ಮೆನು ಬಟನ್</string>
   <string name="accessibility_dpad_left">ಕರ್ಸರ್ ಎಡ</string>
   <string name="accessibility_dpad_right">ಕರ್ಸರ್ ಬಲ</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">ಆಪ್ ಡೇಟಾ ಅಳಿಸಿಹಾಕು</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">ಬಲವಂತ ನಿಲ್ಲಿಸು</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">ಅಸ್ಥಾಪಿಸು</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">ಬೆಳಕಿನ ಪ್ರಖರತೆ</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">ಪ್ರೊಫೈಲ್ಸ್ ಆಫ್.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">ಪ್ರೊಫೈಲ್: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">ಪ್ರೊಫೈಲ್ಸ್ ಆಫ್ ಆಗಿದೆ.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">ಪ್ರೊಫೈಲ್ <xliff:g id="profile" example="Default">%s</xliff:g>ಗೆ ಬದಲಾಗಿದೆ.</string>
   <string name="quick_settings_compass_init">ಆರಂಭಿಸುತ್ತಿದೆ\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">ಲೈಟ್ ಸೆಟ್ಟಿಂಗ್ ಗಳು</string>
+  <string name="led_notification_text">LED ಲೈಟ್ ಶಕ್ತಗೊಂಡ ಸೆಟ್ಟಿಂಗ್ ಗಳು</string>
+  <string name="qs_tile_edit_header_instruction">ಮರುಹೊಂದಿಸಲು ಟೈಲ್‌ಗಳನ್ನು ಒತ್ತಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ</string>
+  <string name="quick_settings_edit_label">ಟೈಲ್‌ಗಳನ್ನು ಸಂಪಾದಿಸಿ</string>
+  <string name="quick_settings_cannot_delete_edit_tile">ಟೈಲ್‌ ಸಂಪಾದನೆಯನ್ನು ಅಳಿಸಲಾಗದು</string>
+  <string name="qs_tiles_reset_confirmation">ಡೀಫಾಲ್ಟ್‌ ಕಾನ್ಫಿಗರೇಶನ್‌ಗೆ ಕ್ಷಿಪ್ರ ಸೆಟ್ಟಿಮಗ್‌ಗಳ ಟೈಲ್‌ಗಳನ್ನು ಮರು ಹೊಂದಿಸಿ?</string>
+  <string name="quick_settings_tile_reset_to_default">ಡೀಫಾಲ್ಟ್‌ ಲೇಔಟ್‌ಗೆ ಮರುಹೊಂದಿಸಿ</string>
+  <string name="quick_settings_title_header">ಶಿರೋಲೇಖ</string>
+  <string name="quick_settings_title_tiles">ಟೈಲ್‌ಗಳು</string>
+  <string name="quick_settings_title_show_weather">ಹವಾಮಾನ ಕಾಣಿಸಿ</string>
+  <string name="quick_settings_title_show_brightness_slider">ಪ್ರಕಾಶಮಾನ ಸ್ಲೈಡರ್‌ ತೋರಿಸಿ</string>
+  <string name="quick_settings_title_enlarge_first_row">ಮೊದಲ ಅಡ್ಡಸಾಲನ್ನು ದೊಡ್ಡದಾಗಿಸಿ</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">ಇದು ನೀವು ಅನ್‍ಪಿನ್ ಮಾಡುವವರೆಗೂ ವೀಕ್ಷಣೆಯಲ್ಲಿ ಇಡುತ್ತದೆ. ಅನ್‍ಪಿನ್ ಮಾಡಲು ಬ್ಯಾಕ್ ಬಟನ್ ಸ್ಪರ್ಶಿಸಿ ಹಿಡಿಯಿರಿ.</string>
   <string name="quick_settings_custom_tile_detail_title">ಕಸ್ಟಮ್ ಟೈಲ್</string>
   <string name="quick_settings_remove">ಟೈಲ್ ತೆಗೆ</string>
@@ -51,9 +88,15 @@
   <string name="quick_settings_profiles_off">ಪ್ರೊಫೈಲ್ಸ್ ನಿಷ್ಕ್ರೀಯಗೊಂಡಿದೆ</string>
   <string name="quick_settings_heads_up_label">ಹೆಡ್ಸ್ ಅಪ್</string>
   <string name="quick_settings_battery_saver_label">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">ಕ್ಯಾಫೀನ್</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">ಸಿಂಕ್ ಆಫ್.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">ಸಿಂಕ್ ಆನ್.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">ಸಿಂಕ್ ಆಫ್ ಆಗಿದೆ.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">ಸಿಂಕ್ ಆನ್ ಆಗಿದೆ.</string>
   <string name="quick_settings_sync_label">ಸಿಂಕ್</string>
   <string name="quick_settings_volume_panel_label">ವಾಲ್ಯೂಂ ಪ್ಯಾನೆಲ್</string>
@@ -62,58 +105,115 @@
   <string name="quick_settings_lockscreen_label">ಲಾಕ್ ಪರದೆ</string>
   <string name="quick_settings_ambient_display_label">ಆವರಿಸಿದ ಪರದೆ</string>
   <string name="quick_settings_lockscreen_label_enforced">ಒತ್ತಾಯವಾದ ಲಾಕ್ ಪರದೆ</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">ಪ್ರೊಫೈಲ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">ಪರದೆ ಅವಧಿಸಮಾಪ್ತಿ: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">ಪರದೆ ಅವಧಿಸಮಾಪ್ತಿ <xliff:g id="timeout" example="30 seconds">%s</xliff:g>ಗೆ ಬದಲಾಗಿದೆ.</string>
   <string name="qs_tile_performance">ಬ್ಯಾಟರಿ ಮೋಡ್</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">ಬ್ಯಾಟರಿ ಮೋಡ್: ವಿದ್ಯುತ್ ಉಳಿತಾಯ ಮೋಡ್.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">ಬ್ಯಾಟರಿ ಮೋಡ್: ಸಮತೋಲಿತ ಮೋಡ್.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">ಬ್ಯಾಟರಿ ಮೋಡ್: ಪರ್ಫಾರ್ಮೆನ್ಸ್ ಮೋಡ್.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">ಬ್ಯಾಟರಿ ಮೋಡ್: ದಕ್ಷತೆ ಮೋಡ್.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">ಬ್ಯಾಟರಿ ಮೋಡ್: ತ್ವರಿತ ಮೋಡ್.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">ಬ್ಯಾಟರಿ ಮೋಡ್ ವಿದ್ಯುತ್ ಉಳಿತಾಯ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">ಬ್ಯಾಟರಿ ಮೋಡ್ ಸಮತೋಲಿತ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">ಬ್ಯಾಟರಿ ಮೋಡ್ ಪರ್ಫಾರ್ಮೆನ್ಸ್ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">ಬ್ಯಾಟರಿ ಮೋಡ್ ದಕ್ಷತೆ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">ಬ್ಯಾಟರಿ ಮೋಡ್ ತ್ವರಿತ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
   <string name="quick_settings_performance_profile_detail_title">ಬ್ಯಾಟರಿ ಮೋಡ್</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">ಲಾಕ್ ಪರದೆ ಆಫ್.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">ಲಾಕ್ ಪರದೆ ಆನ್.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">ಲಾಕ್ ಪರದೆ ಆಫ್ ಆಗಿದೆ.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">ಲಾಕ್ ಪರದೆ ಆನ್ ಆಗಿದೆ.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">ಆವರಿಸಿದ ಪರದೆ ಆಫ್.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">ಆವರಿಸಿದ ಪರದೆ ಆನ್.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">ಆವರಿಸಿದ ಪರದೆ ಆಫ್ ಆಗಿದೆ.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">ಆವರಿಸಿದ ಪರದೆ ಆನ್ ಆಗಿದೆ.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">ಹೆಡ್ಸ್ ಅಪ್ ಆಫ್.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">ಹೆಡ್ಸ್ ಅಪ್ ಆನ್.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">ಹೆಡ್ಸ್ ಅಪ್ ಆಫ್ ಆಗಿದೆ.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">ಹೆಡ್ಸ್ ಅಪ್ ಆನ್ ಆಗಿದೆ.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">ಕ್ಯಾಫೀನ್ ಆಫ್.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">ಕ್ಯಾಫೀನ್ ಒನ್.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆಫ್.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆನ್.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆಫ್ ಆಗಿದೆ.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಆನ್ ಆಗಿದೆ.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">ಕ್ರಿಯಾತ್ಮಕ ಟೈಲ್</string>
   <string name="dynamic_qs_tile_next_alarm_label">ಮುಂದಿನ ಅಲಾರಂ</string>
   <string name="dynamic_qs_tile_ime_selector_label">ಇಎಂಇ ಆಯ್ಕೆ</string>
   <string name="dynamic_qs_tile_su_label">ರೂಟ್ ಪ್ರವೇಶ</string>
-  <string name="accessibility_quick_settings_live_display_off">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ ಆಫ್.</string>
-  <string name="accessibility_quick_settings_live_display_auto">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ: ಸ್ವಯಂ ಮೋಡ್.</string>
-  <string name="accessibility_quick_settings_live_display_day">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ: ಹಗಲು ಮೋಡ್.</string>
-  <string name="accessibility_quick_settings_live_display_night">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ: ರಾತ್ರಿ ಮೋಡ್.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ: ಹೊರಾಂಗಣ ಮೋಡ್.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ ಆಫ್ ಆಗಿದೆ.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ ಸ್ವಯಂ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ ಹಗಲು ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ ರಾತ್ರಿ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">ಲೈವ್‍ಡಿಸ್ಪ್ಲೇ ಹೊರಾಂಗಣ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
+  <string name="quick_settings_title_advanced_location">ಟ್ರೈ-ಸ್ಟೇಟ್‌ ಸ್ಥಳ</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">ಸ್ಥಳ ವರದಿಸಲ್ಲಿಸುವಿಕೆ: ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಮೋಡ್.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">ಸ್ಥಳ ವರದಿ ಸಲ್ಲಿಸುವಿಕೆ: ಸಂವೇದಕಗಳು ಮಾತ್ರ ಮೋಡ್.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">ಸ್ಥಳ ವರದಿಸಲ್ಲಿಸುವಿಕೆ: ಗರಿಷ್ಟ ನಿಖರತೆ ಮೋಡ್.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">ಸ್ಥಳ ಮೋಡ್</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">ಬ್ಯಾಟರಿ ಉಳಿತಾಯ</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">ಸಾಧನ ಮಾತ್ರ</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">ಗರಿಷ್ಠ ನಿಖರತೆ</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">ಸ್ಥಳ ವರದಿಸಲ್ಲಿಸುವಿಕೆ ಬ್ಯಾಟರಿ ಉಳಿತಾಯ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">ಸ್ಥಳ ವರದಿಸಲ್ಲಿಸುವಿಕೆ ಸಂವೇದಕಗಳು ಮಾತ್ರ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">ಸ್ಥಳ ವರದಿಸಲ್ಲಿಸುವಿಕೆ ಗರಿಷ್ಠ ನಿಖರತೆ ಮೋಡ್‍ಗೆ ಬದಲಾಗಿದೆ.</string>
+  <string name="quick_settings_tiles_category_system">ಸಿಸ್ಟಂ ಟೈಲ್‌ಗಳು</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">ಟೈಲ್‌ ಸೇರಿಸಿ</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">ಏರ್‌ಪ್ಲೇನ್‌ ಮೋಡ್‌ ಸಕ್ರಿಯವಾಗಿರುವ ವೇಳೆ ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸಂಪರ್ಕಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ. ಏರ್‌ಪ್ಲೇನ್‌ ಮೋಡ್‌ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ ಮತ್ತು ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ಫ್ಲ್ಯಾಶ್ಲೈಟ್ ಆನ್ ಆಗಿದೆ</string>
+  <string name="quick_settings_tile_flashlight_not_summary">ಆಫ್ ಮಾಡಲು ಸ್ಪರ್ಶಿಸಿ</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d ಕ್ಲೈಂಟ್</item>
+    <item quantity="other">%1$d ಕ್ಲೈಂಟ್</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">ಡಾಕ್ ಬ್ಯಾಟರಿ <xliff:g id="number">%d</xliff:g> ಶೇಕಡಾ.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">ಪ್ಲೇ ಸರದಿಯನ್ನು ತೋರಿಸು</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-ko/cm_arrays.xml b/packages/SystemUI/res/values-ko/cm_arrays.xml
index e5df957..8a3ff49 100644
--- a/packages/SystemUI/res/values-ko/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ko/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>북</item>
+    <!-- North -->
     <item>북동</item>
+    <!-- North east -->
     <item>동</item>
+    <!-- East -->
     <item>남동</item>
+    <!-- South east -->
     <item>남</item>
+    <!-- South -->
     <item>남서</item>
+    <!-- South west -->
     <item>서</item>
+    <!-- West -->
     <item>북서</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ko/cm_strings.xml b/packages/SystemUI/res/values-ko/cm_strings.xml
index 42509f9..bcc7dbd 100644
--- a/packages/SystemUI/res/values-ko/cm_strings.xml
+++ b/packages/SystemUI/res/values-ko/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">오른쪽으로 밀어서 %1$s</string>
   <string name="right_shortcut_hint">왼쪽으로 밀어서 %1$s</string>
   <string name="lockscreen_message">잠금화면 바로가기를 다시 지정하려면 왼쪽이나 오른쪽의 아이콘을 탭하세요.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">앱 선택</string>
   <string name="lockscreen_choose_action_title">동작 선택</string>
   <string name="lockscreen_none_target">없음</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">할당할 작업을 선택</string>
   <string name="navbar_home_button">홈 버튼</string>
   <string name="navbar_recent_button">최근 버튼</string>
@@ -37,27 +46,38 @@
   <string name="navbar_menu_big_button">메뉴 버튼</string>
   <string name="accessibility_dpad_left">커서 왼쪽</string>
   <string name="accessibility_dpad_right">커서 오른쪽</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">앱 데이터 삭제</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">강제 종료</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">제거</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">조명 밝기</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">프로필 꺼짐.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">현재 프로필: <xliff:g id="profile" example="Default">%s</xliff:g></string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">프로필이 이제 꺼짐.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">프로필이 <xliff:g id="profile" example="Default">%s</xliff:g>으(로) 바뀜.</string>
   <string name="quick_settings_compass_init">초기화 중\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">조명 설정</string>
-  <string name="led_notification_text">설정에 의해 LED 전등이 활성화됨</string>
-  <string name="qs_tile_edit_header_instruction">다시 배치하려면 타일을 길게 누름</string>
+  <string name="led_notification_text">설정 앱이 LED 전등을 활성화함</string>
+  <string name="qs_tile_edit_header_instruction">다시 배치하려면 타일을 길게 누르세요</string>
   <string name="quick_settings_edit_label">타일 편집</string>
   <string name="quick_settings_cannot_delete_edit_tile">타일 편집 삭제 불가</string>
-  <string name="qs_tiles_reset_confirmation">빠른 설정 타일 배치를 기본으로 재설정</string>
+  <string name="qs_tiles_reset_confirmation">빠른 설정 타일을 기본 설정으로 재설정합니까?</string>
   <string name="quick_settings_tile_reset_to_default">기본 레이아웃으로 재설정</string>
   <string name="quick_settings_title_header">헤더</string>
   <string name="quick_settings_title_tiles">타일</string>
   <string name="quick_settings_title_show_weather">날씨 표시</string>
   <string name="quick_settings_title_show_brightness_slider">화면 밝기 조정 표시</string>
   <string name="quick_settings_title_enlarge_first_row">첫번째 타일을 크게</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">고정을 해제할 때까지 계속 표시합니다. 뒤로 버튼을 계속 눌러 고정을 해제하세요.</string>
   <string name="quick_settings_custom_tile_detail_title">개인설정 타일</string>
   <string name="quick_settings_remove">타일 제거</string>
@@ -68,9 +88,16 @@
   <string name="quick_settings_profiles_off">프로필 사용 안 함</string>
   <string name="quick_settings_heads_up_label">헤드업 알림</string>
   <string name="quick_settings_battery_saver_label">배터리 절약</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">배터리 세이버 (충전중)</string>
+  <string name="quick_settings_caffeine_label">카페인</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">동기화 꺼짐</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">동기화 켜짐</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">동기화가 해제되었습니다.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">동기화가 설정되었습니다.</string>
   <string name="quick_settings_sync_label">동기화</string>
   <string name="quick_settings_volume_panel_label">볼륨 패널</string>
@@ -79,64 +106,115 @@
   <string name="quick_settings_lockscreen_label">잠금 화면</string>
   <string name="quick_settings_ambient_display_label">절전 모드 자동 해제</string>
   <string name="quick_settings_lockscreen_label_enforced">잠금 화면 사용됨</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">프로필 설정에 의해 비활성화됨</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">화면 시간 제한: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">화면 시간 제한이 <xliff:g id="timeout" example="30 seconds">%s</xliff:g>으(로) 바뀜.</string>
   <string name="qs_tile_performance">배터리 모드</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">배터리 모드: 전원 절약 모드.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">배터리 모드: 균형 모드.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">배터리 모드: 성능 모드.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">배터리 모드: 효율 모드.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">배터리 모드: 성능 모드.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">배터리 모드가 이제 절전 모드로 바뀜.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">베터리 모드가 이제 균형 모드로 바뀜.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">배터리 모드가 성능 모드로 바뀜.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">배터리 모드가 효율 모드로 변경되었습니다.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">배터리 모드가 성능 모드로 변환되었습니다.</string>
   <string name="quick_settings_performance_profile_detail_title">배터리 모드</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">잠금 화면 꺼짐.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">잠금 화면 켜짐.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">잠금 화면이 이제 꺼짐.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">잠금 화면이 이제 켜짐.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">절전 모드 자동 해제가 꺼짐.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">절전 모드 자동 해제가 켜짐.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">절전 모드 자동 해제가 꺼졌습니다.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">절전 모드 자동 해제가 켜졌습니다.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">헤드업 알림이 꺼짐.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">헤드업 알림이 켜짐.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">헤드업 알림이 꺼졌습니다.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">헤드업 알림이 켜졌습니다.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">카페인 꺼짐.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">카페인 켜짐.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">배터리 절약 끔.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">배터리 절약 킴.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">배터리 절약이 꺼졌습니다.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">배터리 절약이 켜졌습니다.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">동적 타일</string>
   <string name="dynamic_qs_tile_next_alarm_label">다음 알람</string>
   <string name="dynamic_qs_tile_ime_selector_label">입력 방법 선택</string>
   <string name="dynamic_qs_tile_su_label">루트 권한</string>
-  <string name="accessibility_quick_settings_live_display_off">라이브 디스플레이 꺼짐.</string>
-  <string name="accessibility_quick_settings_live_display_auto">라이브 디스플레이: 자동 모드.</string>
-  <string name="accessibility_quick_settings_live_display_day">라이브 디스플레이: 낮 모드.</string>
-  <string name="accessibility_quick_settings_live_display_night">라이브 디스플레이: 밤 모드.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">라이브 디스플레이: 야외 모드.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">라이브 디스플레이 꺼짐.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">라이브 디스플레이가 자동 모드로 바뀜.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">라이브 디스플레이가 낮 모드로 바뀜.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">라이브 디스플레이가 밤 모드로 바뀜.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">라이브 디스플레이가 야외 모드로 바뀜.</string>
   <string name="quick_settings_title_advanced_location">3가지 위치 설정</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">위치 보고: 배터리 절약 모드.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">위치 보고: 기기 전용 모드.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">위치 보고: 높은 정확성 모드.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">위치 모드</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">배터리 절약</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">기기 전용</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">높은 정확도</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">위치 보고가 배터리 절약 모드로 바뀜.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">위치 보고가 기기 전용 모드로 바뀜.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">위치 보고가 높은 정확도 모드로 바뀜.</string>
   <string name="quick_settings_tiles_category_system">시스템 타일</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">타일 추가</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">비행기 모드가 활성화되어 있어 셀룰러 네트워크에 연결할 수 없습니다. 비행기 모드를 해제하고 다시 시도하세요.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">손전등 켜짐</string>
   <string name="quick_settings_tile_flashlight_not_summary">탭하여 끄기</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="other">%1$d개 장치</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">데이터 SIM 없음</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">독의 배터리는 <xliff:g id="number">%d</xliff:g>퍼센트입니다.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">재생 대기열 표시</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-ku/cm_arrays.xml b/packages/SystemUI/res/values-ku/cm_arrays.xml
index cf5825b..3110756 100644
--- a/packages/SystemUI/res/values-ku/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ku/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ku/cm_strings.xml b/packages/SystemUI/res/values-ku/cm_strings.xml
index 59f8c53..7d2fc15 100644
--- a/packages/SystemUI/res/values-ku/cm_strings.xml
+++ b/packages/SystemUI/res/values-ku/cm_strings.xml
@@ -16,12 +16,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">رایکێشە بۆلای ڕاست بۆ %1$s</string>
   <string name="right_shortcut_hint">ڕایکێشە بۆلای چەپ بۆ %1$s</string>
   <string name="select_application">دیاریکردنی بەرنامە</string>
   <string name="lockscreen_choose_action_title">چالاکیه‌ک هه‌ڵبژێره‌</string>
   <string name="lockscreen_none_target">هیچیان</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">کارێك هەڵبژێرە بۆ ئەنجام دان </string>
   <string name="navbar_home_button">دوگمەی سەرەتا</string>
   <string name="navbar_recent_button">دوگمەی پێشینە</string>
@@ -33,10 +42,21 @@
   <string name="navbar_menu_big_button">دوگمەی مینو</string>
   <string name="accessibility_dpad_left">جێنیشانده‌ر بۆ لای چه‌پ</string>
   <string name="accessibility_dpad_right">جێنیشانده‌ر بۆ لای ڕاست</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">سڕینەوەی داواکاریەکانی بەرنامە</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">وەستاندی بێهۆکار</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">سڕینەوە</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_compass_init">سه‌ره‌تایکردن\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">ئەمە لەسەر پیشاندان ئەمێنێتەوە تاوەکو لەیەکدادەبڕێن. دەستلێدە و دووگمەی دواوە هەڵبگرە بۆ لێدابڕان.</string>
   <string name="quick_settings_custom_tile_detail_title">خشتەی دروستکراو</string>
   <string name="quick_settings_remove">سڕینه‌وه‌ی خشتە</string>
@@ -46,16 +66,73 @@
   <string name="quick_settings_profiles">زانیاری تایبەتیەکانی سیستەم</string>
   <string name="quick_settings_profiles_off">زانیاری تایبەتی ناچالاکە</string>
   <string name="quick_settings_heads_up_label">فه‌رمووه‌کان</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_usb_tether_label">گرتنەدەستی USB</string>
   <string name="quick_settings_screen_timeout_detail_title">کاتی شاشە</string>
   <string name="quick_settings_lockscreen_label">قفڵی شاشە</string>
   <string name="quick_settings_ambient_display_label">پیشاندەری دەوروبەر</string>
   <string name="quick_settings_lockscreen_label_enforced">قفڵکردنی شاشە بەزۆر</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">دۆزینەوەی شوێن: شێوازی پاراستنی ووزە.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">دۆزینەوەی شوێن: تەنیا هەستەوەرەکان.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">دۆزینەوەی شوێن: شێوازی بەکارهێنانی تەواو.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">شێوازی شوێن</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">پاراستنی ووزە</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">تەنها ئامێر</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">بەکارهێنانی زۆر</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-ku/strings.xml b/packages/SystemUI/res/values-ku/strings.xml
index 099eb52..87d89bb 100644
--- a/packages/SystemUI/res/values-ku/strings.xml
+++ b/packages/SystemUI/res/values-ku/strings.xml
@@ -18,192 +18,630 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
   <string name="app_label">سیستەم UI</string>
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
   <string name="status_bar_clear_all_button">پاچالاککردن</string>
+  <!-- Title shown in recents popup for removing an application from the list -->
   <string name="status_bar_recent_remove_item_title">لە لیستەکە بیسڕەوە</string>
+  <!-- Title shown in recents popup for inspecting an application's properties -->
   <string name="status_bar_recent_inspect_item_title">زانیاری دەربارەی بەرنامە</string>
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
   <string name="status_bar_accessibility_dismiss_recents">پشتگوێ خستنی بەرنامەی تازە</string>
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
   <string name="status_bar_no_notifications_title">تێبینی نیە</string>
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
   <string name="status_bar_ongoing_events_title">چونە</string>
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
   <string name="status_bar_latest_events_title">تێبینی</string>
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
   <string name="invalid_charger">USB پاڵپشتی ناکات .\nتەنها بارگەکەر بەکاربهێنە.</string>
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
   <string name="battery_low_why">ڕێکخستنه‌کان</string>
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
   <string name="battery_saver_confirmation_title">باتری پارێز چالاک ئەکەیت?</string>
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
   <string name="battery_saver_confirmation_ok">کردنە کار</string>
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
   <string name="battery_saver_start_action">باتری پارێز چالاک ئەکەیت</string>
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_settings_button">ڕێکخستن</string>
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_wifi_button">Wi-Fi</string>
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
   <string name="status_bar_settings_auto_rotation">خۆکارانە-سوڕانەوەی شاشە</string>
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
   <string name="status_bar_settings_mute_label">کپکردن</string>
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
   <string name="status_bar_settings_auto_brightness_label">خۆکارانە</string>
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
   <string name="status_bar_settings_notifications">ئاگادارییه‌کان</string>
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
   <string name="bluetooth_tethered">بلوتوس تێزەر</string>
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
   <string name="status_bar_input_method_settings_configure_input_methods">دامەزراندن ڕێگەکان</string>
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
   <string name="status_bar_use_physical_keyboard">تەختەکلیلی فیزیکی</string>
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
   <string name="usb_device_permission_prompt">ڕێگەدان بە بەرنامەکە <xliff:g id="application">%1$s</xliff:g> بۆ بەکارهێنانیUSB?</string>
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_permission_prompt">ڕێگەدان بەبەرنامەکە <xliff:g id="application">%1$s</xliff:g> بەکارهێنانیUSB ?</string>
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
   <string name="usb_device_confirm_prompt">چالاککردن <xliff:g id="activity">%1$s</xliff:g>کاتێک ئامێرەکە پەیوەندە بە USB?</string>
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_confirm_prompt">کراوە <xliff:g id="activity">%1$s</xliff:g> کاتێک ئەو USB yیە پەیوەندکراوە?</string>
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_uri_prompt">هیچ بەرنامەیەک دانەمەزراوە ئیش بکات لەسەر USB  زیاتر فێربە دەربارەی <xliff:g id="url">%1$s</xliff:g></string>
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
   <string name="title_usb_accessory">USB</string>
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
   <string name="label_view">پیشاندان</string>
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
   <string name="always_use_device">لە بنەڕەتەوە بەکاری بهێنە بۆ USB </string>
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
   <string name="always_use_accessory">بنەڕەتی بەکاربهێنە بۆ USB</string>
+  <!-- Title of confirmation dialog for USB debugging -->
   <string name="usb_debugging_title">ڕێگە دان بە هەڵدۆزی USB?</string>
+  <!-- Message of confirmation dialog for USB debugging -->
   <string name="usb_debugging_message">چاپکەری پەنجە کلیل لە RSA :\n<xliff:g id="fingerprint">%1$s</xliff:g></string>
+  <!-- Option to always allow USB debugging from the attached computer -->
   <string name="usb_debugging_always">هەمیشە ڕێگە بدە لەسەر ئەم کۆمپیوتەرە</string>
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
   <string name="compat_mode_on">زوومکردن بۆ پڕ شاشە</string>
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
   <string name="compat_mode_off">درێژبونەوە بۆ پڕشاشە</string>
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
   <string name="screenshot_saving_ticker">پاشەکەوتکردنی وێنه‌ی شاشە\u2026</string>
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
   <string name="screenshot_saving_title">پاشەکەوتکردنی شاشەوێنە\u2026</string>
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
   <string name="screenshot_saving_text">وێنەی شاشەکە پاشەکەوتکرا.</string>
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
   <string name="screenshot_saved_title">وێنەی شاشە گیرا.</string>
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
   <string name="screenshot_saved_text">دەست لێدە بۆ پیشاندانی وێنەی شاشە.</string>
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
   <string name="screenshot_failed_title">ناتوانێت وێنەی شاشەبگرێت.</string>
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
   <string name="usb_preference_title">هەڵبژاردەی usb بۆ گواستنەوەی فایلەکان</string>
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_mtp_button_title">جێگیركردن وەکو لێدەرە ڕاگه‌یێنه‌کان(MTP)</string>
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_ptp_button_title">جێگیرکردن وەکو کامێرا(PTP)</string>
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="installer_cd_button_title">دامەزراندنی فایلەکان ئەندرۆید لەسەر ماک</string>
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_back">گەڕانەوە</string>
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_home">ماڵەوە</string>
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_menu">پێڕست</string>
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_recent">پیشاندانی گشتی</string>
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
   <string name="accessibility_search_light">گەڕان</string>
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_camera_button">کامێرا</string>
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_button">تەلەفۆن</string>
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_unlock_button">کردنەوە</string>
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
   <string name="unlock_label">كردنەوە</string>
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
   <string name="phone_label">کردنەوەی تەلەفۆن</string>
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
   <string name="camera_label">کردنەوەی کامێرا</string>
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_compatibility_zoom_button">دوگمەی زومی توانای.</string>
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_compatibility_zoom_example">زومکردن لە بچوکەوە بۆ شاشەی گەورە.</string>
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_connected">بلوتوس پەیوەندکراوە.</string>
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_disconnected">بلوتوس نەبەستراوە.</string>
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_battery">باتری نیە.</string>
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_one_bar">شریتی یەک باتری.</string>
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_two_bars">دوو شریتی باتری.</string>
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_three_bars">سێ شریتی باتری.</string>
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_full">باتری پڕە.</string>
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_phone">تەلەفۆن نیە.</string>
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_one_bar">شریتی یەک تەلەفۆن.</string>
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_two_bars">شریتی دوو تەلەفۆن.</string>
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_three_bars">شریتی سێ تەلەفۆن.</string>
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_signal_full">تەلەفۆن پڕ نیشانه‌.</string>
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_data">داتای نیە.</string>
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_one_bar">شریتی یەک داتا.</string>
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_two_bars">شریتی دوو داتا.</string>
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_three_bars">شریتی سێ دراوه.</string>
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_signal_full">پڕ نیشانە داتا.</string>
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
   <string name="accessibility_wifi_name">پەیوەندکراوە بە <xliff:g id="wifi" example="Home Network">%s</xliff:g>.</string>
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_name">پەیوەندکراوە بە <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_wimax">نەخێر WiMAX.</string>
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_one_bar">WiMAX یەک شریت.</string>
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_two_bars">WiMAX یەک شریت.</string>
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_three_bars">WiMAX سێ شریت.</string>
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_signal_full">WiMAX پڕ نیشانە.</string>
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_signal">نیشانە نیە.</string>
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
   <string name="accessibility_not_connected">نەبەستراوەتەوە.</string>
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_zero_bars">شریتی سفر.</string>
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_one_bar">یەک شریت.</string>
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_two_bars">دوو شریت.</string>
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_three_bars">سێ شریت.</string>
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_signal_full">پڕ نیشانە.</string>
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_on">چالاککردن.</string>
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_off">ناچالاککردن.</string>
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_connected">پەیوەندکرا.</string>
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_connecting">په‌یوه‌ندیكردن.</string>
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_gprs">GPRS</string>
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_1x">1 X</string>
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspa">HSPA</string>
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_3g">3G</string>
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_3.5g">3.5G</string>
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g">4G</string>
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_lte">LTE</string>
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_cdma">CDMA</string>
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_roaming">سوڕانەوە</string>
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_edge">لێوار</string>
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_wifi">Wi-Fi</string>
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_sim">سیمکارتی تیا نیە.</string>
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_tether">بلوتوس وایەر.</string>
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_airplane_mode">باری فڕۆکە.</string>
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_level">باتری <xliff:g id="number">%d</xliff:g> لەسەدا.</string>
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_settings_button">ڕێکخستنی سیستەم.</string>
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notifications_button">تێبینیه‌کان.</string>
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_remove_notification">پاکردنەوەی تێبینیەکان.</string>
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_gps_enabled">GPS چالاکرا.</string>
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_gps_acquiring">GPS وەرگرتنی.</string>
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_tty_enabled">TeleTypewriter چالاکرا.</string>
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ringer_vibrate">لەرینەوەی زەنگ.</string>
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ringer_silent">بێدەنگ زەنگ.</string>
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
   <string name="accessibility_recents_item_dismissed"><xliff:g id="app" example="Calendar">%s</xliff:g> لەدەست چوو.</string>
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
   <string name="accessibility_notification_dismissed">تێبینیەکە لەدەستچوو.</string>
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_notification_shade">سێبەری تێبینی.</string>
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_quick_settings">خێرا ڕێکخستن.</string>
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_lock_screen">قوفڵکردنی ڕوونما.</string>
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_settings">ڕێکخستنه‌کان</string>
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_recent_apps">پیشاندانی گشتی.</string>
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_user">بەکارهێنەر <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi_changed_off">کوژانەوەی وایفای.</string>
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi_changed_on">کردنەوەی وایفای.</string>
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_mobile">مۆبایل <xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="type" example="4G">%2$s</xliff:g>. <xliff:g id="network" example="T-Mobile">%3$s</xliff:g>.</string>
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery">باتری <xliff:g id="state" example="50% charging">%s</xliff:g>.</string>
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_off">کوژانەوەی باری فڕۆکە.</string>
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_on">کردنەوەی باری فڕۆکە.</string>
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_changed_off">باری فڕۆکە ناچالاکرا.</string>
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_changed_on">باری فڕۆکە چالاکرا.</string>
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_off">بلوتوس کوژایەوە.</string>
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_on">چالاکردنی بلوتوس.</string>
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_connecting">پەیوەندکردنی بلوتوس.</string>
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_connected">بلوتوس پەیوەندکراوە.</string>
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_changed_off">بلوتوس ناچالاکە.</string>
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_changed_on">بلوتوس ناچالاکە.</string>
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_off">کوژانەوەی ڕاپۆرتی ناوەکی.</string>
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_on">کردنەوەی ڕاپۆرتی ناوەکی.</string>
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_off">ڕاپۆرتی ناوەکی کوژایەوە.</string>
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_on">ڕاپۆرتی ناوەکی چالاکرا.</string>
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_alarm">دانانی بیرخەرەوە بۆ <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_close">داخستنی پەڕە.</string>
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_more_time">کاتی زیاتر.</string>
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_less_time">کاتی کەمتر.</string>
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_off">کوژانەوەی لایت.</string>
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_on">چالاکردنی لایت.</string>
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
   <string name="status_bar_settings_signal_meter_disconnected">ئەنتەرنێت به‌ستنه‌وه نیە</string>
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
   <string name="status_bar_settings_signal_meter_wifi_nossid">Wi-Fi بەستراوە</string>
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
   <string name="gps_notification_searching_text">گەڕان بۆ GPS</string>
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
   <string name="gps_notification_found_text">ناوچەکە دانراوە لە GPS</string>
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
   <string name="accessibility_location_active">ناوچە داواکراوە بۆ چالاککردن</string>
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_clear_all">پاکردنەوەی تێبنیەکان.</string>
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_off">شاشەکە خۆکارانە ئەخولێتەوە.</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_landscape">شاشەکە بە لایە قوفڵ ئەبێت.</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_portrait">شاشەکە بە ڕاستە قوفڵ ئەبێت.</string>
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
   <string name="dessert_case">شیرینی بابەت</string>
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
   <string name="start_dreams">ڕۆژی خەون</string>
+  <!-- Textual description of Ethernet connections -->
   <string name="ethernet_label">ئێسه‌رنێت</string>
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_label">بلوتوس</string>
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_multiple_devices_label">بلوتوس (<xliff:g id="number">%d</xliff:g> ئامێرەکان)</string>
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_off_label">بلوتوس کوژاوه‌یه‌</string>
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_label">ڕوناکی</string>
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
   <string name="quick_settings_ime_label">دانانی ڕێگە</string>
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_label">ناوچه‌</string>
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_off_label">کوژاندنەوەی شوێندۆزەرەوە</string>
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
   <string name="quick_settings_media_device_label">ئامێری ڕاگه‌یێنه‌کان </string>
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_label">RSSI</string>
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_emergency_only">ته‌نها په‌یوه‌ندی كتوپڕ</string>
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
   <string name="quick_settings_settings_label">ڕێکخستنه‌کان</string>
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
   <string name="quick_settings_time_label">کات</string>
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_label">من</string>
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_label">Wi-Fi</string>
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_not_connected">نەبەستراوە</string>
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_no_network">تۆڕ نیە</string>
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_off_label">Wi-Fi ناچالاکه‌</string>
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_title">ڕۆشنایی</string>
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_auto_brightness_label">خۆکارانە</string>
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_connecting">په‌یوه‌ندیكردن...</string>
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
   <string name="quick_settings_notifications_label">تێبینیه‌کان</string>
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
   <string name="quick_settings_flashlight_label">لایتی فلاش</string>
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
   <string name="battery_meter_very_low_overlay_symbol">!</string>
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
   <string name="ssl_ca_cert_warning">تۆڕه‌که‌ مۆنیته‌ر کراوه‌</string>
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
   <string name="status_bar_ethernet">ئێسه‌رنێت</string>
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
   <string name="status_bar_airplane">شێوازی فڕۆکە</string>
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
   <string name="enable_bluetooth_confirmation_ok">کردنە کار</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ky-rKG/cm_arrays.xml b/packages/SystemUI/res/values-ky-rKG/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-ky-rKG/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-ky-rKG/cm_strings.xml b/packages/SystemUI/res/values-ky-rKG/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-ky-rKG/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-lb/cm_arrays.xml b/packages/SystemUI/res/values-lb/cm_arrays.xml
index b156d8e..3008606 100644
--- a/packages/SystemUI/res/values-lb/cm_arrays.xml
+++ b/packages/SystemUI/res/values-lb/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NO</item>
+    <!-- North east -->
     <item>O</item>
+    <!-- East -->
     <item>SO</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-lb/cm_strings.xml b/packages/SystemUI/res/values-lb/cm_strings.xml
index d69da04..9756cd2 100644
--- a/packages/SystemUI/res/values-lb/cm_strings.xml
+++ b/packages/SystemUI/res/values-lb/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">No riets wësche fir %1$s</string>
   <string name="right_shortcut_hint">No lénks wësche fir %1$s</string>
   <string name="lockscreen_message">Dréck e Symbol op der lénkser oder rietser Säit fir d\'Spärschierm-Ofkierzungen nei ze definéieren.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">App auswielen</string>
   <string name="lockscreen_choose_action_title">Aktioun auswielen</string>
   <string name="lockscreen_none_target">Keen</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Funktioun zouweisen</string>
   <string name="navbar_home_button">Startsäit-Knäppchen</string>
   <string name="navbar_recent_button">Verlafknäppchen</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Menüknäppchen</string>
   <string name="accessibility_dpad_left">Cursor lénks</string>
   <string name="accessibility_dpad_right">Cursor riets</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Applikatiounsdate läschen</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Zoumaachen zwéngen</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstalléieren</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Hellegkeet</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiller aus.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiller ausgeschalt.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil op <xliff:g id="profile" example="Default">%s</xliff:g> geännert.</string>
   <string name="quick_settings_compass_init">Initialiséieren\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Hellegkeetsastellungen</string>
   <string name="led_notification_text">Notifikatiounsluucht duerch Astellungen aktivéieren</string>
   <string name="qs_tile_edit_header_instruction">Dréck an haalt d\'Kachelen, fir se nei zouzeuerdnen</string>
@@ -56,7 +75,9 @@
   <string name="quick_settings_title_header">Entête</string>
   <string name="quick_settings_title_tiles">Kachelen</string>
   <string name="quick_settings_title_show_weather">Wieder uweisen</string>
+  <string name="quick_settings_title_show_brightness_slider">Hellegkeetsregeler uweisen</string>
   <string name="quick_settings_title_enlarge_first_row">Éischt Rei vergréisseren</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Doduerch bleift d\'App visibel bis se lassgeléist gëtt. Dréck den Zréck-Knäppchen an hal e gedréckt fir d\'App lasszeléisen.</string>
   <string name="quick_settings_custom_tile_detail_title">Eege Kachel</string>
   <string name="quick_settings_remove">Kachel läschen</string>
@@ -67,9 +88,16 @@
   <string name="quick_settings_profiles_off">Profiller desaktivéiert</string>
   <string name="quick_settings_heads_up_label">Pop-Up-Notifikatiounen</string>
   <string name="quick_settings_battery_saver_label">Akkuschouner</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Akku-Schouner (gëtt gelueden)</string>
+  <string name="quick_settings_caffeine_label">Koffein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synchronisatioun aus.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synchronisatioun un.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synchronisatioun ausgeschalt.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synchronisatioun ugeschalt.</string>
   <string name="quick_settings_sync_label">Synchronisatioun</string>
   <string name="quick_settings_volume_panel_label">Lautstäerktpanneau</string>
@@ -78,61 +106,117 @@
   <string name="quick_settings_lockscreen_label">Schiermspär</string>
   <string name="quick_settings_ambient_display_label">Ambiente Schierm</string>
   <string name="quick_settings_lockscreen_label_enforced">Spärschierm forcéiert</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Verhënnert duerch den aktuelle Profil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Rouzoustand no <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Zäit bis zum Rouzoustand op <xliff:g id="timeout" example="30 seconds">%s</xliff:g> geännert.</string>
   <string name="qs_tile_performance">Akkumodus</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Akkumodus: Energie spueren.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Akkumodus: Equilibréiert.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Akkumodus: Héich Leeschtung.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Akkumodus: effiziente Modus.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Akkumodus: séiere Modus.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Akkumodus op \"Energie spueren\" geännert.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Akkumodus op \"Equilibréiert\" geännert.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Akkumodus op \"Héich Leeschtung\" geännert.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Akkumodus geännert op den effiziente Modus.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Akkumodus geännert op de séiere Modus.</string>
   <string name="quick_settings_performance_profile_detail_title">Akkumodus</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Schiermspär aus.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Schiermspär un.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Schiermspär ausgeschalt.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Schiermspär ugeschalt.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambiente Schierm aus.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambiente Schierm un.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambiente Schierm ausgeschalt.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambiente Schierm ugeschalt.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Pop-Up-Notifikatiounen aus.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Pop-Up-Notifikatiounen un.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Pop-Up-Notifikatiounen ausgeschalt.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Pop-Up-Notifikatiounen ugeschalt.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Koffein aus.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Koffein un.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Akkuschouner aus.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Akkuschouner un.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Akkuschouner ausgeschalt.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Akkuschouner ugeschalt.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamesch Kachelen</string>
   <string name="dynamic_qs_tile_next_alarm_label">Nächste Wecker</string>
   <string name="dynamic_qs_tile_ime_selector_label">Method fir anzeginn</string>
   <string name="dynamic_qs_tile_su_label">Root-Zougrëff</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay aus.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: Automatesch.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: Dag.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: Nuecht.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: Dobaussen.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay ausgeschalt.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay-Modus op \"Automatesch\" geännert.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay-Modus op \"Dag\" geännert.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay-Modus op \"Nuecht\" geännert.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay-Modus op \"Dobaussen\" geännert.</string>
   <string name="quick_settings_title_advanced_location">Standuert mat dräi Zoustänn</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Standuertbericht: Akku spueren.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Standuertbericht: Just Sensoren.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Standuertbericht: Héich Genauegkeet.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Standuertmodus</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Akku spueren</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Just Apparat</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Héich Genauegkeet</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Standuertbericht op \"Akku spueren\" geännert.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Standuertbericht op \"Just Sensoren\" geännert.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Standuertbericht op \"Héich Genauegkeet\" geännert.</string>
   <string name="quick_settings_tiles_category_system">System-Kachelen</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Kachelen dobäisetzen</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Am Flugmodus ass keng Umeldung beim Mobilfunknetz méiglech. Deaktivéiert den Flugmodus a probéiert et nach eng Kéier.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">D\'Täscheluucht ass un</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Drécke fir s\'auszeschalten</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d Client</item>
+    <item quantity="other">%1$d Clients</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Keng Date-SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dockakku <xliff:g id="number">%d</xliff:g> Prozent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Waardeschlaang uweisen</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
 </resources>
diff --git a/packages/SystemUI/res/values-lb/strings.xml b/packages/SystemUI/res/values-lb/strings.xml
index 2a11376..0217846 100644
--- a/packages/SystemUI/res/values-lb/strings.xml
+++ b/packages/SystemUI/res/values-lb/strings.xml
@@ -18,310 +18,754 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
   <string name="app_label">System-UI</string>
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
   <string name="status_bar_clear_all_button">Eidel maachen</string>
+  <!-- Title shown in recents popup for removing an application from the list -->
   <string name="status_bar_recent_remove_item_title">Aus der Lëscht eraushuelen</string>
+  <!-- Title shown in recents popup for inspecting an application's properties -->
   <string name="status_bar_recent_inspect_item_title">App-Info</string>
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
   <string name="status_bar_no_recent_apps">Deng rezent Schiermer erschéngen hei</string>
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
   <string name="status_bar_accessibility_dismiss_recents">Rezent Appe verwerfen</string>
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <plurals name="status_bar_accessibility_recent_apps">
+    <item quantity="one">1 Schierm an der Iwwersiicht</item>
+    <item quantity="other">%d Schiermer an der Iwwersiicht</item>
+  </plurals>
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
   <string name="status_bar_no_notifications_title">Keng Notifikatiounen</string>
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
   <string name="status_bar_ongoing_events_title">Am Gaang</string>
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
   <string name="status_bar_latest_events_title">Notifikatiounen</string>
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
   <string name="battery_low_title">Akku niddreg</string>
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
   <string name="battery_low_percent_format"><xliff:g id="percentage">%s</xliff:g> iwwreg</string>
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
   <string name="battery_low_percent_format_saver_started"><xliff:g id="percentage">%s</xliff:g> iwwreg. Akkuschouner ass un.</string>
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
   <string name="invalid_charger">Oplueden iwwer USB net ënnerstëtzt.\nBenotz just de matgeliwwerten Oplueder.</string>
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
   <string name="invalid_charger_title">Oplueden iwwer USB net ënnerstëtzt.</string>
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
   <string name="invalid_charger_text">Benotz just de matgeliwwerten Oplueder.</string>
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
   <string name="battery_low_why">Astellungen</string>
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
   <string name="battery_saver_confirmation_title">Akkuschouner uschalten?</string>
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
   <string name="battery_saver_confirmation_ok">Uschalten</string>
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
   <string name="battery_saver_start_action">Akkuschouner uschalten</string>
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_settings_button">Astellungen</string>
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_wifi_button">WLAN</string>
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
   <string name="status_bar_settings_auto_rotation">Schierm automatesch rotéieren</string>
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
   <string name="status_bar_settings_mute_label">STOMM</string>
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
   <string name="status_bar_settings_auto_brightness_label">AUTO</string>
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
   <string name="status_bar_settings_notifications">Notifikatiounen</string>
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
   <string name="bluetooth_tethered">Bluetooth ugebonnen</string>
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
   <string name="status_bar_input_method_settings_configure_input_methods">Methode fir anzeginn astellen</string>
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
   <string name="status_bar_use_physical_keyboard">Physesch Tastatur</string>
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
   <string name="usb_device_permission_prompt">Der App <xliff:g id="application">%1$s</xliff:g> erlaben op den USB-Apparat zouzegräifen?</string>
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_permission_prompt">Der App <xliff:g id="application">%1$s</xliff:g> erlaben op den USB-Accessoire zouzegräifen?</string>
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
   <string name="usb_device_confirm_prompt"><xliff:g id="activity">%1$s</xliff:g> opmaache wann dësen USB-Apparat connectéiert ass?</string>
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_confirm_prompt"><xliff:g id="activity">%1$s</xliff:g> opmaache wann dësen USB-Accessoire connectéiert ass?</string>
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_uri_prompt">Keng installéiert App fir dësen USB-Accessoire. Méi iwwer dësen Accessoire gewuer ginn op <xliff:g id="url">%1$s</xliff:g></string>
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
   <string name="title_usb_accessory">USB-Accessoire</string>
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
   <string name="label_view">Ukucken</string>
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
   <string name="always_use_device">Standartméisseg fir dësen USB-Apparat benotzen</string>
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
   <string name="always_use_accessory">Standartméisseg fir dësen USB-Accessoire benotzen</string>
+  <!-- Title of confirmation dialog for USB debugging -->
   <string name="usb_debugging_title">USB-Debugging erlaben?</string>
+  <!-- Message of confirmation dialog for USB debugging -->
   <string name="usb_debugging_message">Den RSA-Fangerofdrock vum Computer ass:\n<xliff:g id="fingerprint">%1$s</xliff:g></string>
+  <!-- Option to always allow USB debugging from the attached computer -->
   <string name="usb_debugging_always">Ëmmer vun dësem Computer erlaben</string>
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
   <string name="compat_mode_on">Zoom op d\'Schiermgréisst</string>
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
   <string name="compat_mode_off">Un d\'Schiermgréisst upassen</string>
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
   <string name="screenshot_saving_ticker">Schiermfoto gëtt gespäichert\u2026</string>
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
   <string name="screenshot_saving_title">Schiermfoto gëtt gespäichert\u2026</string>
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
   <string name="screenshot_saving_text">Schiermfoto gëtt gespäichert.</string>
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
   <string name="screenshot_saved_title">Schiermfoto opgeholl.</string>
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
   <string name="screenshot_saved_text">Drécke fir d\'Schiermfoto unzekucken.</string>
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
   <string name="screenshot_failed_title">Schiermfoto konnt net opgeholl ginn.</string>
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
   <string name="screenshot_failed_text">Wéinst ze wéineg Späicherplaz oder wéinst feelender Berechtegung ka keng Schiermfoto gespäichert ginn.</string>
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
   <string name="usb_preference_title">USB-Dateiiwwerdroungsoptiounen</string>
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_mtp_button_title">Als Medieplayer (MTP) abannen</string>
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_ptp_button_title">Als Kamera (PTP) abannen</string>
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="installer_cd_button_title">D\'Fichiersiwwerdroungs-App fir Android um Mac installéieren</string>
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_back">Zréck</string>
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_home">Heem</string>
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_menu">Menü</string>
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_recent">Iwwersiicht</string>
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
   <string name="accessibility_search_light">Sichen</string>
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_camera_button">Fotoapparat</string>
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_button">Telefon</string>
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_unlock_button">Entspären</string>
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
   <string name="unlock_label">entspären</string>
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
   <string name="phone_label">Telefon opmaachen</string>
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
   <string name="camera_label">Kamera opmaachen</string>
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_compatibility_zoom_button">Knäppche fir de Kompatibilitéitszoom.</string>
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_compatibility_zoom_example">Zoom op ee méi grousse Schierm.</string>
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_connected">Bluetooth connectéiert.</string>
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_disconnected">Bluetooth deconnectéiert.</string>
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_battery">Keen Akku.</string>
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_one_bar">Akku, ee Stréch.</string>
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_two_bars">Akku, zwéi Strécher.</string>
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_three_bars">Akku, dräi Strécher.</string>
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_full">Akku gelueden.</string>
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_phone">Keen Telefon.</string>
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_one_bar">Telefonssignal, ee Stréch.</string>
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_two_bars">Telefonssignal, zwéi Strécher.</string>
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_three_bars">Telefonssignal, dräi Strécher.</string>
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_signal_full">Voll Telefonsignalstäerkt.</string>
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_data">Keng Daten.</string>
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_one_bar">Datesignal, ee Stréch.</string>
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_two_bars">Datesignal, zwéi Strécher.</string>
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_three_bars">Datesignal, dräi Strécher.</string>
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_signal_full">Voll Datesignalstäerkt.</string>
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
   <string name="accessibility_wifi_name">Connectéiert mat <xliff:g id="wifi" example="Home Network">%s</xliff:g>.</string>
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_name">Verbonne mat <xliff:g id="bluetooth" example="Car Audio">%s</xliff:g>.</string>
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_wimax">Kee WiMAX.</string>
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_one_bar">WiMAX, ee Stréch.</string>
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_two_bars">WiMAX zwéi Strécher.</string>
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_three_bars">WiMAX dräi Strécher.</string>
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_signal_full">Voll WiMAX-Signalstäerkt.</string>
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_signal">Kee Signal.</string>
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
   <string name="accessibility_not_connected">Net connectéiert.</string>
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_zero_bars">Null Strécher.</string>
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_one_bar">Ee Stréch.</string>
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_two_bars">Zwéi Strécher.</string>
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_three_bars">Dräi Strécher.</string>
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_signal_full">Voll Signalstäerkt.</string>
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_on">Un.</string>
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_off">Aus.</string>
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_connected">Verbonnen.</string>
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_connecting">Gëtt connectéiert.</string>
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_gprs">GPRS</string>
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_1x">1 X</string>
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspa">HSPA</string>
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_3g">3G</string>
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_3.5g">3.5G</string>
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g">4G</string>
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_lte">LTE</string>
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_cdma">CDMA</string>
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_roaming">Roaming</string>
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_edge">Edge</string>
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_wifi">WLAN</string>
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_sim">Keng SIM.</string>
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_tether">Bluetooth-Tethering.</string>
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_airplane_mode">Fligermodus.</string>
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_level">Akku <xliff:g id="number">%d</xliff:g> Prozent.</string>
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_settings_button">Systemastellungen.</string>
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notifications_button">Notifikatiounen.</string>
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_remove_notification">Notifikatioun ewechhuelen.</string>
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_gps_enabled">GPS aktivéiert.</string>
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_gps_acquiring">GPS-Signal gëtt ofgeruff.</string>
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_tty_enabled">Schreiftelefonie aktivéiert.</string>
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ringer_vibrate">Schellmodus \"Vibratioun\".</string>
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ringer_silent">Schellmodus \"Roueg\".</string>
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
   <string name="accessibility_recents_item_will_be_dismissed"><xliff:g id="app" example="Calendar">%s</xliff:g> verwerfen.</string>
+  <!-- Content description to tell the user an application has been removed from recents -->
   <string name="accessibility_recents_item_dismissed"><xliff:g id="app" example="Calendar">%s</xliff:g> verworf.</string>
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
   <string name="accessibility_recents_item_launched"><xliff:g id="app" example="Calendar">%s</xliff:g> gëtt gestart.</string>
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
   <string name="accessibility_notification_dismissed">Notifikatioun verworf.</string>
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_notification_shade">Notifikatiounsläischt.</string>
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_quick_settings">Séier Astellungen.</string>
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_lock_screen">Schierm spären.</string>
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_settings">Astellungen</string>
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_recent_apps">Iwwersiicht.</string>
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_user">Benotzer <xliff:g id="user" example="John Doe">%s</xliff:g>.</string>
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi"><xliff:g id="signal" example="Three bars">%1$s</xliff:g>.</string>
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi_changed_off">WLAN ausgeschalt.</string>
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_wifi_changed_on">WLAN ugeschalt.</string>
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_mobile">Mobil <xliff:g id="signal" example="Three bars">%1$s</xliff:g>. <xliff:g id="type" example="4G">%2$s</xliff:g>. <xliff:g id="network" example="T-Mobile">%3$s</xliff:g>.</string>
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery">Akku <xliff:g id="state" example="50% charging">%s</xliff:g>.</string>
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_off">Fligermodus aus.</string>
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_on">Fligermodus un.</string>
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_changed_off">Fligermodus ausgeschalt.</string>
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_airplane_changed_on">Fligermodus ugeschalt.</string>
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_off">Bluetooth aus.</string>
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_on">Bluetooth un.</string>
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_connecting">Bluetooth gëtt verbonnen.</string>
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_connected">Bluetooth verbonnen.</string>
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_changed_off">Bluetooth ausgeschalt.</string>
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_bluetooth_changed_on">Bluetooth ugeschalt.</string>
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_off">Standuertbericht aus.</string>
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_on">Standuertbericht un.</string>
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_off">Standuertbericht ausgeschalt.</string>
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_on">Standuertbericht ugeschalt.</string>
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_alarm">Alarm gesat fir <xliff:g id="time" example="Wed 3:30 PM">%s</xliff:g>.</string>
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_close">Panneau zoumaachen.</string>
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_more_time">Méi Zäit.</string>
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_less_time">Manner Zäit.</string>
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_off">Täscheluucht aus.</string>
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_on">Täscheluucht un.</string>
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_changed_off">Täscheluucht ausgemaach.</string>
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_flashlight_changed_on">Täscheluucht ugemaach.</string>
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_color_inversion_changed_off">Faarfinvertéierung ausgeschalt.</string>
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_color_inversion_changed_on">Faarfinvertéierung ugeschalt.</string>
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_hotspot_changed_off">Mobillen Zougankspunkt ausgeschalt.</string>
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_hotspot_changed_on">Mobillen Zougankspunkt ugeschalt.</string>
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_casting_turned_off">Cast vum Schierm gestoppt.</string>
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_brightness">Schiermhellegkeet</string>
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
   <string name="status_bar_settings_signal_meter_disconnected">
         Keng Internetconnectioun
     </string>
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
   <string name="status_bar_settings_signal_meter_wifi_nossid">WLAN connectéiert</string>
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
   <string name="gps_notification_searching_text">GPS gëtt gesicht</string>
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
   <string name="gps_notification_found_text">Standuert duerch GPS festgeluecht</string>
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
   <string name="accessibility_location_active">Standuertufroen aktiv</string>
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_clear_all">Notifikatiounen eidel maachen.</string>
+  <!-- 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">Notifikatiounsastellungen</string>
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
   <string name="status_bar_notification_app_settings_title"><xliff:g id="app_name" example="Calendar">%s</xliff:g>-Astellungen</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_off">De Schierm gëtt automatesch rotéiert.</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_landscape">De Schierm ass am Breetformat gespaart.</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_portrait">De Schierm ass am Héichformat gespaart.</string>
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_off_changed">De Schierm rotéiert elo automatesch.</string>
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_landscape_changed">De Schierm ass am Breetformat gespaart.</string>
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_portrait_changed">De Schierm ass am Héichformat gespaart.</string>
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
   <string name="dessert_case">Dessertskëscht</string>
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
   <string name="start_dreams">Dagesdram</string>
+  <!-- Textual description of Ethernet connections -->
   <string name="ethernet_label">Ethernet</string>
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_label">Bluetooth</string>
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_multiple_devices_label">Bluetooth (<xliff:g id="number">%d</xliff:g> Apparater)</string>
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_off_label">Bluetooth Aus</string>
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_detail_empty_text">Keng gekoppelt Apparater disponibel</string>
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_label">Hellegkeet</string>
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rotation_unlocked_label">Automatesch rotéieren</string>
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rotation_locked_label">Rotéierung gespaart</string>
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rotation_locked_portrait_label">Héichformat</string>
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rotation_locked_landscape_label">Breetformat</string>
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
   <string name="quick_settings_ime_label">Method fir anzeginn</string>
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_label">Standuert</string>
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_off_label">Lokaliséierung aus</string>
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
   <string name="quick_settings_media_device_label">Medienapparat</string>
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_label">RSSI</string>
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_emergency_only">Just Noutriff</string>
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
   <string name="quick_settings_settings_label">Astellungen</string>
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
   <string name="quick_settings_time_label">Zäit</string>
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_label">Ech</string>
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_title">Benotzer</string>
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_new_user">Neie Benotzer</string>
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_label">WLAN</string>
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_not_connected">Net Connectéiert</string>
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_no_network">Keen Netzwierk</string>
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_off_label">WLAN Aus</string>
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
   <string name="quick_settings_casting">Casten</string>
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cast_device_default_name">Apparat ouni Numm</string>
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cast_device_default_description">Prett fir ze casten</string>
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cast_detail_empty_text">Keng Apparater disponibel</string>
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_title">Hellegkeet</string>
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_auto_brightness_label">AUTO</string>
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_inversion_label">Faarwen invertéieren</string>
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_color_space_label">Faarfkorrekturmodus</string>
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_more_settings">Méi Astellungen</string>
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_done">Fäerdeg</string>
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_connected">Verbonnen</string>
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_connecting">Gëtt connectéiert...</string>
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_tethering_label">Tethering</string>
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
   <string name="quick_settings_hotspot_label">Zougankspunkt</string>
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
   <string name="quick_settings_notifications_label">Notifikatiounen</string>
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
   <string name="quick_settings_flashlight_label">Täscheluucht</string>
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_title">Zelldaten</string>
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_usage">Dateverbrauch</string>
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_remaining_data">Iwwreg Daten</string>
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_over_limit">Iwwer d\'Limitt</string>
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_used"><xliff:g id="data_used" example="2.0 GB">%s</xliff:g> benotzt</string>
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_limit"><xliff:g id="data_limit" example="2.0 GB">%s</xliff:g>-Limitt</string>
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
   <string name="quick_settings_cellular_detail_data_warning"><xliff:g id="data_limit" example="2.0 GB">%s</xliff:g> Warnung</string>
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
   <string name="recents_empty_message">Deng rezent Schiermer erschéngen hei</string>
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
   <string name="recents_app_info_button_label">App-Info</string>
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
   <string name="recents_lock_to_app_button_label">Schiermfixéierung</string>
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
   <string name="recents_search_bar_label">sichen</string>
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
   <string name="recents_launch_error_message">Konnt net <xliff:g id="app" example="Calendar">%s</xliff:g> starten.</string>
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_charged">Opgelueden</string>
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_charging">Gëtt opgelueden</string>
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_charging_with_time"><xliff:g id="charging_time" example="2 hrs 25 min">%s</xliff:g> bis den Akku voll ass</string>
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
   <string name="expanded_header_battery_not_charging">Gëtt net opgelueden</string>
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
   <string name="battery_meter_very_low_overlay_symbol">!</string>
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
   <string name="ssl_ca_cert_warning">D\'Netzwierk kéint\n
 iwwerwaacht sinn</string>
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="description_target_search">Sichen</string>
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="description_direction_up">Eropréckele fir ze <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
   <string name="description_direction_left">No lénks réckele fir ze <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
   <string name="keyguard_more_overflow_text">+<xliff:g id="number_of_notifications" example="5">%d</xliff:g></string>
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
   <string name="speed_bump_explanation">Manner dréngend Notifikatiounen drënner</string>
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
   <string name="notification_tap_again">Dréck nees fir opzemaachen</string>
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
   <string name="keyguard_unlock">Eropwësche fir z\'entspären</string>
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
   <string name="keyguard_indication_charging_time">Akku luet (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> bis e voll ass)</string>
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <string name="keyguard_indication_charging_time_fast">Gëtt séier opgelueden (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> bis e voll ass)</string>
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <string name="keyguard_indication_charging_time_slowly">Gëtt lues opgelueden (<xliff:g id="charging_time_left" example="4 hours and 2 minutes">%s</xliff:g> bis e voll ass)</string>
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
   <string name="accessibility_multi_user_switch_switcher">Benotzer wiesselen</string>
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
   <string name="accessibility_multi_user_switch_switcher_with_current">Benotzer wiesselen, aktuelle Benotzer <xliff:g id="current_user_name" example="John Doe">%s</xliff:g></string>
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
   <string name="accessibility_multi_user_switch_quick_contact">Profil uweisen</string>
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
   <string name="user_add_user">Benotzer dobäisetzen</string>
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
   <string name="user_new_user_name">Neie Benotzer</string>
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
   <string name="guest_nickname">Gaascht</string>
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
   <string name="guest_new_guest">Gaascht dobäisetzen</string>
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
   <string name="guest_exit_guest">Gaascht ewechhuelen</string>
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
   <string name="guest_exit_guest_dialog_title">Gaascht ewechhuelen?</string>
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
   <string name="guest_exit_guest_dialog_message">All d\'Appen an Daten an dëser Sëtzung gi geläscht.</string>
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
   <string name="guest_exit_guest_dialog_remove">Ewechhuelen</string>
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
   <string name="guest_wipe_session_title">Wëllkomm zréck, Gaascht!</string>
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
   <string name="guest_wipe_session_message">Wëlls du deng Sëtzung weiderféieren?</string>
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
   <string name="guest_wipe_session_wipe">Vu vir ufänken</string>
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
   <string name="guest_wipe_session_dontwipe">Jo, weidermaachen</string>
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
   <string name="user_add_user_title" msgid="2108112641783146007">Neie Benotzer dobäisetzen?</string>
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
   <string name="user_add_user_message_short" msgid="1511354412249044381">Wann s du en neie Benotzer dobäisetz, muss déi Persoun hiren Espace amenagéieren.\n\nAll Benotzer kann Appe fir all aner Benotzer aktualiséieren.</string>
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
   <string name="battery_saver_notification_title">Den Akkuschouner ass un</string>
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
   <string name="battery_saver_notification_text">Reduzéiert d\'Vitess an d\'Hannergronddaten</string>
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
   <string name="battery_saver_notification_action_text">Akkuschouner ausschalten</string>
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
   <string name="notification_hidden_text">Inhalter verstoppt</string>
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
   <string name="media_projection_dialog_text"><xliff:g id="app_seeking_permission" example="Hangouts">%s</xliff:g> hëlt alles op dat op dengem Schierm ugewise gëtt.</string>
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
   <string name="media_projection_remember_text">Net méi uweisen</string>
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
   <string name="clear_all_notifications_text">Alles eidel maachen</string>
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
   <string name="media_projection_action_text">Elo starten</string>
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
   <string name="empty_shade_text">Keng Notifikatiounen</string>
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
   <string name="device_owned_footer">Den Apparat kéint iwwerwaacht sinn</string>
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
   <string name="profile_owned_footer">De Profil kéint iwwerwaacht sinn</string>
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
   <string name="vpn_footer">D\'Netzwierk kéint iwwerwaacht sinn</string>
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
   <string name="monitoring_title_device_owned">Apparat-Iwwerwaachung</string>
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
   <string name="monitoring_title_profile_owned">Profil-Iwwerwaachung</string>
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
   <string name="monitoring_title">Netzwierk-Iwwerwaachung</string>
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
   <string name="disable_vpn">VPN desaktivéieren</string>
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
   <string name="disconnect_vpn">VPN deconnectéieren</string>
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
   <string name="keyguard_indication_trust_disabled">Den Apparat bleift gespaart, bis e manuell entspaart gëtt</string>
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
   <string name="hidden_notifications_title">Notifikatioune méi séier kréien</string>
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
   <string name="hidden_notifications_text">Virum Entspären uweisen</string>
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
   <string name="hidden_notifications_cancel">Nee Merci</string>
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
   <string name="hidden_notifications_setup">Ariichten</string>
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
   <string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string>
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
   <string name="screen_pinning_title">Schierm ass fixéiert</string>
+  <!-- Screen pinning dialog description. -->
   <string name="screen_pinning_description">Dëst gëtt dir ugewisen, bis du d\'Fixéierung ophiefs. Dréck an hal \"Zréck\" an \"Iwwersiicht\" gläichzäiteg un, fir d\'Fixéierung opzehiewen.</string>
+  <!-- Screen pinning dialog description when in accessibility mode. -->
   <string name="screen_pinning_description_accessible">Dëst gëtt dir ugewisen, bis du d\'Fixéierung ophiefs. Dréck an hal \"Zréck\" an \"Iwwersiicht\" un, fir d\'Fixéierung opzehiewen.</string>
+  <!-- Screen pinning positive response. -->
   <string name="screen_pinning_positive">Verstanen</string>
+  <!-- Screen pinning negative response. -->
   <string name="screen_pinning_negative">Nee Merci</string>
+  <!-- Hide quick settings tile confirmation title -->
   <string name="quick_settings_reset_confirmation_title"><xliff:g id="tile_label" example="Hotspot">%1$s</xliff:g> verstoppen?</string>
+  <!-- Hide quick settings tile confirmation message -->
   <string name="quick_settings_reset_confirmation_message">Dëst gëtt dir d\'nächst Kéier ugewisen, wann s du et an den Astellungen nees aktivéiers.</string>
+  <!-- Hide quick settings tile confirmation button -->
   <string name="quick_settings_reset_confirmation_button">Verstoppen</string>
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
   <string name="status_bar_ethernet">Ethernet</string>
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
   <string name="status_bar_airplane">Fligermodus</string>
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
   <string name="accessibility_status_bar_hotspot">Zougankspunkt</string>
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
   <string name="got_it">Verstanen</string>
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
   <string name="enable_bluetooth_confirmation_ok">Uschalten</string>
 </resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/cm_arrays.xml b/packages/SystemUI/res/values-lo-rLA/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-lo-rLA/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-lo-rLA/cm_strings.xml b/packages/SystemUI/res/values-lo-rLA/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-lo-rLA/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-lt/cm_arrays.xml b/packages/SystemUI/res/values-lt/cm_arrays.xml
index ae2ee65..4dfe58f 100644
--- a/packages/SystemUI/res/values-lt/cm_arrays.xml
+++ b/packages/SystemUI/res/values-lt/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>Š</item>
+    <!-- North -->
     <item>ŠR</item>
+    <!-- North east -->
     <item>R</item>
+    <!-- East -->
     <item>PR</item>
+    <!-- South east -->
     <item>P</item>
+    <!-- South -->
     <item>PV</item>
+    <!-- South west -->
     <item>V</item>
+    <!-- West -->
     <item>ŠV</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-lt/cm_strings.xml b/packages/SystemUI/res/values-lt/cm_strings.xml
index 71a070b..8ace97c 100644
--- a/packages/SystemUI/res/values-lt/cm_strings.xml
+++ b/packages/SystemUI/res/values-lt/cm_strings.xml
@@ -16,12 +16,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Braukite į dešinę, kad %1$s</string>
   <string name="right_shortcut_hint">Braukite į kairę, kad %1$s</string>
   <string name="select_application">Pasirinkti programą</string>
   <string name="lockscreen_choose_action_title">Pasirinkti veiksmą</string>
   <string name="lockscreen_none_target">Joks</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Pasirinkite veiksmą, kad jį priskirtumėte</string>
   <string name="navbar_home_button">Pagrindinis mygtukas</string>
   <string name="navbar_recent_button">„Naujausių“ mygtukas</string>
@@ -33,14 +42,25 @@
   <string name="navbar_menu_big_button">Meniu mygtukas</string>
   <string name="accessibility_dpad_left">Žymeklis kairėje</string>
   <string name="accessibility_dpad_right">Žymeklis dešinėje</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Ištrinti programos duomenis</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Priverstinai sustabdyti</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Pašalinti</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiliai išjungti.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profilis: <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiliai išjungti.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profilis pakeistas į <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicijuojama\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Tai laikys jį matomą iki kol atsegsite. Palieskite ir laikykite mygtuką atgal, kad atsegtumėte.</string>
   <string name="quick_settings_custom_tile_detail_title">Tinkinta plytelė</string>
   <string name="quick_settings_remove">Pašalinti plytelę</string>
@@ -51,9 +71,14 @@
   <string name="quick_settings_profiles_off">Profiliai neleidžiami</string>
   <string name="quick_settings_heads_up_label">Iššokantys pranešimai</string>
   <string name="quick_settings_battery_saver_label">Akumuliatoriaus tausojimas</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sinchronizavimas išjungtas.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sinchronizavimas įjungtas.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sinchronizavimas išjungtas.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sinchronizavimas įjungtas.</string>
   <string name="quick_settings_sync_label">Sinchronizavimas</string>
   <string name="quick_settings_volume_panel_label">Garsumo skydelis</string>
@@ -62,58 +87,102 @@
   <string name="quick_settings_lockscreen_label">Ekrano užraktas</string>
   <string name="quick_settings_ambient_display_label">Ambient display</string>
   <string name="quick_settings_lockscreen_label_enforced">Ekrano užraktas vykdomas</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Ekrano skirtasis laikas: <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Ekrano skirtasis laikas pakeistas į <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
   <string name="qs_tile_performance">Akumuliatoriaus režimas</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Akumuliatoriaus režimas: energijos tausojimo režimas.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Akumuliatoriaus režimas: subalansuotas režimas.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Akumuliatoriaus režimas: našumo režimas.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Akumuliatoriaus režimas: efektyvus režimas.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Akumuliatoriaus rėžimas: spartus režimas.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Akumuliatoriaus režimas pakeistas į energijos tausojimo režimą.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Akumuliatoriaus režimas pakeistas į subalansuotą režimą.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Akumuliatoriaus režimas pakeistas į našumo režimą.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Akumuliatoriaus režimas pakeistas į efektyvų režimą.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Akumuliatoriaus režimas pakeistas į spartų režimą.</string>
   <string name="quick_settings_performance_profile_detail_title">Akumuliatoriaus režimas</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Ekrano užraktas išjungtas.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Ekrano užraktas įjungtas.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Ekrano užraktas išjungtas.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Ekrano užraktas įjungtas.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambient display išjungta.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display įjungta.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display išjungta.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display įjungta.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Iššokantys pranešimai išjungti.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Iššokantys pranešimai įjungti.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Iššokantys pranešimai išjungti.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Iššokantys pranešimai įjungti.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Akumuliatoriaus tausojimas išjungtas.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Akumuliatoriaus tausojimas įjungtas.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Akumuliatoriaus tausojimas išjungtas.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Akumuliatoriaus tausojimas įjungtas.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dinaminė plytelė</string>
   <string name="dynamic_qs_tile_next_alarm_label">Kitas signalas</string>
   <string name="dynamic_qs_tile_ime_selector_label">Įvesties metodas</string>
   <string name="dynamic_qs_tile_su_label">Prieiga prie „Root“</string>
-  <string name="accessibility_quick_settings_live_display_off">„LiveDisplay“ išjungtas.</string>
-  <string name="accessibility_quick_settings_live_display_auto">„LiveDisplay“: automatinis režimas.</string>
-  <string name="accessibility_quick_settings_live_display_day">„LiveDisplay“: dienos režimas.</string>
-  <string name="accessibility_quick_settings_live_display_night">„LiveDisplay“: nakties režimas.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">„LiveDisplay“: lauko režimas.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">„LiveDisplay“ išjungtas.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">„LiveDisplay“ pakeistas į automatinį režimą.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">„LiveDisplay“ pakeistas į dienos režimą.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">„LiveDisplay“ pakeistas į nakties režimą.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">„LiveDisplay“ pakeistas į lauko režimą.</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Vietovės ataskaitos: akumuliatoriaus tausojimo režimas.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Vietovės ataskaitos: tik daviklių režimas.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Vietovės ataskaitos: didelio tikslumo režimas.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Vietovės režimas</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Akumuliatoriaus tausojimas</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Tik įrenginys</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Didelis tikslumas</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Vietovės ataskaitos pakeistos į akumuliatoriaus tausojimo režimą.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Vietovės ataskaitos pakeistos į tik jutiklių režimą.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Vietovės ataskaitos pakeistos į didelio tikslumo režimą.</string>
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Doko akumuliatorius <xliff:g id="number">%d</xliff:g> proc.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Rodyti grojimo eilę</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-lv/cm_arrays.xml b/packages/SystemUI/res/values-lv/cm_arrays.xml
index 3c12c9e..55d53d7 100644
--- a/packages/SystemUI/res/values-lv/cm_arrays.xml
+++ b/packages/SystemUI/res/values-lv/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>Z</item>
+    <!-- North -->
     <item>ZA</item>
+    <!-- North east -->
     <item>A</item>
+    <!-- East -->
     <item>DA</item>
+    <!-- South east -->
     <item>D</item>
+    <!-- South -->
     <item>DR</item>
+    <!-- South west -->
     <item>R</item>
+    <!-- West -->
     <item>ZR</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-lv/cm_strings.xml b/packages/SystemUI/res/values-lv/cm_strings.xml
index 8f15420..be09e24 100644
--- a/packages/SystemUI/res/values-lv/cm_strings.xml
+++ b/packages/SystemUI/res/values-lv/cm_strings.xml
@@ -16,6 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Izvēlieties darbību, ko piešķirt</string>
   <string name="navbar_home_button">Mājas poga</string>
   <string name="navbar_recent_button">Nesenā poga</string>
@@ -26,8 +35,76 @@
   <string name="navbar_menu_big_button">Izvēlnes poga</string>
   <string name="accessibility_dpad_left">Kursoru pa kreisi</string>
   <string name="accessibility_dpad_right">Kursoru pa labi</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Nodzēst lietotnes datus</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Piespiedu apturēšana</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Noņemt</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_compass_init">Inicializē\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-mk-rMK/cm_arrays.xml b/packages/SystemUI/res/values-mk-rMK/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-mk-rMK/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-mk-rMK/cm_strings.xml b/packages/SystemUI/res/values-mk-rMK/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-mk-rMK/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-ml-rIN/cm_arrays.xml b/packages/SystemUI/res/values-ml-rIN/cm_arrays.xml
new file mode 100644
index 0000000..3110756
--- /dev/null
+++ b/packages/SystemUI/res/values-ml-rIN/cm_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>N</item>
+    <!-- North -->
+    <item>NE</item>
+    <!-- North east -->
+    <item>E</item>
+    <!-- East -->
+    <item>SE</item>
+    <!-- South east -->
+    <item>S</item>
+    <!-- South -->
+    <item>SW</item>
+    <!-- South west -->
+    <item>W</item>
+    <!-- West -->
+    <item>NW</item>
+    <!-- North west -->
+  </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-ml-rIN/cm_strings.xml b/packages/SystemUI/res/values-ml-rIN/cm_strings.xml
new file mode 100644
index 0000000..c97efdb
--- /dev/null
+++ b/packages/SystemUI/res/values-ml-rIN/cm_strings.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">%1$s ന് വേണ്ടി വലത്തേക്ക് സ്വൈപ്പ് ചെയ്യുക</string>
+  <string name="right_shortcut_hint">%1$s ന് വേണ്ടി ഇടത്തേക്ക് സ്വൈപ്പ് ചെയ്യുക</string>
+  <string name="lockscreen_message">ഒരു ലോക്ക് സ്ക്രീന്‍ ഷോര്‍ട്ട്കട്ട് വീണ്ടും നിയോഗിക്കുന്നതിന് ഇടത് അല്ലെങ്കില്‍ വലത്തുള്ള ഒരു ഐക്കണ്‍ ക്ലിക്ക് ചെയ്യുക.</string>
+  <string name="lockscreen_default_target">സ്ഥിരമായത്</string>
+  <string name="select_application">അപ്ലിക്കേഷൻ തിരഞ്ഞെടുക്കുക</string>
+  <string name="lockscreen_choose_action_title">നടപടി തിരഞ്ഞെടുക്കുക</string>
+  <string name="lockscreen_none_target">ആരിൽ നിന്നും വേണ്ട</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">നിയോഗിക്കുന്നതിനായി പ്രവർത്തനം തിരഞ്ഞെടുക്കുക</string>
+  <string name="navbar_home_button">ഹോം ബട്ടൺ</string>
+  <string name="navbar_recent_button">സമീപകാലത്തുള്ളവ ബട്ടൺ</string>
+  <string name="navbar_search_button">തിരയൽ ബട്ടൺ</string>
+  <string name="navbar_back_button">പിന്നിലേക്ക് ബട്ടൺ</string>
+  <string name="navbar_empty_button">ശൂന്യ ബട്ടൺ</string>
+  <string name="navbar_menu_conditional_button">മെനു (ആട്ടോഹൈഡ്) ബട്ടൺ</string>
+  <string name="navbar_menu_always_button">മെനു (എല്ലായ്പ്പോഴും കാണിക്കുക) ബട്ടൺ</string>
+  <string name="navbar_menu_big_button">മെനു ബട്ടൺ</string>
+  <string name="accessibility_dpad_left">കർസർ ഇടത്</string>
+  <string name="accessibility_dpad_right">കർസർ വലത്</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">ആപ്ലിക്കേഷൻ ഡാറ്റ മായ്ക്കുക</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">നിർബന്ധിതമായി നിർത്തുക</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">അണ്‍ഇസ്റ്റാളുചെയ്യുക</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">ലൈറ്റ് തെളിച്ചം</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">പ്രൊഫൈലുകൾ ഓഫ്.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">പ്രൊഫൈൽ: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">പ്രൊഫൈലുകൾ ഓഫ് ചെയ്തു.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">പ്രൊഫൈൽ <xliff:g id="profile" example="Default">%s</xliff:g> ലേക്ക് മാറ്റി.</string>
+  <string name="quick_settings_compass_init">ആരംഭിക്കുന്നു\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">പ്രകാശ ക്രമീകരണങ്ങള്‍</string>
+  <string name="led_notification_text">ക്രമീകരണങ്ങളിലൂടെ LED വെളിച്ചം പ്രാപ്തമാക്കി</string>
+  <string name="qs_tile_edit_header_instruction">പുനഃക്രമീകരിക്കുന്നതിന് ടൈലുകൾ ആമര്‍ത്തിപ്പിടിക്കുക</string>
+  <string name="quick_settings_edit_label">ടൈലുകൾ ചിട്ടപ്പെടുത്തുക</string>
+  <string name="quick_settings_cannot_delete_edit_tile">ചിട്ടപ്പെടുത്തുക ടൈൽ ഇല്ലാതാക്കാൻ കഴിയില്ല</string>
+  <string name="qs_tiles_reset_confirmation">ദ്രുത ക്രമീകരണ ടൈലുകള്‍ ഡിഫോള്‍ട്ട് കോൺഫിഗറേഷനിലേക്ക് പുനഃസജ്ജമാക്കണോ?</string>
+  <string name="quick_settings_tile_reset_to_default">ഡിഫോള്‍ട്ട്  ലേഔട്ടിലേക്ക് പുനഃസജ്ജമാക്കണോ?</string>
+  <string name="quick_settings_title_header">ശീർഷകം</string>
+  <string name="quick_settings_title_tiles">ടൈലുകൾ</string>
+  <string name="quick_settings_title_show_weather">കാലാവസ്ഥ ദൃശ്യമാക്കുക</string>
+  <string name="quick_settings_title_show_brightness_slider">തെളിച്ചം സ്ലൈഡർ ദൃശ്യമാക്കുക</string>
+  <string name="quick_settings_title_enlarge_first_row">ആദ്യ വരി വലുതാക്കുക</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">നിങ്ങൾ അൺപിന്‍ ചെയ്യുന്നതുവരെ ഇത് ഇതിനെ കാഴ്ചയില്‍ നിലനിർത്തുന്നു. അൺപിന്‍ ചെയ്യുന്നതിന് പിന്നിലേക്ക് ബട്ടൺ
+അമര്‍ത്തിപ്പിടിക്കുക.</string>
+  <string name="quick_settings_custom_tile_detail_title">ഇഷ്ടാനുസൃത ടൈൽ</string>
+  <string name="quick_settings_remove">ടൈൽ നീക്കം ചെയ്യുക</string>
+  <string name="quick_settings_network_adb_label">നെറ്റ്‌വർക്കിൽ ADB</string>
+  <string name="quick_settings_compass_label">കോമ്പസ്</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">സിസ്റ്റം പ്രൊഫൈലുകൾ</string>
+  <string name="quick_settings_profiles_off">പ്രൊഫൈലുകൾ അപ്രാപ്തമാണ്</string>
+  <string name="quick_settings_heads_up_label">മുന്നറിയിപ്പ്</string>
+  <string name="quick_settings_battery_saver_label">ബാറ്ററി സേവർ</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">കഫീൻ</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">പൊരുത്തപ്പെടൽ ഓഫ്.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">പൊരുത്തപ്പെടൽ ഓണ്‍.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">പൊരുത്തപ്പെടൽ ഓഫ് ചെയ്തു.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">പൊരുത്തപ്പെടൽ ഓണ്‍ ചെയ്തു.</string>
+  <string name="quick_settings_sync_label">സമന്വയിപ്പിക്കുക</string>
+  <string name="quick_settings_volume_panel_label">വോളിയം പാനൽ</string>
+  <string name="quick_settings_usb_tether_label">USB ടെതറിംഗ്</string>
+  <string name="quick_settings_screen_timeout_detail_title">സ്ക്രീൻ സമയപരിധി</string>
+  <string name="quick_settings_lockscreen_label">ലോക്ക് സ്‌ക്രീൻ</string>
+  <string name="quick_settings_ambient_display_label">ആമ്പിയന്റ് ഡിസ്‌പ്ലേ</string>
+  <string name="quick_settings_lockscreen_label_enforced">ലോക്ക് സ്ക്രീൻ നടപ്പിലാക്കി</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">പ്രൊഫൈൽ പ്രവർത്തനരഹിതമാക്കി</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">സ്ക്രീൻ ടൈംഔട്ട്: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">സ്ക്രീൻ ടൈംഔട്ട് <xliff:g id="timeout" example="30 seconds">%s</xliff:g> ലേക്ക് മാറ്റി.</string>
+  <string name="qs_tile_performance">ബാറ്ററി മോഡ്</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">ബാറ്ററി മോഡ്: പവർ ലാഭിക്കല്‍ മോഡ്.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">ബാറ്ററി മോഡ്: സന്തുലിത മോഡ്.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">ബാറ്ററി മോഡ്: പ്രകടന മോഡ്.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">ബാറ്ററി മോഡ്: കാര്യക്ഷമതാ മോഡ്.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">ബാറ്ററി മോഡ്: അതിവേഗ മോഡ്.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">ബാറ്ററി മോഡ് പവർ ലാഭിക്കല്‍ മോഡിലേക്ക് മാറ്റി.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">ബാറ്ററി മോഡ് സന്തുലിത മോഡിലേക്ക് മാറ്റി.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">ബാറ്ററി മോഡ് പ്രകടന മോഡിലേക്ക് മാറ്റി.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">ബാറ്ററി മോഡ് കാര്യക്ഷമതാ മോഡിലേക്ക് മാറ്റി.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">ബാറ്ററി മോഡ് അതിവേഗ മോഡിലേക്ക് മാറ്റി.</string>
+  <string name="quick_settings_performance_profile_detail_title">ബാറ്ററി മോഡ്</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">ലോക്ക് സ്ക്രീന്‍ ഓഫ്.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">ലോക്ക് സ്ക്രീന്‍ ഓണ്‍.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">ലോക്ക് സ്ക്രീൻ ഓഫ് ചെയ്തു.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">ലോക്ക് സ്ക്രീൻ ഓണ്‍ ചെയ്തു.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">ആമ്പിയൻറ് പ്രദര്‍ശനം ഓഫ്.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">ആമ്പിയൻറ് പ്രദര്‍ശനം ഓണ്‍.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">ആമ്പിയന്റ് പ്രദര്‍ശനം ഓഫ് ചെയ്തു.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">ആമ്പിയന്റ് പ്രദര്‍ശനം ഓണ്‍ ചെയ്തു.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">ഹെഡ്സ് അപ്പ് ഓഫ്.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">ഹെഡ്സ് അപ്പ് ഓണ്‍.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">ഹെഡ്സ് അപ്പ് ഓഫ് ചെയ്തു.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">ഹെഡ്സ് അപ്പ് ഓണ്‍ ചെയ്തു.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">കഫീൻ ഓഫ്‌.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">കഫീൻ ഓണ്‍.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">ഓഫ് സേവർ ഓഫ്.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">ഓഫ് സേവർ ഓണ്‍.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">ബാറ്ററി സേവർ ഓഫ് ചെയ്തു.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">ബാറ്ററി സേവർ ഓണ്‍ ചെയ്തു.</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">ഡൈനാമിക്ക് ടൈൽ</string>
+  <string name="dynamic_qs_tile_next_alarm_label">അടുത്ത അലാറം</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME സെലക്ടർ</string>
+  <string name="dynamic_qs_tile_su_label">റൂട്ട് പ്രവേശനം</string>
+  <string name="quick_settings_title_advanced_location">ട്രൈ-സ്റ്റേറ്റ് സ്ഥാനം</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">സ്ഥാനം റിപ്പോർട്ടിംഗ്: ബാറ്ററി ലാഭിക്കല്‍ മോഡ്.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">സ്ഥാനം റിപ്പോർട്ടിംഗ്: സെൻസറുകൾ മാത്രമുള്ള മോഡ്.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">സ്ഥാനം റിപ്പോർട്ടിംഗ്: ഉയർന്ന കൃത്യതാ മോഡ്.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">ലൊക്കേഷൻ മോഡ്</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">ബാറ്ററി ലാഭിക്കൽ</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">ഉപകരണം മാത്രം</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">ഉയർന്ന കൃത്യത</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">സ്ഥാനം റിപ്പോർട്ടിംഗ്: ബാറ്ററി ലാഭിക്കുന്ന മോഡിലേക്ക് മാറ്റി.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">സ്ഥാനം റിപ്പോർട്ടിംഗ് സെൻസറുകൾ മാത്രമുള്ള മോഡിലേക്ക് മാറ്റി.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">സ്ഥാനം റിപ്പോർട്ടിംഗ് ഉയർന്ന കൃത്യതാ മോഡിലേക്ക് മാറ്റി.</string>
+  <string name="quick_settings_tiles_category_system">സിസ്റ്റം ടൈലുകൾ</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">ഒരു ടൈൽ ചേർക്കുക</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">എയര്‍പ്ലെയിന്‍ മോഡ് പ്രാപ്തമായിരിക്കുമ്പോള്‍ മൊബൈൽ നെറ്റ്‌വർക്കുകളിലേക്ക് ബന്ധിപ്പിക്കാൻ കഴിയില്ല. എയര്‍പ്ലെയിന്‍ മോഡ് അപ്രാപ്തമാക്കി വീണ്ടും ശ്രമിക്കുക.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ടോർച്ച് ഓൺ ആണ്</string>
+  <string name="quick_settings_tile_flashlight_not_summary">ഓഫാക്കാൻ ടാപ്പുചെയ്യുക</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d കക്ഷി</item>
+    <item quantity="other">%1$d കക്ഷികള്‍</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">ഡോക്ക് ബാറ്ററി <xliff:g id="number">%d</xliff:g> ശതമാനം.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">പ്ലേ ക്യൂ ദൃശ്യമാക്കുക</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-mn-rMN/cm_arrays.xml b/packages/SystemUI/res/values-mn-rMN/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-mn-rMN/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-mn-rMN/cm_strings.xml b/packages/SystemUI/res/values-mn-rMN/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-mn-rMN/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-mr-rIN/cm_arrays.xml b/packages/SystemUI/res/values-mr-rIN/cm_arrays.xml
new file mode 100644
index 0000000..198ac30
--- /dev/null
+++ b/packages/SystemUI/res/values-mr-rIN/cm_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>N</item>
+    <!-- North -->
+    <item>NE</item>
+    <!-- North east -->
+    <item>E</item>
+    <!-- East -->
+    <item>SE</item>
+    <!-- South east -->
+    <item>S</item>
+    <!-- South -->
+    <item>SW</item>
+    <!-- South west -->
+    <item>W</item>
+    <!-- West -->
+    <item>NW </item>
+    <!-- North west -->
+  </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-mr-rIN/cm_strings.xml b/packages/SystemUI/res/values-mr-rIN/cm_strings.xml
new file mode 100644
index 0000000..b2ff8aa
--- /dev/null
+++ b/packages/SystemUI/res/values-mr-rIN/cm_strings.xml
@@ -0,0 +1,220 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">%1$s साठी उजवीकडे स्वाईप करा</string>
+  <string name="right_shortcut_hint">%1$s साठी डावीकडे स्वाईप करा</string>
+  <string name="lockscreen_message">लॉक स्क्रीन शॉर्टकट पुन्हा नेमण्यासाठी डावीकडील किंवा उजवीकडील प्रतीक टॅप करा.</string>
+  <string name="lockscreen_default_target">डीफॉल्ट</string>
+  <string name="select_application">अनुप्रयोग निवडा</string>
+  <string name="lockscreen_choose_action_title">क्रिया निवडा</string>
+  <string name="lockscreen_none_target">काहीही नाही</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">नेमण्यासाठी क्रिया निवडा</string>
+  <string name="navbar_home_button">होम बटण</string>
+  <string name="navbar_recent_button">अलीकडील बटण</string>
+  <string name="navbar_search_button">शोध बटण</string>
+  <string name="navbar_back_button">मागे बटण</string>
+  <string name="navbar_empty_button">रिक्त बटण</string>
+  <string name="navbar_menu_conditional_button">मेनू (ऑटो लपवा) बटण</string>
+  <string name="navbar_menu_always_button">मेनू (नेहमी दर्शवा) बटण</string>
+  <string name="navbar_menu_big_button">मेनू बटण</string>
+  <string name="accessibility_dpad_left">कर्सर डावा</string>
+  <string name="accessibility_dpad_right">कर्सर उजवा</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">अनुप्रयोग डेटा पुसा</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">सक्तीने थांबवा</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">विस्थापित करा</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">प्रकाश प्रखरता</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">प्रोफाइल्स बंद.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">प्रोफाइल: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">प्रोफाइल्स बंद केला.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">प्रोफाइल <xliff:g id="profile" example="Default">%s</xliff:g>ला बदलला.</string>
+  <string name="quick_settings_compass_init">प्रारंभ करत आहे…</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">प्रकाश सेटिंग्ज</string>
+  <string name="led_notification_text">सेटिंग्जद्वारे LED प्रकाश सक्षम केला</string>
+  <string name="qs_tile_edit_header_instruction">पुनर्मांडणी करण्यासाठी टाईल्स दाबून धरा</string>
+  <string name="quick_settings_edit_label">टाईल्स संपादित करा</string>
+  <string name="quick_settings_cannot_delete_edit_tile">संपादित टाईल हटवू शकत नाही</string>
+  <string name="qs_tiles_reset_confirmation">जलद सेटिंग्ज टाईल्स डिफॉल्ट कॉन्फिगरेशनला रीसेट करायच्या?</string>
+  <string name="quick_settings_tile_reset_to_default">डिफॉल्ट मांडणीला रीसेट करा</string>
+  <string name="quick_settings_title_header">हेडर</string>
+  <string name="quick_settings_title_tiles">टाईल्स</string>
+  <string name="quick_settings_title_show_weather">हवामान दर्शवा</string>
+  <string name="quick_settings_title_show_brightness_slider">चकाकी स्लाईडर दर्शवा</string>
+  <string name="quick_settings_title_enlarge_first_row">पहिली ओळ मोठी करा</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">हे तुम्ही अनपिन करेपर्यंत व्ह्यूमध्ये राहते. अनपिन करण्यासाठी मागे बटणास स्पर्श करून ठेवा.</string>
+  <string name="quick_settings_custom_tile_detail_title">सानुकूल टाईल</string>
+  <string name="quick_settings_remove">टाईल काढा</string>
+  <string name="quick_settings_network_adb_label">नेटवर्कवर ADB</string>
+  <string name="quick_settings_compass_label">कंपास</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">सिस्टिम प्रोफाइल्स</string>
+  <string name="quick_settings_profiles_off">प्रोफाइल्स अक्षम केले</string>
+  <string name="quick_settings_heads_up_label">हेड्स अप</string>
+  <string name="quick_settings_battery_saver_label">बॅटरी सेव्हर</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">कॅफीन</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">सिंक बंद.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">सिंक चालू.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">सिंक बंद केले.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">सिंक चालू केले.</string>
+  <string name="quick_settings_sync_label">संकालन करा</string>
+  <string name="quick_settings_volume_panel_label">ध्वनी पॅनेल</string>
+  <string name="quick_settings_usb_tether_label">USB टेदरिंग</string>
+  <string name="quick_settings_screen_timeout_detail_title">स्क्रीन वेळ संपला</string>
+  <string name="quick_settings_lockscreen_label">लॉक स्‍क्रीन</string>
+  <string name="quick_settings_ambient_display_label">अँबियन्ट प्रदर्शन</string>
+  <string name="quick_settings_lockscreen_label_enforced">लॉक स्क्रीनची अंमलबजावणी केली</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">प्रोफाइल कडून अक्षम</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">स्क्रीन वेळ संपला: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">स्क्रीन वेळ संपला <xliff:g id="timeout" example="30 seconds">%s</xliff:g>ला बदलले.</string>
+  <string name="qs_tile_performance">बॅटरी मोड</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">बॅटरी मोड: पॉवर बचत मोड.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">बॅटरी मोड: बॅलन्स्ड मोड.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">बॅटरी मोड: परफॉर्मन्स मोड.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">बॅटरी मोड: क्षमता मोड.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">बॅटरी मोड: जलद मोड.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">बॅटरी मोड पॉवर बचत मोडला बदलले.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">बॅटरी मोड बॅलन्स्ड मोडला बदलले.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">बॅटरी मोड परफॉर्मन्स मोडला बदलले.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">बॅटरी मोड क्षमता मोडला बदलले.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">बॅटरी मोड जलद मोडला बदलले.</string>
+  <string name="quick_settings_performance_profile_detail_title">बॅटरी मोड</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">लॉक स्क्रीन बंद.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">लॉक स्क्रीन चालू.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">लॉक स्क्रीन बंद केला.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">लॉक स्क्रीन चालू केला.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">आसपासचे प्रदर्शन बंद.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">आसपासचे प्रदर्शन चालू.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">आसपासचे प्रदर्शन बंद केले.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">आसपासचे प्रदर्शन चालू केले.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">हेड्स अप बंद.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">हेड्स अप चालू.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">हेड्स अप बंद केले.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">हेड्स अप चालू केले.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">कॅफीन बंद.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">कॅफिन चालू.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">बॅटरी बचतकर्ता बंद.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">बॅटरी बचतकर्ता चालू.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">बॅटरी बचतकर्ता बंद केले.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">बॅटरी बचतकर्ता चालू केले.</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">गतीशील टाईल</string>
+  <string name="dynamic_qs_tile_next_alarm_label">पुढील अलार्म</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME निवडक</string>
+  <string name="dynamic_qs_tile_su_label">रूट ऍक्सेस</string>
+  <string name="quick_settings_title_advanced_location">तिरंगी-राज्य स्थान</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">स्थान अहवाल देणे: बॅटरी बचत मोड.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">स्थान अहवाल देणे: केवळ सेन्सर्स मोड.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">स्थान अहवाल देणे: उच्च अचूकता मोड.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">स्थान मोड</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">बॅटरी बचत</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">केवळ डिव्हाइस</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">उच्च अचूकता</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">स्थान अहवाल देणे बॅटरी बचत मोडला बदलले.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">स्थान अहवाल देणे केवळ सेन्सर्स मोडला बदलले.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">स्थान अहवाल देणे उच्च अचूकता मोडला बदलले.</string>
+  <string name="quick_settings_tiles_category_system">सिस्टिम टाईल्स</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">टाईल जोडा</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">विमान मोड सक्षम केलेला असताना मोबाईल नेटवर्क्ससह कनेक्ट करण्यात अक्षम. विमान मोड अक्षम करा आणि पुन्हा प्रयत्न करा.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">फ्लॅशलाइट चालु आहे</string>
+  <string name="quick_settings_tile_flashlight_not_summary">बंद करण्यासाठी टॅप करा</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d client</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">डेटा सिम नाही</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">डॉक बॅटरी <xliff:g id="number">%d</xliff:g> टक्के.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">प्ले रांग दर्शवा</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-ms-rMY/cm_arrays.xml b/packages/SystemUI/res/values-ms-rMY/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-ms-rMY/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-ms-rMY/cm_strings.xml b/packages/SystemUI/res/values-ms-rMY/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-ms-rMY/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-my-rMM/cm_arrays.xml b/packages/SystemUI/res/values-my-rMM/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-my-rMM/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-my-rMM/cm_strings.xml b/packages/SystemUI/res/values-my-rMM/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-my-rMM/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-nb/cm_arrays.xml b/packages/SystemUI/res/values-nb/cm_arrays.xml
index 9763e17..1d89f10 100644
--- a/packages/SystemUI/res/values-nb/cm_arrays.xml
+++ b/packages/SystemUI/res/values-nb/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NØ</item>
+    <!-- North east -->
     <item>Ø</item>
+    <!-- East -->
     <item>SØ</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SV</item>
+    <!-- South west -->
     <item>V</item>
+    <!-- West -->
     <item>NV</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-nb/cm_strings.xml b/packages/SystemUI/res/values-nb/cm_strings.xml
index 9086450..ebef919 100644
--- a/packages/SystemUI/res/values-nb/cm_strings.xml
+++ b/packages/SystemUI/res/values-nb/cm_strings.xml
@@ -16,16 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Sveip til høyre for %1$s</string>
   <string name="right_shortcut_hint">Sveip til venstre for %1$s</string>
-  <string name="lockscreen_message">Trykk på ikonet på venstre eller høyre for å tilordne en låseskjermsnarvei.</string>
+  <string name="lockscreen_message">Trykk på ikonet til venstre eller høyre for å tilordne en låseskjermsnarvei.</string>
   <string name="lockscreen_default_target">Standard</string>
   <string name="select_application">Velg applikasjon</string>
   <string name="lockscreen_choose_action_title">Velg handling</string>
   <string name="lockscreen_none_target">Ingen</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Velg handlingen du vil tilordne</string>
   <string name="navbar_home_button">Hjem-knappen</string>
   <string name="navbar_recent_button">Siste knappen</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Meny-knappen</string>
   <string name="accessibility_dpad_left">Markør til venstre</string>
   <string name="accessibility_dpad_right">Markør til høyre</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Slett appdata</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Tving avslutning</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Avinstaller</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Lys lysstyrke</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiler av.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s </xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiler deaktivert.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil endret til <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Initialiserer\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Lys innstillinger</string>
   <string name="led_notification_text">LED lyset aktiveres av innstillingene</string>
   <string name="qs_tile_edit_header_instruction">Trykk og hold fliser for å omorganisere</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Vis været</string>
   <string name="quick_settings_title_show_brightness_slider">Vis lysstyrkeendrer</string>
   <string name="quick_settings_title_enlarge_first_row">Forstørr første rad</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Dette holder den i syne inntill du løsner den. Trykk og hold på tilbake knappen for å løsne.</string>
   <string name="quick_settings_custom_tile_detail_title">Egendefinerte fliser</string>
   <string name="quick_settings_remove">Fjern flis</string>
@@ -68,9 +88,16 @@
   <string name="quick_settings_profiles_off">Profiler deaktivert</string>
   <string name="quick_settings_heads_up_label">Flytende notifikasjoner</string>
   <string name="quick_settings_battery_saver_label">Batterisparing</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Batterisparing (lading)</string>
+  <string name="quick_settings_caffeine_label">Koffein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synkronisering av.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synkronisering på.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synkronisering avskrudd.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synkronisering aktivert.</string>
   <string name="quick_settings_sync_label">Synkronisering</string>
   <string name="quick_settings_volume_panel_label">Volumpanel</string>
@@ -79,61 +106,121 @@
   <string name="quick_settings_lockscreen_label">Låseskjerm</string>
   <string name="quick_settings_ambient_display_label">Ambient skjerm</string>
   <string name="quick_settings_lockscreen_label_enforced">Låseskjerm er påkrevd</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Deaktivert av profil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Skjerm tidsavbrudd: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Skjermens tidsavbrudd endret til <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Batterimodus</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Batterimodus: strømsparing.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Batterimodus: balansert.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Batterimodus: ytelse.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Batterimodus: effektivitet modus.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Batterimodus: hurtigmodus.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Batterimodus er endret til strømsparingsmodus.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Batterimodus er endret til balansert modus.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Batterimodus er endret til ytelsesmodus.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Batterimodus endret til effektivitet modus.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Batterimodus endret til hurtigmodus.</string>
   <string name="quick_settings_performance_profile_detail_title">Batterimodus</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Låseskjerm av.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Låseskjerm på.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Låseskjerm slått av.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Låseskjerm slått på.</string>
-  <string name="accessibility_quick_settings_ambient_display_off">Ambient visning av.</string>
-  <string name="accessibility_quick_settings_ambient_display_on">Ambient visning på.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient visning er skrudd av.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient visning er skrudd på.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">Ambient skjerm av.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">Ambient skjerm på.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient skjerm er skrudd av.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient skjerm er skrudd på.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Heads up notifikasjoner er av.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Heads up notifikasjoner er på.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up ble deaktivert.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Heads-up ble aktivert.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Koffein av.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Koffein på.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Batterisparing av.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Batterisparing på.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Batterisparing slått av.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Batterisparing slått på.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamisk flis</string>
   <string name="dynamic_qs_tile_next_alarm_label">Neste alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME-velger</string>
   <string name="dynamic_qs_tile_su_label">Root-tilgang</string>
-  <string name="accessibility_quick_settings_live_display_off">Direkteskjerm av.</string>
-  <string name="accessibility_quick_settings_live_display_auto">Direkteskjerm: automatisk.</string>
-  <string name="accessibility_quick_settings_live_display_day">Direkteskjerm: dagsmodus.</string>
-  <string name="accessibility_quick_settings_live_display_night">Direkteskjerm: nattmodus.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">Direkteskjerm: utendørs.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">Direkteskjerm deaktivert.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">Direkteskjerm endret til automatisk.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">Direkteskjerm endret til dagsmodus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">Direkteskjerm endret til nattmodus.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">Direkteskjerm endret til utendørs.</string>
+  <string name="dynamic_qs_tile_themes_label">Temaer</string>
   <string name="quick_settings_title_advanced_location">Tre nivåer stedsangivelse</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Lokasjonsmodus: strømsparemodus.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Lokasjonsmodus: kun sensorer.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Lokasjonsmodus: høy nøyaktighet.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Lokasjonsmodus</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Batterisparing</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Kun enhet</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Høy nøyaktighet</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Lokasjonsmodus endret til batterisparing.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Lokasjonsmodus endret til bare sensorer.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Lokasjonsmodus endret til høy nøyaktighet.</string>
-  <string name="quick_settings_tiles_category_system">Systemet fliser</string>
+  <string name="quick_settings_tiles_category_system">Systemfliser</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Legge til en flis</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Kan ikke koble til mobile nettverk mens Flymodus er aktivert. Deaktivere flymodus og prøv igjen.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Lommelykt er på</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Trykk for å slå av</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klient</item>
+    <item quantity="other">%1$d klienter</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Ingen data SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dokkingstasjonens batteri <xliff:g id="number"> %d</xliff:g> prosent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Vis avspillingskø</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Sveip ned for å utvide</string>
+  <string name="swipe_left_hint">Sveip til høyre for å <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Sveip til høyre for å se varsler</string>
 </resources>
diff --git a/packages/SystemUI/res/values-ne-rNP/cm_arrays.xml b/packages/SystemUI/res/values-ne-rNP/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-ne-rNP/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-ne-rNP/cm_strings.xml b/packages/SystemUI/res/values-ne-rNP/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-ne-rNP/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-nl/cm_arrays.xml b/packages/SystemUI/res/values-nl/cm_arrays.xml
index 823d481..81ca7d2 100644
--- a/packages/SystemUI/res/values-nl/cm_arrays.xml
+++ b/packages/SystemUI/res/values-nl/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NO</item>
+    <!-- North east -->
     <item>O</item>
+    <!-- East -->
     <item>ZO</item>
+    <!-- South east -->
     <item>Z</item>
+    <!-- South -->
     <item>ZW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-nl/cm_strings.xml b/packages/SystemUI/res/values-nl/cm_strings.xml
index 0305871..ac6ec80 100644
--- a/packages/SystemUI/res/values-nl/cm_strings.xml
+++ b/packages/SystemUI/res/values-nl/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Veeg naar rechts voor %1$s</string>
   <string name="right_shortcut_hint">Veeg naar links voor %1$s</string>
   <string name="lockscreen_message">Tik links of rechts op een pictogram om de snelkoppeling opnieuw toe te wijzen.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">App selecteren</string>
   <string name="lockscreen_choose_action_title">Actie selecteren</string>
   <string name="lockscreen_none_target">Geen</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Kies de toe te wijzen functie</string>
   <string name="navbar_home_button">Thuisknop</string>
   <string name="navbar_recent_button">Recentknop</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Menuknop</string>
   <string name="accessibility_dpad_left">Cursor links</string>
   <string name="accessibility_dpad_right">Cursor rechts</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">App-gegevens wissen</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Nu stoppen</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Verwijderen</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Verlichtingshelderheid</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profielen uit.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profiel: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profielen uitgeschakeld.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profiel gewijzigd naar <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Initialiseren\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Verlichtingsinstellingen</string>
   <string name="led_notification_text">LED-verlichting ingeschakeld door instellingen</string>
   <string name="qs_tile_edit_header_instruction">Tegels ingedrukt houden om te verplaatsen</string>
@@ -55,9 +74,10 @@
   <string name="quick_settings_tile_reset_to_default">Standaardindeling herstellen</string>
   <string name="quick_settings_title_header">Koptekst</string>
   <string name="quick_settings_title_tiles">Tegels</string>
-  <string name="quick_settings_title_show_weather">Weer weergeven</string>
+  <string name="quick_settings_title_show_weather">Weer tonen</string>
   <string name="quick_settings_title_show_brightness_slider">Schuifregelaar helderheid</string>
   <string name="quick_settings_title_enlarge_first_row">Eerst rij vergroten</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Met scherm vastzetten wordt het beeldscherm vergrendeld op één weergave.\n\nBlijf de Terug-knop aanraken om het scherm los te maken.</string>
   <string name="quick_settings_custom_tile_detail_title">Aangepaste tegel</string>
   <string name="quick_settings_remove">Tegel verwijderen</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profielen uitgeschakeld</string>
   <string name="quick_settings_heads_up_label">Heads-up</string>
   <string name="quick_settings_battery_saver_label">Accubesparing</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Accubesparing (opladen)</string>
   <string name="quick_settings_caffeine_label">Cafeïne</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synchr. uit.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synchr. aan.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synchr. uitgeschakeld.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synchr. ingeschakeld.</string>
   <string name="quick_settings_sync_label">Synchroniseren</string>
   <string name="quick_settings_volume_panel_label">Volumepaneel</string>
@@ -81,66 +107,120 @@
   <string name="quick_settings_ambient_display_label">Omgevingsdisplay</string>
   <string name="quick_settings_lockscreen_label_enforced">Schermbeveiliging activeren</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Uitgeschakeld door profiel</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Schermtime-out: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Schermtime-out gewijzigd naar <xliff:g id="timeout" example="30 seconds">%s </xliff:g>.</string>
   <string name="qs_tile_performance">Accumodus</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Accumodus: energiebesparing.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Accumodus: gebalanceerd.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Accumodus: prestaties.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Accumodus: efficiënt.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Accumodus: snel.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Accumodus: gewijzigd naar energiebesparing.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Accumodus: gewijzigd naar gebalanceerd.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Accumodus: gewijzigd naar prestaties.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Accumodus: gewijzigd naar efficiënt.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Accumodus: gewijzigd naar snel.</string>
   <string name="quick_settings_performance_profile_detail_title">Accumodus</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Schermvergrendeling uit.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Schermvergrendeling aan.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Schermvergrendeling uitgeschakeld.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Schermvergrendeling ingeschakeld.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Omgevingsdisplay uit.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Omgevingsdisplay aan.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Omgevingsdisplay uitgeschakeld.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Omgevingsdisplay ingeschakeld.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Heads-up uit.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Heads-up aan.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads-up uitgeschakeld.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Heads-up ingeschakeld.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Cafeïne uit.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Cafeïne aan.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Accubesparing uit.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Accubesparing aan.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Accubesparing uitgeschakeld.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Accubesparing ingeschakeld.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamische tegel</string>
   <string name="dynamic_qs_tile_next_alarm_label">Volgend alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Invoermethode</string>
   <string name="dynamic_qs_tile_su_label">Root-toegang</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay uit.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automatisch.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: dagstand.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: nachtstand.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: buitenstand.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay uitgeschakeld.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay gewijzigd naar automatisch.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay gewijzigd naar dagstand.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay gewijzigd naar nachtstand.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay gewijzigd naar buitenstand.</string>
+  <string name="dynamic_qs_tile_themes_label">Thema\'s</string>
   <string name="quick_settings_title_advanced_location">Locatie met 3 standen</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Locatiemelding: accubesparing.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Locatiemelding: alleen apparaat.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Locatiemelding: grote nauwkeurigheid.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Locatiemodus</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Accubesparing</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Alleen apparaat</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Grote nauwkeurigheid</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Locatiemelding gewijzigd naar accubesparing.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Locatiemelding gewijzigd naar alleen apparaat.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Locatiemelding gewijzigd naar grote nauwkeurigheid.</string>
   <string name="quick_settings_tiles_category_system">Systeemtegels</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Tegel toevoegen</string>
-  <string name="hotspot_apm_message">Kan geen verbinding maken met mobiele netwerken als vliegmodus is ingeschakeld. Schakel vliegmodus uit en probeer het opnieuw.</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Kan geen verbinding maken met mobiele netwerken als vliegtuigmodus is ingeschakeld. Schakel vliegtuigmodus uit en probeer het opnieuw.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Zaklamp staat aan</string>
   <string name="quick_settings_tile_flashlight_not_summary">Tik om uit te schakelen</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d clients</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Geen data-SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dock-accu <xliff:g id="number">%d</xliff:g> procent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Wachtrij weergeven</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Veeg omlaag om uit te vouwen</string>
+  <string name="swipe_left_hint">Veeg naar links voor <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Veeg naar rechts voor meldingen</string>
 </resources>
diff --git a/packages/SystemUI/res/values-oc-rFR/cm_arrays.xml b/packages/SystemUI/res/values-oc-rFR/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-oc-rFR/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-oc-rFR/cm_strings.xml b/packages/SystemUI/res/values-oc-rFR/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-oc-rFR/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-oc-rFR/strings.xml b/packages/SystemUI/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-oc-rFR/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-or-rIN/cm_arrays.xml b/packages/SystemUI/res/values-or-rIN/cm_arrays.xml
new file mode 100644
index 0000000..c0cb650
--- /dev/null
+++ b/packages/SystemUI/res/values-or-rIN/cm_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>ଊ</item>
+    <!-- North -->
+    <item>ଊ.ପୂ</item>
+    <!-- North east -->
+    <item>ପୂ</item>
+    <!-- East -->
+    <item>ଦ.ପୂ</item>
+    <!-- South east -->
+    <item>ଦ</item>
+    <!-- South -->
+    <item>ଦ.ପ</item>
+    <!-- South west -->
+    <item>ପ</item>
+    <!-- West -->
+    <item>ଊ.ପ</item>
+    <!-- North west -->
+  </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-or-rIN/cm_strings.xml b/packages/SystemUI/res/values-or-rIN/cm_strings.xml
new file mode 100644
index 0000000..7bed354
--- /dev/null
+++ b/packages/SystemUI/res/values-or-rIN/cm_strings.xml
@@ -0,0 +1,219 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">%1$s ପାଇଁ ଡାହାଣକୁ ସ୍ୱାଇପ୍‍ କରନ୍ତୁ</string>
+  <string name="right_shortcut_hint">%1$s ପାଇଁ ବାମକୁ ସ୍ୱାଇପ୍‍ କରନ୍ତୁ</string>
+  <string name="lockscreen_message">ଏକ ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ସର୍ଟକ‍ ପୁନଃ ପ୍ରଦାନ କରିବା ପାଇଁ ବାମ ବା ଡାହାଣରେ ଥିବା ଏକ ଆଇକନ୍‍କୁ ଟ୍ୟାପ୍‍ କରନ୍ତୁ।</string>
+  <string name="lockscreen_default_target">ଡିଫଲ୍ଟ</string>
+  <string name="select_application">ଆପ୍ଲିକେସନ୍ ଚୟନ କରନ୍ତୁ</string>
+  <string name="lockscreen_choose_action_title">କାର୍ଯ ଚୟନ କରନ୍ତୁ</string>
+  <string name="lockscreen_none_target">କିଛି ନୁହେଁ</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">ହସ୍ତାନ୍ତର ପାଇଁ କାର୍ଯ ଚୟନ କରନ୍ତୁ</string>
+  <string name="navbar_home_button">ହୋମ୍‍ ବଟନ୍‍</string>
+  <string name="navbar_recent_button">ସମ୍ପ୍ରତି ବଟନ୍‍</string>
+  <string name="navbar_search_button">ସ‍ନ୍ଧାନ ବଟନ୍‍</string>
+  <string name="navbar_back_button">ପଛକୁ ଯିବା ବଟନ୍‍</string>
+  <string name="navbar_empty_button">ଶୂନ୍ୟ ବଟନ୍‍</string>
+  <string name="navbar_menu_conditional_button">ମେନ୍ୟୁ (ସ୍ୱତଃଲୁଚାଇବା ବଟନ୍‍)</string>
+  <string name="navbar_menu_always_button">ମେନ୍ୟୁ (ସର୍ବଦାଦେଖାଇବା) ବଟନ୍‍</string>
+  <string name="navbar_menu_big_button">ମେନ୍ୟୁ ବଟନ୍</string>
+  <string name="accessibility_dpad_left">କର୍ସର୍‍ ବାମ</string>
+  <string name="accessibility_dpad_right">କର୍ସର୍ ଡାହାଣ</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">ଆପ୍ଲିକେସନ୍‍ ଡାଟା ଲିଭାଇ ଦିଅନ୍ତୁ</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">ଫୋର୍ସ୍ ସ୍ଥଗିତ</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">ଅଣସଂସ୍ଥାପନ କରନ୍ତୁ</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">ଆଲୋକ ଉଜ୍ଜ୍ୱଳତା</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">ପ୍ରୋଫାଇଲ୍‍ଗୁଡିକ ଅଫ୍‍ ଅଛି।</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">ପ୍ରୋଫାଇଲ୍‍: <xliff:g id="profile" example="Default">%s</xliff:g>।</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">ପ୍ରୋଫାଇଲ୍‍ଗୁଡିକ ଅଫ୍‍ କରାଯାଇଛି।</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">ପ୍ରୋଫାଇଲ୍ <xliff:g id="profile" example="Default">%s</xliff:g>କୁ ପରିବର୍ତ୍ତିତ ହେଲା।</string>
+  <string name="quick_settings_compass_init">ସଂସ୍ଥାପନ କରୁଛି\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">ଲାଇଟ୍‍ ସେଟିଂସ୍‍</string>
+  <string name="led_notification_text">ସେଟିଂସ୍‍ ଦ୍ୱାରା LED ଆ୍ଲୋକ ସଷମ କରାଯାଇଛି</string>
+  <string name="qs_tile_edit_header_instruction">ପୁନଃସଜାଇବା ପାଇଁ ଟାଇଲ୍ସ ଦବାନ୍ତୁ ଓ ଧରି ରଖନ୍ତୁ</string>
+  <string name="quick_settings_edit_label">ଟାଇଲ୍ସ ସମ୍ପାଦନା କରନ୍ତୁ</string>
+  <string name="quick_settings_cannot_delete_edit_tile">ସମ୍ପାଦନା ଟାଇଲ୍‍ ବିଲୋପ କରିହେବ ନାହିଁ</string>
+  <string name="qs_tiles_reset_confirmation">ଦ୍ରୁତ ସେଟିଂସ୍‍ ଟାଇଲ୍ସ ଡିଫଲ୍ଟ କଫିଗରେସନ୍‍କୁ ରିସେଟ୍‍ କରିବେ କି?</string>
+  <string name="quick_settings_tile_reset_to_default">ଡିଫଲ୍ଟ ଲେଆଉଟ୍‍କୁ ରିସେଟ୍‍ କରନ୍ତୁ</string>
+  <string name="quick_settings_title_header">ହେଡର୍‍</string>
+  <string name="quick_settings_title_tiles">ଟାଇଲ୍ସ</string>
+  <string name="quick_settings_title_show_weather">ପାଣିପାଗ ଦେଖାନ୍ତୁ</string>
+  <string name="quick_settings_title_show_brightness_slider">ଉଜ୍ଜ୍ୱଳତା ସ୍ଲାଇଡର୍‍ ଦେଖାନ୍ତୁ</string>
+  <string name="quick_settings_title_enlarge_first_row">ପ୍ରଥମ ଧାଡି ବଡ କରନ୍ତୁ</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">ଆପଣ ଅନପିନ୍‌ ନକରିବା ପର୍ଯ୍ୟନ୍ତ ଏହାକୁ ଦର୍ଶନ ରଖନ୍ତୁ। ଅନ୍‍ପିନ୍‍ କରିବା ପାଇଁ ବ୍ୟାକ୍‍ ବଟନ୍‍ ସ୍ପର୍ଶ କରନ୍ତୁ ଓ ଧରି ରଖନ୍ତୁ।</string>
+  <string name="quick_settings_custom_tile_detail_title">ଟାଇଲ୍‍ କଷ୍ଟମ୍‍ କରନ୍ତୁ</string>
+  <string name="quick_settings_remove">ଟାଇଲ୍‍ ଅପସାରଣ କରନ୍ତୁ</string>
+  <string name="quick_settings_network_adb_label">ନେଟ୍‍ୱାର୍କ୍‍ରେ ADB</string>
+  <string name="quick_settings_compass_label">କମ୍ପାସ୍‍</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">ସିଷ୍ଟମ୍‍ ପ୍ରୋଫାଇଲ୍‍ଗୁଡିକ</string>
+  <string name="quick_settings_profiles_off">ପ୍ରୋଫାଇଲ୍‍ଗୁଡିକ ଅଷମ କରାଯାଇଛି</string>
+  <string name="quick_settings_heads_up_label">ହେଡ୍ସ୍‍ ଅପ୍‍</string>
+  <string name="quick_settings_battery_saver_label">ବ୍ୟାଟେରୀ ସଭର୍‌</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">Caffeine</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">ସିଙ୍କ୍‍ ଅଫ୍‍ ଅଛି।</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">ସିଙ୍କ୍‍ ଅନ୍‍ ଅଛି।</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">ସିଙ୍କ୍‍ ଅଫ୍‍ କରାଯାଇଛି।</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">ସିଙ୍କ୍‍ ଅନ୍‍‍ କରାଯାଇଛି।</string>
+  <string name="quick_settings_sync_label">ସିଙ୍କ୍</string>
+  <string name="quick_settings_volume_panel_label">ଭୋଲ୍ୟୁମ୍‍ ପ୍ୟାନେଲ୍‍</string>
+  <string name="quick_settings_usb_tether_label">USB ଟିଥରିଂ</string>
+  <string name="quick_settings_screen_timeout_detail_title">ସ୍କ୍ରିନ୍‍ ସମୟ ଶେଷ</string>
+  <string name="quick_settings_lockscreen_label">ଲକ୍ ସ୍କ୍ରିନ୍</string>
+  <string name="quick_settings_ambient_display_label">ଏମ୍ବିଏଣ୍ଟ ପ୍ରଦର୍ଶନ</string>
+  <string name="quick_settings_lockscreen_label_enforced">ଲକ୍ ସ୍କ୍ରିନ୍ ଏଫୋର୍ସ୍ଡ</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">ପ୍ରୋଫାଇଲ୍‍ ଦ୍ୱାରା ବନ୍ଦ</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">ସ୍କ୍ରିନ୍‍ ଶେଷସମୟ: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>।</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">ସ୍କ୍ରିନ୍‍ ଶେଷସମୟ <xliff:g id="timeout" example="30 seconds">%s</xliff:g>କୁ ପରିବର୍ତ୍ତିତ ହେଲା।</string>
+  <string name="qs_tile_performance">ବ୍ୟାଟେରୀ ମୋଡ୍‍</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">ବ୍ୟାଟେରୀ ମୋଡ୍‍: ପାୱାର୍‍ ସଂରକ୍ଷଣ ମୋଡ୍‍</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">ବ୍ୟାଟେରୀ ମୋଡ୍‍: ସନ୍ତୁଳିତ ମୋଡ୍‍</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">ବ୍ୟାଟେରୀ ମୋଡ୍‍: ପ୍ରଦର୍ଶନ ମୋଡ୍‍</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">ବ୍ୟାଟେରୀ ମୋଡ୍‍: ଉପାଦେୟତା ମୋଡ୍‍</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">ବ୍ୟାଟେରୀ ମୋଡ୍‍: ଦ୍ରୁତ ମୋଡ୍‍</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">ବ୍ୟାଟେରୀ ମୋ୍ଡ୍‍ ପାୱାର୍‍ ସଂରକ୍ଷଣ ମୋଡ୍‍କୁ ପରିବର୍ତ୍ତିତ ହେଲା।</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">ବ୍ୟାଟେରୀ ମୋ୍ଡ୍‍ ସନ୍ତୁଳିତ ମୋଡ୍‍କୁ ପରିବର୍ତ୍ତିତ ହେଲା।</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">ବ୍ୟାଟେରୀ ସଂଚାଳନକାରିତା ମୋଡ୍‍କୁ ପରିବର୍ତ୍ତିତ ହେଲା।</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">ବ୍ୟାଟେରୀ ମୋ୍ଡ୍‍ ଉପାଦେୟତା ମୋଡ୍‍କୁ ପରିବର୍ତ୍ତିତ ହେଲା।</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">ବ୍ୟାଟେରୀ ମୋ୍ଡ୍‍ ଦ୍ରୁତ ମୋଡ୍‍କୁ ପରିବର୍ତ୍ତିତ ହେଲା।</string>
+  <string name="quick_settings_performance_profile_detail_title">ବ୍ୟାଟେରୀ ମୋଡ୍‍</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ଅଫ୍‍ ଅଛି।</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ଅନ୍‍ ଅଛି।</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ଅଫ୍‍ କରାଯାଇଛି।</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">ଲକ୍‍ ସ୍କ୍ରିନ୍‍ ଅନ୍‍‍ କରାଯାଇଛି।</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">ଆମ୍ବିଏଣ୍ଟ୍‍ ଡିସ୍‍ପ୍ଲେ ଅଫ୍‍ ଅଛି।</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">ଆମ୍ବିଏଣ୍ଟ୍‍ ଡିସ୍‍ପ୍ଲେ ଅନ୍‍‍ ଅଛି।</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">ଆମ୍ବିଏଣ୍ଟ୍‍ ଡିସ୍‍ପ୍ଲେ ଅଫ୍‍ କରାଯାଇଛି।</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">ଆମ୍ବିଏଣ୍ଟ୍‍ ଡିସ୍‍ପ୍ଲେ ଅନ୍‍ କରାଯାଇଛି।</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">ହେଡ୍ସ୍‍ ଅପ୍‍ ଅଫ୍‍ ଅଛି।</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">ହେଡ୍ସ୍‍ ଅପ୍‍ ଅନ୍‍ ଅଛି।</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">ହେଡ୍ସ୍‍ ଅପ୍‍ ଅଫ୍‍ କରାଯାଇଛି।</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">ହେଡ୍ସ୍‍ ଅପ୍‍ ଅନ୍‍‍ କରାଯାଇଛି।</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Caffeine off.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Caffeine on.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">ବ୍ୟାଟେରୀ ସେଭର୍‍ ଅଫ୍‍ ଅଛି।</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">ବ୍ୟାଟେରୀ ସେଭର୍‍ ଅନ୍‍‍ ଅଛି।</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">ବ୍ୟାଟେରୀ ସେଭର୍‍ ଅଫ୍‍ କରାଯାଇଛି।</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">ବ୍ୟାଟେରୀ ସେଭର୍‍ ଅନ୍‍ କରାଯାଇଛି।</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">ଡାଇନେମିକ୍‍ ଟାଇଲ୍‍</string>
+  <string name="dynamic_qs_tile_next_alarm_label">ପରବର୍ତ୍ତୀ ଆଲରାମ୍:</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME ସିଲେକ୍ଟର</string>
+  <string name="dynamic_qs_tile_su_label">ରୁଟ୍‍ ଆକ୍‍ସେସ୍‍</string>
+  <string name="quick_settings_title_advanced_location">ତିନି-ସ୍ତରୀୟ ଅବସ୍ଥାନ</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">ଅବସ୍ଥାନ ରିପୋର୍ଟିଂ: ବ୍ୟାଟେରୀ ସଂରକ୍ଷଣ ମୋଡ୍‍</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">ଅବସ୍ଥାନ ରିପୋର୍ଟିଂ: କେବଳ ସେନ୍‍ସର୍‍ ମୋଡ୍‍</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">ଅବସ୍ଥାନ ରିପୋର୍ଟିଂ: ଅଧିକ ସଠିକତା ମୋଡ୍‍</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">ଅବସ୍ଥାନ ମୋଡ୍</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">ବ୍ୟାଟେରୀ ସଞ୍ଚୟ</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">କେବଳ ଡିଭାଇସ୍</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">ଅଧିକ ସଠିକତା</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">ଅବସ୍ଥାନ ରିପୋର୍ଟିଂ ବ୍ୟାଟେରୀ ସଂରକ୍ଷଣ ମୋଡ୍‍କୁ ପରିବର୍ତ୍ତିତ ହେଲା</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">ଅବସ୍ଥାନ ରିପୋର୍ଟିଂ କେବଳ ସେନ୍‍ସର୍‍ ମୋଡ୍‍କୁ ପରିବର୍ତ୍ତିତ ହେଲା</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">ଅବସ୍ଥାନ ରିପୋର୍ଟିଂ ଅଧିକ ସଠିକତା ମୋଡ୍‍କୁ ପରିବର୍ତ୍ତିତ ହେଲା</string>
+  <string name="quick_settings_tiles_category_system">ସିଷ୍ଟମ୍‍ ଟାଇଲ୍ସ</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">ଏକ ଟାଇଲ୍‍ ଯୋଗ କରନ୍ତୁ</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">ବିମାନ ମୋଡ୍‍ ସଷମ ଥିବା ସ୍ମୟ୍ରେ ମୋବାଇଲ୍‍ ନେଟ୍‍ୱାର୍କ ସହ ସଂଯୋଗ ହେବାରେ ଅଷମ ହେଉଛି। ବିମାନ ମୋଡ୍‍ ଅଷମ କରନ୍ତୁ ଓ ପୁନର୍ବାର ଚେଷ୍ଟା କରନ୍ତୁ।</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ଫ୍ଲାସ୍‍ଲାଇଟ୍‍ ଅନ୍‍ ଅଛି</string>
+  <string name="quick_settings_tile_flashlight_not_summary">ଅଫ୍‍ କରିବା ପାଇଁ ଟ୍ୟାପ୍‍ କରନ୍ତୁ</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="other">%1$d clients</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">ଡକ୍‍ ବ୍ୟାଟେରୀ <xliff:g id="number">%d</xliff:g> ଶତକଡା।</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">ଚାଳନା ଧାଡି ଦେଖାନ୍ତୁ</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-or-rIN/strings.xml b/packages/SystemUI/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..7758366
--- /dev/null
+++ b/packages/SystemUI/res/values-or-rIN/strings.xml
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+/**
+ * Copyright (c) 2009, 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.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
+  <!-- Title shown in recents popup for removing an application from the list -->
+  <!-- Title shown in recents popup for inspecting an application's properties -->
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
+  <!-- Title of confirmation dialog for USB debugging -->
+  <!-- Message of confirmation dialog for USB debugging -->
+  <!-- Option to always allow USB debugging from the attached computer -->
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
+  <!-- Textual description of Ethernet connections -->
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/SystemUI/res/values-pa-rIN/cm_arrays.xml b/packages/SystemUI/res/values-pa-rIN/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-pa-rIN/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-pa-rIN/cm_strings.xml b/packages/SystemUI/res/values-pa-rIN/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-pa-rIN/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-pl/cm_arrays.xml b/packages/SystemUI/res/values-pl/cm_arrays.xml
index 6d676ae..d5537a3 100644
--- a/packages/SystemUI/res/values-pl/cm_arrays.xml
+++ b/packages/SystemUI/res/values-pl/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>płn.</item>
+    <!-- North -->
     <item>płn. wsch.</item>
+    <!-- North east -->
     <item>wsch.</item>
+    <!-- East -->
     <item>płd. wsch.</item>
+    <!-- South east -->
     <item>płd.</item>
+    <!-- South -->
     <item>płd. zach.</item>
+    <!-- South west -->
     <item>zach.</item>
+    <!-- West -->
     <item>płn. zach.</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-pl/cm_strings.xml b/packages/SystemUI/res/values-pl/cm_strings.xml
index 30dfcf5..95c831e 100644
--- a/packages/SystemUI/res/values-pl/cm_strings.xml
+++ b/packages/SystemUI/res/values-pl/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Przesuń palcem w prawo do %1$s</string>
   <string name="right_shortcut_hint">Przesuń palcem w lewo do %1$s</string>
   <string name="lockscreen_message">Dotknij ikony po lewej lub prawej, aby przypisać skrót ekranu blokady.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Wybierz aplikację</string>
   <string name="lockscreen_choose_action_title">Wybierz akcję</string>
   <string name="lockscreen_none_target">Brak</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Wybierz akcję do przypisania</string>
   <string name="navbar_home_button">Przycisk Home</string>
   <string name="navbar_recent_button">Przycisk Ostatnie aplikacje</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Przycisk Menu</string>
   <string name="accessibility_dpad_left">Kursor w lewo</string>
   <string name="accessibility_dpad_right">Kursor w prawo</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Usuń dane aplikacji</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Wymuś zamknięcie</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Odinstaluj</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Jasność światła</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profile wyłączone.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profile zostały wyłączone.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil zmieniony na <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicjalizowanie\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ustawienia diody</string>
   <string name="led_notification_text">Diody LED włączone przez ustawienia</string>
   <string name="qs_tile_edit_header_instruction">Naciśnij i przytrzymaj kafelki, aby zmienić kolejność</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Pokaż pogodę</string>
   <string name="quick_settings_title_show_brightness_slider">Pokaż suwak jasności</string>
   <string name="quick_settings_title_enlarge_first_row">Powiększenie pierwszego rzędu</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Zostaje na widoku do czasu odpięcia. Dotknij i przytrzymaj przycisk Wstecz, aby odpiąć.</string>
   <string name="quick_settings_custom_tile_detail_title">Kafelek niestandardowy</string>
   <string name="quick_settings_remove">Usuń kafelek</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profile wyłączone</string>
   <string name="quick_settings_heads_up_label">Wyskakujące powiadomienia</string>
   <string name="quick_settings_battery_saver_label">Oszczędzanie baterii</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Oszczędzanie baterii (ładowanie)</string>
   <string name="quick_settings_caffeine_label">Kofeina</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synchronizacja wyłączona.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synchronizacja włączona.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synchronizacja została wyłączona.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synchronizacja została włączona.</string>
   <string name="quick_settings_sync_label">Synchronizacja</string>
   <string name="quick_settings_volume_panel_label">Panel głośności</string>
@@ -81,66 +107,121 @@
   <string name="quick_settings_ambient_display_label">Aktywny wyświetlacz</string>
   <string name="quick_settings_lockscreen_label_enforced">Blokada ekranu wymuszona</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Wyłączone przez profil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Wygaszanie ekranu: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Wygaszanie ekranu zmieniono na <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Tryb baterii</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Tryb baterii: tryb oszczędzania baterii.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Tryb baterii: tryb zrównoważony.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Tryb baterii: tryb wydajności.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Tryb baterii: tryb wydajności.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Tryb baterii: tryb szybki.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Tryb baterii zmienił się na tryb oszczędzania energii.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Tryb baterii zmienił się na tryb zrównoważony.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Tryb baterii zmienił się na tryb wydajności.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Tryb baterii zmieniony na tryb wydajności.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Tryb baterii zmieniony na tryb szybki.</string>
   <string name="quick_settings_performance_profile_detail_title">Tryb baterii</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Blokada ekranu wyłączona.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Blokada ekranu włączona.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Blokada ekranu została wyłączona.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Blokada ekranu została włączona.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Aktywny wyświetlacz wyłączony.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Aktywny wyświetlacz włączony.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Aktywny wyświetlacz został wyłączony.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Aktywny wyświetlacz został włączony.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Wyskakujące powiadomienia wyłączone.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Wyskakujące powiadomienia włączone.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Wyskakujące powiadomienia zostały wyłączone.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Wyskakujące powiadomienia zostały włączone.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Kofeina wył.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Kofeina wł.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Oszczędzanie baterii wył.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Oszczędzanie baterii wł.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Oszczędzanie baterii zostało wył.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Oszczędzanie baterii zostało wł.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamiczne przełączniki</string>
   <string name="dynamic_qs_tile_next_alarm_label">Następny alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">Przełącznik klawiatury</string>
   <string name="dynamic_qs_tile_su_label">Dostęp do roota</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay wyłączony.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: tryb automatyczny.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: tryb dzienny.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: tryb nocny.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: tryb zewnętrzny.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay został wyłączony.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay zmieniony na tryb automatyczny.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay zmieniony na tryb dzienny.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay zmieniony na tryb nocny.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay zmieniony na tryb zewnętrzny.</string>
+  <string name="dynamic_qs_tile_themes_label">Motywy</string>
   <string name="quick_settings_title_advanced_location">Trójstanowa lokalizacja</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Raportowanie lokalizacji: tryb oszczędzania baterii.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Raportowanie lokalizacji: tylko czujniki.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Raportowanie lokalizacji: wysoka dokładność.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Tryb lokalizacji</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Oszczędzanie baterii</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Tylko urządzenie</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Wysoka dokładność</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Zgłaszanie lokalizacji przeszło w tryb oszczędzania energii.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Zgłaszanie lokalizacji przeszło w tryb \"tylko czujniki\".</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Zgłaszanie lokalizacji przeszło w tryb wysokiej dokładności.</string>
   <string name="quick_settings_tiles_category_system">Kafelki systemowe</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Dodaj kafelek</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Sieć komórkowa jest niedostępna w Trybie samolotowym. Wyłącz go i spróbuj ponownie.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Latarka jest włączona</string>
   <string name="quick_settings_tile_flashlight_not_summary">Dotknij, aby wyłączyć</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klient</item>
+    <item quantity="few">%1$d klientów</item>
+    <item quantity="other">%1$d klientów</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Brak danych SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Bateria stacji dokującej <xliff:g id="number">%d</xliff:g> procent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Pokaż kolejkę odtwarzania</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Przesuń w dół, aby rozwinąć</string>
+  <string name="swipe_left_hint">Przesuń w lewo, aby uruchomić <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Przesuń w prawo, aby zobaczyć powiadomienia</string>
 </resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/cm_arrays.xml b/packages/SystemUI/res/values-pt-rBR/cm_arrays.xml
index cb6fbec..1fd49e9 100644
--- a/packages/SystemUI/res/values-pt-rBR/cm_arrays.xml
+++ b/packages/SystemUI/res/values-pt-rBR/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
-    <item>E</item>
+    <!-- North east -->
+    <item>L</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SO</item>
+    <!-- South west -->
     <item>O</item>
+    <!-- West -->
     <item>NO</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/cm_strings.xml b/packages/SystemUI/res/values-pt-rBR/cm_strings.xml
index 36ae8a2..845df0f 100644
--- a/packages/SystemUI/res/values-pt-rBR/cm_strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/cm_strings.xml
@@ -16,49 +16,69 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="tempo">%1$s</xliff:g> - <xliff:g id="condição">%2$s</xliff:g></string>
-  <string name="left_shortcut_hint">Deslizar para a direita para %1$s</string>
-  <string name="right_shortcut_hint">Deslizar para a esquerda para %1$s</string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">Deslize para a direita para %1$s</string>
+  <string name="right_shortcut_hint">Deslize para a esquerda para %1$s</string>
   <string name="lockscreen_message">Toque em um ícone da esquerda ou da direita para reatribuir o atalho da tela de bloqueio.</string>
   <string name="lockscreen_default_target">Padrão</string>
   <string name="select_application">Selecionar aplicativo</string>
   <string name="lockscreen_choose_action_title">Escolher ação</string>
   <string name="lockscreen_none_target">Nenhum</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Escolha uma ação para atribuir</string>
   <string name="navbar_home_button">Botão de início</string>
   <string name="navbar_recent_button">Botão de recentes</string>
   <string name="navbar_search_button">Botão de buscar</string>
   <string name="navbar_back_button">Botão de voltar</string>
   <string name="navbar_empty_button">Botão vazio</string>
-  <string name="navbar_menu_conditional_button">Botão menu (esconder auto.)</string>
+  <string name="navbar_menu_conditional_button">Botão menu (autoesconder)</string>
   <string name="navbar_menu_always_button">Botão menu (sempre visível)</string>
   <string name="navbar_menu_big_button">Botão menu</string>
   <string name="accessibility_dpad_left">Cursor à esquerda</string>
   <string name="accessibility_dpad_right">Cursor à direita</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Limpar dados de aplicativos</string>
-  <string name="advanced_dev_option_force_stop">Forçar fechamento</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">Interromper à força</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstalar</string>
-  <string name="accessibility_notification_brightness">Brilho</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Brilho da luz</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Perfis desligados.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Perfil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Perfis foram desligados.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Perfil alterado para <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicializando\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Configurações de luz</string>
   <string name="led_notification_text">Luz de LED ativada pelas configurações</string>
   <string name="qs_tile_edit_header_instruction">Pressione e segure os botões para reorganizar</string>
   <string name="quick_settings_edit_label">Editar botões</string>
   <string name="quick_settings_cannot_delete_edit_tile">Não é possível excluir o botão de Edição</string>
-  <string name="qs_tiles_reset_confirmation">Redefinir botões das configurações rápidas para o padrão?</string>
+  <string name="qs_tiles_reset_confirmation">Redefinir botões das configurações rápidas para a configuração padrão?</string>
   <string name="quick_settings_tile_reset_to_default">Redefinir para a organização padrão</string>
   <string name="quick_settings_title_header">Cabeçalho</string>
   <string name="quick_settings_title_tiles">Botões</string>
-  <string name="quick_settings_title_show_weather">Mostrar tempo</string>
+  <string name="quick_settings_title_show_weather">Mostrar clima</string>
   <string name="quick_settings_title_show_brightness_slider">Mostrar o controle deslizante de brilho</string>
   <string name="quick_settings_title_enlarge_first_row">Ampliar a primeira linha</string>
-  <string name="screen_pinning_description_no_navbar">Isto manterá-la na tela até você desafixar. Toque e segure o botão Voltar para desafixar.</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Isto a manterá na tela até ser desafixada. Toque e segure o botão Voltar para desafixar.</string>
   <string name="quick_settings_custom_tile_detail_title">Botão personalizado</string>
   <string name="quick_settings_remove">Remover botão</string>
   <string name="quick_settings_network_adb_label">ADB sobre rede</string>
@@ -68,79 +88,139 @@
   <string name="quick_settings_profiles_off">Perfis desativados</string>
   <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="quick_settings_battery_saver_label">Economizador de bateria</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Economia de bateria (carregando)</string>
   <string name="quick_settings_caffeine_label">Cafeína</string>
-  <string name="accessibility_quick_settings_sync_off">Sincr. desl.</string>
-  <string name="accessibility_quick_settings_sync_on">Sincr. lig.</string>
-  <string name="accessibility_quick_settings_sync_changed_off">Sincronização desligada.</string>
-  <string name="accessibility_quick_settings_sync_changed_on">Sincronização ligada.</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">Sincronização desligada.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">Sincronização ligada.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">Sincronização foi desligada.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">Sincronização foi ligada.</string>
   <string name="quick_settings_sync_label">Sincronização</string>
   <string name="quick_settings_volume_panel_label">Painel de volume</string>
-  <string name="quick_settings_usb_tether_label">Tethering USB</string>
+  <string name="quick_settings_usb_tether_label">Compartilhamento USB</string>
   <string name="quick_settings_screen_timeout_detail_title">Tempo limite de tela</string>
   <string name="quick_settings_lockscreen_label">Tela de bloqueio</string>
   <string name="quick_settings_ambient_display_label">Tela ambiente</string>
-  <string name="quick_settings_lockscreen_label_enforced">Tela de bloqueio imposta</string>
+  <string name="quick_settings_lockscreen_label_enforced">Tela de bloqueio aplicada</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Desativado pelo perfil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Tempo limite da tela: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Tempo limite da tela alterado para <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Modo de bateria</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Modo de bateria: modo de economia de energia.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Modo de bateria: modo equilibrado.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Modo de bateria: modo de desempenho.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Modo de bateria: modo eficiente.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Modo de bateria: modo rápido.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Modo de bateria alterado para o modo de economia de energia.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Modo de bateria alterado para o modo equilibrado.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Modo de bateria alterado para o modo de desempenho.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Modo de bateria alterado para o modo eficiente.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Modo de bateria alterado para o modo rápido.</string>
   <string name="quick_settings_performance_profile_detail_title">Modo de bateria</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Tela de bloqueio desligada.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Tela de bloqueio ligada.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Tela de bloqueio foi desligada.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Tela de bloqueio foi ligada.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Tela ambiente desativado.</string>
-  <string name="accessibility_quick_settings_ambient_display_on">Tela ambiente ativado.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_off">Tela ambiente desligado.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_on">Tela ambiente ligado.</string>
-  <string name="accessibility_quick_settings_heads_up_off">Heads up desativado.</string>
-  <string name="accessibility_quick_settings_heads_up_on">Heads up ativado.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up desligado.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up ligado.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">Tela ambiente ativada.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">Tela ambiente foi desligada.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">Tela ambiente foi ligada.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Heads up desligado.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Heads up ligado.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">Heads up foi desligado.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">Heads up foi ligado.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Cafeína desligado.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Cafeína ligado.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Economizador de bateria desligado.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Economizador de bateria ligado.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">O economizador de bateria foi desligado.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">O economizador de bateria foi ligado.</string>
-  <string name="quick_settings_dynamic_tile_detail_title">Botões dinâmicos</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">Botão dinâmico</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próximo alarme</string>
   <string name="dynamic_qs_tile_ime_selector_label">Seletor de IME</string>
-  <string name="dynamic_qs_tile_su_label">Acesso super-usuário</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay desligado.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modo automático.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: modo dia.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: modo noite.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modo ao ar livre.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay foi desligado.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay alterado para modo automático.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay alterado para modo dia.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay alterado para modo noite.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay alterado para modo ao ar livre.</string>
+  <string name="dynamic_qs_tile_su_label">Acesso super usuário</string>
+  <string name="dynamic_qs_tile_themes_label">Temas</string>
   <string name="quick_settings_title_advanced_location">Localização em 3 estados</string>
-  <string name="accessibility_quick_settings_location_battery_saving">Localização: economia de bateria.</string>
-  <string name="accessibility_quick_settings_location_gps_only">Localização: apenas no dispositivo.</string>
-  <string name="accessibility_quick_settings_location_high_accuracy">Localização: alta precisão.</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">Relatório de localização: modo economia de bateria.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">Relatório de localização: modo somente sensores.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">Relatório de localização: modo de alta precisão.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Modo de localização</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Economia de bateria</string>
-  <string name="quick_settings_location_gps_only_label">Apenas no dispositivo</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">Somente no dispositivo</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Alta precisão</string>
-  <string name="accessibility_quick_settings_location_changed_battery_saving">Modo de localização alterado para apenas Wi-Fi e redes móveis.</string>
-  <string name="accessibility_quick_settings_location_changed_gps_only">Modo de localização alterado para apenas GPS.</string>
-  <string name="accessibility_quick_settings_location_changed_high_accuracy">Modo de localização alterado para GPS, Wi-Fi e redes móveis.</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">Relatório de localização alterado para economia de bateria.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">Relatório de localização alterado para modo somente sensores.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">Relatório de localização alterado para modo de alta precisão.</string>
   <string name="quick_settings_tiles_category_system">Botões de sistema</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Adicionar um botão</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Não é possível se conectar a redes móveis enquanto o Modo Avião estiver ativado. Desative o modo avião e tente novamente.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">A lanterna está ligada</string>
   <string name="quick_settings_tile_flashlight_not_summary">Toque para desligar</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d cliente</item>
+    <item quantity="other">%1$d clientes</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Sem SIM de dados</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">A bateria do dock tem <xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" id="number">%d</xliff:g>%.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Mostrar fila de reprodução</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="tempo">%1$s</xliff:g> - <xliff:g id="condição">%2$s</xliff:g></string>
+  <string name="expand_hint">Deslize para baixo para expandir</string>
+  <string name="swipe_left_hint">Deslizar para a esquerda para <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Deslize para a direita para ver as notificações</string>
 </resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/cm_arrays.xml b/packages/SystemUI/res/values-pt-rPT/cm_arrays.xml
index cb6fbec..85897e7 100644
--- a/packages/SystemUI/res/values-pt-rPT/cm_arrays.xml
+++ b/packages/SystemUI/res/values-pt-rPT/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SO</item>
+    <!-- South west -->
     <item>O</item>
+    <!-- West -->
     <item>NO</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/cm_strings.xml b/packages/SystemUI/res/values-pt-rPT/cm_strings.xml
index 0e1fd11..b73f911 100644
--- a/packages/SystemUI/res/values-pt-rPT/cm_strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Deslizar para a direita para %1$s</string>
   <string name="right_shortcut_hint">Deslizar para a esquerda para %1$s</string>
   <string name="lockscreen_message">Toque num ícone da esquerda ou da direita para atribuir um atalho no ecrã de bloqueio.</string>
@@ -26,29 +34,40 @@
   <string name="select_application">Selecionar aplicação</string>
   <string name="lockscreen_choose_action_title">Selecionar ação</string>
   <string name="lockscreen_none_target">Nenhum</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Escolha uma ação para atribuir</string>
-  <string name="navbar_home_button">Botão Home</string>
-  <string name="navbar_recent_button">Botão Recentes</string>
-  <string name="navbar_search_button">Botão Pesquisa</string>
-  <string name="navbar_back_button">Botão Voltar</string>
+  <string name="navbar_home_button">Botão Página Inicial</string>
+  <string name="navbar_recent_button">Botão de Visão geral</string>
+  <string name="navbar_search_button">Botão de pesquisa</string>
+  <string name="navbar_back_button">Botão Anterior</string>
   <string name="navbar_empty_button">Botão vazio</string>
   <string name="navbar_menu_conditional_button">Botão Menu (esconder auto)</string>
   <string name="navbar_menu_always_button">Botão Menu (sempre visível)</string>
   <string name="navbar_menu_big_button">Botão Menu</string>
   <string name="accessibility_dpad_left">Cursor à esquerda</string>
   <string name="accessibility_dpad_right">Cursor à direita</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Limpar dados da aplicação</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Forçar paragem</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Desinstalar</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Brilho</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Perfis desligados.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Perfil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Perfis foram desligados.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Perfil alterado para <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">A iniciar\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Definições de luz</string>
   <string name="led_notification_text">Luz do LED ativada pelas definições</string>
-  <string name="qs_tile_edit_header_instruction">Pressione e segure os mosaicos para reorganizar</string>
+  <string name="qs_tile_edit_header_instruction">Mantenha os mosaicos premidos para os reorganizar</string>
   <string name="quick_settings_edit_label">Editar os mosaicos</string>
   <string name="quick_settings_cannot_delete_edit_tile">Não é possível eliminar o mosaico de Editar</string>
   <string name="qs_tiles_reset_confirmation">Repor os valores de origem dos mosaicos de definições rápidas?</string>
@@ -58,7 +77,8 @@
   <string name="quick_settings_title_show_weather">Mostrar o tempo</string>
   <string name="quick_settings_title_show_brightness_slider">Mostrar o controlo deslizante de brilho</string>
   <string name="quick_settings_title_enlarge_first_row">Ampliar a primeira linha</string>
-  <string name="screen_pinning_description_no_navbar">Isto mantém visível até soltar. Toque e segure o botão Voltar até soltar.</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">Irá ficar visível até que o solte. Toque e segure o botão Anterior para soltar.</string>
   <string name="quick_settings_custom_tile_detail_title">Mosaicos personalizados</string>
   <string name="quick_settings_remove">Remover mosaico</string>
   <string name="quick_settings_network_adb_label">ADB através da rede</string>
@@ -68,11 +88,17 @@
   <string name="quick_settings_profiles_off">Perfis desativados</string>
   <string name="quick_settings_heads_up_label">Notificações pop-up</string>
   <string name="quick_settings_battery_saver_label">Economizador de bateria</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Economizador de bateria (a carregar)</string>
   <string name="quick_settings_caffeine_label">Cafeína</string>
-  <string name="accessibility_quick_settings_sync_off">Sincronização desligada.</string>
-  <string name="accessibility_quick_settings_sync_on">Sincronização ligada.</string>
-  <string name="accessibility_quick_settings_sync_changed_off">Sincronização foi desligada.</string>
-  <string name="accessibility_quick_settings_sync_changed_on">Sincronização foi ligada.</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">Sincronização desativada.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">Sincronização ativada.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">A sincronização foi desativada.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">A sincronização foi ativada.</string>
   <string name="quick_settings_sync_label">Sincronização</string>
   <string name="quick_settings_volume_panel_label">Painel de volume</string>
   <string name="quick_settings_usb_tether_label">Partilha de internet por USB</string>
@@ -81,66 +107,120 @@
   <string name="quick_settings_ambient_display_label">Visualização de ambiente</string>
   <string name="quick_settings_lockscreen_label_enforced">Ecrã de bloqueio forçado</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Desativado pelo perfil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Tempo limite do ecrã: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Tempo limite do ecrã alterado para <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Modo de bateria</string>
-  <string name="accessibility_quick_settings_perf_profile_pwrsv">Modo de bateria: modo de poupança de energia.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">Modo de bateria: modo de poupança de bateria.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Modo de bateria: modo equilibrado.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Modo de bateria: modo de desempenho.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Modo de bateria: modo de eficiência.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Modo de bateria: modo rápido.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Modo de bateria alterado para o modo de poupança de energia.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Modo de bateria alterado para o modo de poupança de bateria.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Modo de bateria alterado para o modo equilibrado.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Modo de bateria alterado para o modo de desempenho.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Modo de bateria alterado para o modo de eficiência.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Modo de bateria alterado para o modo rápido.</string>
   <string name="quick_settings_performance_profile_detail_title">Modo de bateria</string>
-  <string name="accessibility_quick_settings_lock_screen_off">Ecrã de bloqueio desligado.</string>
-  <string name="accessibility_quick_settings_lock_screen_on">Ecrã de bloqueio ligado.</string>
-  <string name="accessibility_quick_settings_lock_screen_changed_off">Ecrã de bloqueio foi desligado.</string>
-  <string name="accessibility_quick_settings_lock_screen_changed_on">Ecrã de bloqueio foi ligado.</string>
-  <string name="accessibility_quick_settings_ambient_display_off">Visualização de ambiente desligada.</string>
-  <string name="accessibility_quick_settings_ambient_display_on">Visualização de ambiente ligada.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_off">A visualização de ambiente foi desligada.</string>
-  <string name="accessibility_quick_settings_ambient_display_changed_on">A visualização de ambiente foi ligada.</string>
-  <string name="accessibility_quick_settings_heads_up_off">Notificações pop-up desligadas.</string>
-  <string name="accessibility_quick_settings_heads_up_on">Notificações pop-up ligadas.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_off">Notificações pop-up desligaram.</string>
-  <string name="accessibility_quick_settings_heads_up_changed_on">Notificações pop-up ligaram.</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">Ecrã de bloqueio desativado.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">Ecrã de bloqueio ativado.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">O ecrã de bloqueio foi desativado.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">O ecrã de bloqueio foi ativado.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">Visualização de ambiente desativada.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">Visualização de ambiente ativada.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">A visualização de ambiente foi desativada.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">A visualização de ambiente foi ativada.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">Notificações pop-up desativadas.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">Notificações pop-up ativadas.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">As notificações pop-up foram desativadas.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">As notificações pop-up foram ativadas.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Cafeína desligada.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Cafeína ligada.</string>
-  <string name="accessibility_quick_settings_battery_saver_off">Economizador de bateria desligado.</string>
-  <string name="accessibility_quick_settings_battery_saver_on">Economizador de bateria ligado.</string>
-  <string name="accessibility_quick_settings_battery_saver_changed_off">O economizador de bateria desligou.</string>
-  <string name="accessibility_quick_settings_battery_saver_changed_on">O economizador de bateria ligou.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">Economizador de bateria desativado.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">Economizador de bateria ativado.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">O economizador de bateria foi desativado.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">O economizador de bateria foi ativado.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Mosaicos dinâmicos</string>
   <string name="dynamic_qs_tile_next_alarm_label">Próximo alarme</string>
   <string name="dynamic_qs_tile_ime_selector_label">Seletor de método de entrada</string>
   <string name="dynamic_qs_tile_su_label">Acesso root</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay desligado.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: modo automático.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: modo dia.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: modo noite.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: modo exterior.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay foi desligado.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay alterado para modo automático.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay alterado para modo dia.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay alterado para modo noite.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay alterado para modo exterior.</string>
+  <string name="dynamic_qs_tile_themes_label">Temas</string>
   <string name="quick_settings_title_advanced_location">Localização com 3 estados</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Localização: poupança de bateria.</string>
-  <string name="accessibility_quick_settings_location_gps_only">Localização: apenas dispositivo.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">Localização: apenas no dispositivo.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Localização: alta precisão.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Modos de localização</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Poupança de bateria</string>
-  <string name="quick_settings_location_gps_only_label">Apenas dispositivo</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">Apenas no dispositivo</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Alta precisão</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Modo de localização alterado para poupança de bateria.</string>
-  <string name="accessibility_quick_settings_location_changed_gps_only">Modo de localização alterado para apenas dispositivo.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">Modo de localização alterado para apenas no dispositivo.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Modo de localização alterado para alta precisão.</string>
   <string name="quick_settings_tiles_category_system">Mosaicos do sistema</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Adicionar um mosaico</string>
-  <string name="hotspot_apm_message">Não é possível ligar-se a redes móveis enquanto o modo de avião estiver ativo. Desative o modo de avião e tente novamente.</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Não é possível ligar-se a redes móveis enquanto o modo de voo estiver ativado. Desative o modo de voo e tente novamente.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">A lanterna está ligada</string>
   <string name="quick_settings_tile_flashlight_not_summary">Toque para desligar</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d cliente</item>
+    <item quantity="other">%1$d clientes</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Cartão SIM sem dados móveis</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Bateria da dock <xliff:g id="number">%d</xliff:g> por cento.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Mostrar a fila de reprodução</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Deslize para baixo para expandir</string>
+  <string name="swipe_left_hint">Deslize para a esquerda para <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Deslize para a direita para ver as notificações</string>
 </resources>
diff --git a/packages/SystemUI/res/values-rm/cm_arrays.xml b/packages/SystemUI/res/values-rm/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-rm/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-rm/cm_strings.xml b/packages/SystemUI/res/values-rm/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-rm/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-ro/cm_arrays.xml b/packages/SystemUI/res/values-ro/cm_arrays.xml
index 91744501..acce4b6 100644
--- a/packages/SystemUI/res/values-ro/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ro/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SV</item>
+    <!-- South west -->
     <item>V</item>
+    <!-- West -->
     <item>NV</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ro/cm_strings.xml b/packages/SystemUI/res/values-ro/cm_strings.xml
index 83531ab..2ef4e1d 100644
--- a/packages/SystemUI/res/values-ro/cm_strings.xml
+++ b/packages/SystemUI/res/values-ro/cm_strings.xml
@@ -16,15 +16,24 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Glisați dreapta pentru %1$s</string>
   <string name="right_shortcut_hint">Glisați stânga pentru %1$s</string>
   <string name="lockscreen_default_target">Implicit</string>
   <string name="select_application">Selectați aplicația</string>
   <string name="lockscreen_choose_action_title">Alege acțiunea</string>
   <string name="lockscreen_none_target">Nimic</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Alege o acțiune pentru a o asocia</string>
   <string name="navbar_home_button">Butonul Acasă</string>
   <string name="navbar_recent_button">Butonul Recent</string>
@@ -36,14 +45,24 @@
   <string name="navbar_menu_big_button">Buton Meniu</string>
   <string name="accessibility_dpad_left">Cursor stânga</string>
   <string name="accessibility_dpad_right">Cursor dreapta</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Șterge datele aplicației</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Oprire forțată</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Dezinstalați</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiluri oprit.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiluri este activat.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil schimbat în <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inițializare\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Setări de lumină</string>
   <string name="qs_tile_edit_header_instruction">Apăsați și țineți apăsate chenarele pentru a rearanja</string>
   <string name="quick_settings_edit_label">Editare chenare</string>
@@ -54,6 +73,8 @@
   <string name="quick_settings_title_tiles">Chenare</string>
   <string name="quick_settings_title_show_weather">Arată vremea</string>
   <string name="quick_settings_title_show_brightness_slider">Arată glisorul de luminozitate</string>
+  <string name="quick_settings_title_enlarge_first_row">Mărește primul rând</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="quick_settings_custom_tile_detail_title">Chenar personalizat</string>
   <string name="quick_settings_remove">Eliminare chenar</string>
   <string name="quick_settings_network_adb_label">ADB prin rețea</string>
@@ -63,10 +84,15 @@
   <string name="quick_settings_profiles_off">Profilurile sunt dezactivate</string>
   <string name="quick_settings_heads_up_label">Atenționare</string>
   <string name="quick_settings_battery_saver_label">Economizor baterie</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
   <string name="quick_settings_caffeine_label">Cofeină</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sincronizare oprită.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sincronizare pornită.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sincronizare oprită.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sincronizare pornită.</string>
   <string name="quick_settings_sync_label">Sincronizare</string>
   <string name="quick_settings_volume_panel_label">Panou volum</string>
@@ -76,48 +102,105 @@
   <string name="quick_settings_ambient_display_label">Afișare ambientală</string>
   <string name="quick_settings_lockscreen_label_enforced">Blocare ecran impusă</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Dezactivat de profil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Timp expirare ecran: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Timp expirare ecran a fost schimbat la <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Mod baterie</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Mod baterie: mod de salvare energie.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Mod baterie: mod echilibrat.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Mod baterie: mod performanță.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Mod baterie: mod eficiență.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Mod baterie: mod rapid.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Modul bateriei a fost schimbat în modul de salvare energie.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Modul bateriei a fost schimbat în mod echilibrat.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Modul bateriei schimbat în modul de performanță.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Modul bateriei a fost schimbat în modul de eficiență.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Modul bateriei a fost schimbat în modul rapid.</string>
   <string name="quick_settings_performance_profile_detail_title">Mod baterie</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Blocare ecran oprit.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Blocare ecran pornit.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Afișare ambientală oprită.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Afișare ambientală pornită.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Cofeină oprit.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Cofeină pornit.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Economisire baterie oprită.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Economisire baterie pornită.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Economisire baterie este dezactivată.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Economisire baterie este activată.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Chenar dinamic</string>
   <string name="dynamic_qs_tile_next_alarm_label">Următoarea alarmă</string>
   <string name="dynamic_qs_tile_ime_selector_label">Selector IME</string>
   <string name="dynamic_qs_tile_su_label">Acces root</string>
   <string name="quick_settings_title_advanced_location">Starea celor 3 moduri de locație</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Raportarea locației: mod economisire baterie.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Raportarea locației: doar senzori.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Raportarea locației: precizie ridicată.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Mod localizare</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Economisire baterie</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Doar dispozitiv</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Precizie ridicată</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Raportarea locației modificată în modul economisire baterie.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Raportarea locației modificată în modul doar senzori.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Raportarea locației modificată în modul precizie ridicată.</string>
   <string name="quick_settings_tiles_category_system">Chenar sistem</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Adaugă un chenar</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Nu se poate conecta la rețele mobile în timp ce modul Avion este activat. Dezactivați modul Avion și încercați din nou.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Lanterna este pornită</string>
   <string name="quick_settings_tile_flashlight_not_summary">Atingeți pentru a dezactiva</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d client</item>
+    <item quantity="few">%1$d clienți</item>
+    <item quantity="other">%1$d clienți</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-ru/cm_arrays.xml b/packages/SystemUI/res/values-ru/cm_arrays.xml
index 2e58d85..7fa348b 100644
--- a/packages/SystemUI/res/values-ru/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ru/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>С</item>
+    <!-- North -->
     <item>СВ</item>
+    <!-- North east -->
     <item>В</item>
+    <!-- East -->
     <item>ЮВ</item>
+    <!-- South east -->
     <item>Ю</item>
+    <!-- South -->
     <item>ЮЗ</item>
+    <!-- South west -->
     <item>З</item>
+    <!-- West -->
     <item>СЗ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ru/cm_strings.xml b/packages/SystemUI/res/values-ru/cm_strings.xml
index 919c2e0..ccfd26d 100644
--- a/packages/SystemUI/res/values-ru/cm_strings.xml
+++ b/packages/SystemUI/res/values-ru/cm_strings.xml
@@ -16,16 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
-  <string name="left_shortcut_hint">Проведите вправо, чтобы открыть приложение «%1$s»</string>
-  <string name="right_shortcut_hint">Проведите влево, чтобы открыть приложение «%1$s»</string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">%1$s: проведите от значка</string>
+  <string name="right_shortcut_hint">%1$s: проведите от значка</string>
   <string name="lockscreen_message">Нажмите значок слева или справа для изменения ярлыка экрана блокировки.</string>
   <string name="lockscreen_default_target">По умолчанию</string>
   <string name="select_application">Выбор приложения</string>
   <string name="lockscreen_choose_action_title">Выбор действия</string>
   <string name="lockscreen_none_target">Ничего</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Выберите действие</string>
   <string name="navbar_home_button">Домой</string>
   <string name="navbar_recent_button">Запущ. приложения</string>
@@ -37,19 +46,29 @@
   <string name="navbar_menu_big_button">Меню</string>
   <string name="accessibility_dpad_left">Курсор влево</string>
   <string name="accessibility_dpad_right">Курсор вправо</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Стереть данные</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Остановить</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Удалить</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Яркость</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Профили выключены.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Профиль: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Профили выключены.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Профиль изменён на <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Включение\u2026</string>
-  <string name="led_notification_title">Индикатор событий</string>
-  <string name="led_notification_text">Светодиод включен в настройках</string>
-  <string name="qs_tile_edit_header_instruction">Нажмите и удерживайте плитку для её перемещения</string>
-  <string name="quick_settings_edit_label">Изменить плитки</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Настройки яркости</string>
+  <string name="led_notification_text">Светодиод включен параметрами</string>
+  <string name="qs_tile_edit_header_instruction">Нажмите и удерживайте плитку для изменения</string>
+  <string name="quick_settings_edit_label">Редактировать плитки</string>
   <string name="quick_settings_cannot_delete_edit_tile">Невозможно удалить кнопку редактирования</string>
   <string name="qs_tiles_reset_confirmation">Восстановить набор плиток по умолчанию?</string>
   <string name="quick_settings_tile_reset_to_default">Восстановить стандартные</string>
@@ -58,19 +77,27 @@
   <string name="quick_settings_title_show_weather">Сведения о погоде</string>
   <string name="quick_settings_title_show_brightness_slider">Показывать регулятор яркости</string>
   <string name="quick_settings_title_enlarge_first_row">Увеличить первый ряд</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Это приложение останется активным, пока вы не отмените блокировку долгим нажатием кнопки «Назад».</string>
   <string name="quick_settings_custom_tile_detail_title">Пользовательская плитка</string>
   <string name="quick_settings_remove">Удалить плитку</string>
   <string name="quick_settings_network_adb_label">Отладка по сети</string>
   <string name="quick_settings_compass_label">Компас</string>
   <string name="quick_settings_nfc_label">NFC</string>
-  <string name="quick_settings_profiles">Системные профили</string>
+  <string name="quick_settings_profiles">Профили системы</string>
   <string name="quick_settings_profiles_off">Профили отключены</string>
   <string name="quick_settings_heads_up_label">Всплывающие уведомления</string>
   <string name="quick_settings_battery_saver_label">Энергосбережение</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Энергосбережение (идёт зарядка)</string>
+  <string name="quick_settings_caffeine_label">Запрет сна</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Синхронизация отключена.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Синхронизация включена.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Синхронизация отключена.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Синхронизация включена.</string>
   <string name="quick_settings_sync_label">Синхронизация</string>
   <string name="quick_settings_volume_panel_label">Панель громкости</string>
@@ -80,64 +107,121 @@
   <string name="quick_settings_ambient_display_label">Индикация событий</string>
   <string name="quick_settings_lockscreen_label_enforced">Блокировка экрана включена</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Отключено профилем</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Время до выключения экрана: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Время до выключения экрана изменено на <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Энергопотребление</string>
-  <string name="accessibility_quick_settings_perf_profile_pwrsv">Режим энергопотребления: экономия энергии.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">Режим энергопотребления: сберегающий.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Режим энергопотребления: сбалансированный.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Режим энергопотребления: высокая производительность.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Режим энергопотребления: энергоэффективный.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Режим энергопотребления: оптимальная производительность.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Режим энергопотребления изменён на режим экономии энергии.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Режим энергопотребления изменён на сберегающий.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Режим энергопотребления изменён на сбалансированный.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_perf">Режим энергопотребления изменён на режим высокой производительности.</string>
-  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Режим энергопотребления изменён на энергоэффективный.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">Режим энергопотребления изменён на производительный.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Режим энергопотребления изменён на эффективный.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Режим энергопотребления изменён на режим оптимальной производительности.</string>
   <string name="quick_settings_performance_profile_detail_title">Энергопотребление</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Экран блокировки выключен.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Экран блокировки включён.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Экран блокировки выключен.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Экран блокировки включён.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Индикация событий экраном отключена.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Индикация событий экраном включена.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Индикация событий экраном отключена.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Индикация событий экраном включена.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Всплывающие уведомления отключены.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Всплывающие уведомления включены.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Всплывающие уведомления отключены.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Всплывающие уведомления включены.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Переход в спящий режим разрешён.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Переход в спящий режим запрещён.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Режим энергосбережения выключен.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Режим энергосбережения включён.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Режим энергосбережения выключен.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Режим энергосбережения включён.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Динамическая плитка</string>
   <string name="dynamic_qs_tile_next_alarm_label">Следующий будильник</string>
   <string name="dynamic_qs_tile_ime_selector_label">Выбор метода ввода</string>
   <string name="dynamic_qs_tile_su_label">Суперпользователь</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay выключен.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay работает в автоматическом режиме.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay работает в дневном режиме.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay работает в ночном режиме.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay работает в режиме «на улице».</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay выключен.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay переключён в автоматический режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay переключён в дневной режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay переключён в ночной режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay переключён в режим «на улице».</string>
+  <string name="dynamic_qs_tile_themes_label">Темы</string>
   <string name="quick_settings_title_advanced_location">Параметры отправки геоданных</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Отправка местоположения: режим экономии батареи.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Отправка местоположения: только по GPS.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Отправка местоположения: режим высокой точности.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Определение местоположения</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">По координатам сети</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">По спутникам GPS</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">По всем источникам</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Служба отправки местоположения переключена в режим экономии батареи.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Для отправки местоположения используются только данные GPS.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Служба отправки местоположения переключена в режим высокой точности.</string>
   <string name="quick_settings_tiles_category_system">Системные плитки</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Добавление плитки</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Подключение к мобильной сети невозможно, пока включён режим полёта. Отключите его, а затем повторите попытку.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Фонарик включён</string>
-  <string name="quick_settings_tile_flashlight_not_summary">Нажмите для отключения</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Нажмите, чтобы отключить</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">Подключено %1$d устройство</item>
+    <item quantity="few">Подключены %1$d устройства</item>
+    <item quantity="other">Подключено %1$d устройств</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Нет SIM для моб. данных</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Заряд батареи док-станции <xliff:g id="number">%d</xliff:g> процентов.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Показать очередь воспроизведения</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g>, <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Проведите вниз, чтобы развернуть</string>
+  <string name="swipe_left_hint">Проведите влево, чтобы перейти к <xliff:g id="app_name">%1$s </xliff:g></string>
+  <string name="swipe_right_hint">Проведите вправо, чтобы перейти к уведомлениям</string>
 </resources>
diff --git a/packages/SystemUI/res/values-si-rLK/cm_arrays.xml b/packages/SystemUI/res/values-si-rLK/cm_arrays.xml
index e25e89b..edf575a 100644
--- a/packages/SystemUI/res/values-si-rLK/cm_arrays.xml
+++ b/packages/SystemUI/res/values-si-rLK/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>උතුර</item>
+    <!-- North -->
     <item>ඊශාන</item>
+    <!-- North east -->
     <item>නැගෙනහිර</item>
+    <!-- East -->
     <item>ගිනිකොන</item>
+    <!-- South east -->
     <item>දකුණ</item>
+    <!-- South -->
     <item>නිරිත</item>
+    <!-- South west -->
     <item>බටහිර</item>
+    <!-- West -->
     <item>වයඹ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-si-rLK/cm_strings.xml b/packages/SystemUI/res/values-si-rLK/cm_strings.xml
index 1cb2423..e4b7e46 100644
--- a/packages/SystemUI/res/values-si-rLK/cm_strings.xml
+++ b/packages/SystemUI/res/values-si-rLK/cm_strings.xml
@@ -16,6 +16,15 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">පැවරීමට ක්‍රියාවක් තෝරන්න</string>
   <string name="navbar_home_button">නිවස බොත්තම</string>
   <string name="navbar_recent_button">මෑත බොත්තම</string>
@@ -26,8 +35,76 @@
   <string name="navbar_menu_big_button">මෙනුව බොත්තම</string>
   <string name="accessibility_dpad_left">වම් කර්සරය</string>
   <string name="accessibility_dpad_right">දකුණු කර්සරය</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">යෙදුම් දත්ත පිහින්න</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">බලෙන් නවත්වන්න</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">අස්ථාපනය කරන්න</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_compass_init">අරඹමින්\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-sk/cm_arrays.xml b/packages/SystemUI/res/values-sk/cm_arrays.xml
index ca2178e..3c17f45 100644
--- a/packages/SystemUI/res/values-sk/cm_arrays.xml
+++ b/packages/SystemUI/res/values-sk/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>S</item>
+    <!-- North -->
     <item>SV</item>
+    <!-- North east -->
     <item>V</item>
+    <!-- East -->
     <item>JV</item>
+    <!-- South east -->
     <item>J</item>
+    <!-- South -->
     <item>JZ</item>
+    <!-- South west -->
     <item>Z</item>
+    <!-- West -->
     <item>SZ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-sk/cm_strings.xml b/packages/SystemUI/res/values-sk/cm_strings.xml
index 6be4ea1..68e99e4 100644
--- a/packages/SystemUI/res/values-sk/cm_strings.xml
+++ b/packages/SystemUI/res/values-sk/cm_strings.xml
@@ -16,12 +16,21 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Potiahnite doprava pre %1$s</string>
   <string name="right_shortcut_hint">Potiahnite doľava pre %1$s</string>
   <string name="select_application">Vyberte aplikáciu</string>
   <string name="lockscreen_choose_action_title">Vyberte akciu</string>
   <string name="lockscreen_none_target">Žiadna</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Vyberte akciu na priradenie</string>
   <string name="navbar_home_button">Tlačidlo Domov</string>
   <string name="navbar_recent_button">Tlačidlo Nedávne</string>
@@ -33,14 +42,25 @@
   <string name="navbar_menu_big_button">Tlačidlo Ponuka</string>
   <string name="accessibility_dpad_left">Kurzor vľavo</string>
   <string name="accessibility_dpad_right">Kurzor vpravo</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Vymazať údaje aplikácie</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Vynútiť zastavenie</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Odinštalovať</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profily vyp.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profily vypnuté.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil sa zmenil na <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Inicializácia\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Zobrazenie aktuálnej obrazovky je zaistené, dokým ju neuvoľníte. Dotknite a podržte tlačidlo Späť pre uvoľnenie.</string>
   <string name="quick_settings_custom_tile_detail_title">Vlastná dlaždica</string>
   <string name="quick_settings_remove">Odstrániť dlaždicu</string>
@@ -51,9 +71,14 @@
   <string name="quick_settings_profiles_off">Profily zakázané</string>
   <string name="quick_settings_heads_up_label">Plávajúce oznámenia</string>
   <string name="quick_settings_battery_saver_label">Šetrič batérie</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synch. vyp.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synch. zap.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synchronizácia vypnutá.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synchronizácia zapnutá.</string>
   <string name="quick_settings_sync_label">Synchronizácia</string>
   <string name="quick_settings_volume_panel_label">Panel hlasitosti</string>
@@ -62,58 +87,102 @@
   <string name="quick_settings_lockscreen_label">Obrazovka uzamknutia</string>
   <string name="quick_settings_ambient_display_label">Ambientné zobrazenie</string>
   <string name="quick_settings_lockscreen_label_enforced">Obrazovka uzamknutia povolená</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Časový limit obrazovky: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Časový limit obrazovky sa zmenil na <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Režim batérie</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Režim batérie: režim šetrenia energie.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Režim batérie: vyvážený režim.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Režim batérie: režim výkonu.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Režim batérie: efektívny režim.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Režim batérie: rýchly režim.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Režim batérie sa zmenil na režim šetrenia energie.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Režim batérie sa zmenil na vyvážený režim.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Režim batérie sa zmenil na režim výkonu.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Režim batérie sa zmenil na efektívny režim.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Režim batérie sa zmenil na výkonný režim.</string>
   <string name="quick_settings_performance_profile_detail_title">Režim batérie</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Obrazovka uzamknutia vyp.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Obrazovka uzamknutia zap.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Obrazovka uzamknutia vypnutá.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Obrazovka uzamknutia zapnutá.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambientné zobrazenie povolené.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambientné zobrazenie zakázané.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambientné zobrazenie povolené.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambientné zobrazenie zakázané.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Plávajúce oznámenia zakázané.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Plávajúce oznámenia povolené.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Plávajúce oznámenia zakázané.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Plávajúce oznámenia povolené.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Šetrič batérie vypnutý.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Šetrič batérie zapnutý.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Šetrič batérie vypnutý.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Šetrič batérie zapnutý.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamické dlaždice</string>
   <string name="dynamic_qs_tile_next_alarm_label">Ďalší budík</string>
   <string name="dynamic_qs_tile_ime_selector_label">Výber IME</string>
   <string name="dynamic_qs_tile_su_label">Root prístup</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay vyp.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automatický režim.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: denný režim.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: nočný režim.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: režim vonku.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay vypnutý.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay sa zmenil na automatický režim.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay sa zmenil na denný režim.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay sa zmenil na nočný režim.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay sa zmenil na režim vonku.</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Hlásenie polohy: režim šetrenia batérie.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Hlásenie polohy: režim iba so snímačmi.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Hlásenie polohy: režim vysokej presnosti.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Režimy polohy</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Šetrenie batérie</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Iba zariadenie</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Vysoká presnosť</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Hlásenie polohy sa zmenilo na režim šetrenia batérie.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Hlásenie polohy sa zmenilo na režim iba senzorov.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Hlásenie polohy sa zmenilo na režim vysokej presnosti.</string>
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Batéria doku <xliff:g id="number">%d</xliff:g> percent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Zobraziť poradie prehrávania</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-sl/cm_arrays.xml b/packages/SystemUI/res/values-sl/cm_arrays.xml
index ca2178e..3c17f45 100644
--- a/packages/SystemUI/res/values-sl/cm_arrays.xml
+++ b/packages/SystemUI/res/values-sl/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>S</item>
+    <!-- North -->
     <item>SV</item>
+    <!-- North east -->
     <item>V</item>
+    <!-- East -->
     <item>JV</item>
+    <!-- South east -->
     <item>J</item>
+    <!-- South -->
     <item>JZ</item>
+    <!-- South west -->
     <item>Z</item>
+    <!-- West -->
     <item>SZ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-sl/cm_strings.xml b/packages/SystemUI/res/values-sl/cm_strings.xml
index ac3c894..a0240f6 100644
--- a/packages/SystemUI/res/values-sl/cm_strings.xml
+++ b/packages/SystemUI/res/values-sl/cm_strings.xml
@@ -16,20 +16,29 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
-  <string name="left_shortcut_hint">Povlecite desno za %1$s</string>
-  <string name="right_shortcut_hint">Povlecite levo za %1$s</string>
-  <string name="lockscreen_message">Tapnite ikono na levi ali desni, da ponovno dodelite bližnjico zaslona za zaklepanje.</string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">Potegnite desno za %1$s</string>
+  <string name="right_shortcut_hint">Potegnite levo za %1$s</string>
+  <string name="lockscreen_message">Tapnite ikono na levi ali desni, da ponovno dodelite bližnjico zaklenjenega zaslona.</string>
   <string name="lockscreen_default_target">Privzeto</string>
   <string name="select_application">Izberite aplikacijo</string>
   <string name="lockscreen_choose_action_title">Izberite dejanje</string>
   <string name="lockscreen_none_target">Brez</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Izberite dejanje za dodelitev</string>
   <string name="navbar_home_button">Gumb Domov</string>
   <string name="navbar_recent_button">Gumb Nedavno</string>
-  <string name="navbar_search_button">Gumb Iskanje</string>
+  <string name="navbar_search_button">Gumb Išči</string>
   <string name="navbar_back_button">Gumb Nazaj</string>
   <string name="navbar_empty_button">Gumb Prazno</string>
   <string name="navbar_menu_conditional_button">Menijski gumb (sam. skrivanje)</string>
@@ -37,27 +46,38 @@
   <string name="navbar_menu_big_button">Menijski gumb</string>
   <string name="accessibility_dpad_left">Kazalec levo</string>
   <string name="accessibility_dpad_right">Kazalec desno</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Izbriši podatke aplikacije</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Vsili ustavitev</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Odstrani</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Svetlost lučke</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profili izklopljeni.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profili izklopljeni.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil spremenjen v <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Začenjanje \u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Nastavitve lučke</string>
   <string name="led_notification_text">Lučka LED omogočena v nastavitvah</string>
   <string name="qs_tile_edit_header_instruction">Pritisnite in pridržite ploščice za preurejanje</string>
   <string name="quick_settings_edit_label">Uredi ploščice</string>
   <string name="quick_settings_cannot_delete_edit_tile">Ploščice za urejanje ni mogoče izbrisati</string>
-  <string name="qs_tiles_reset_confirmation">Ponastavi ploščice hitrih nastavitev na privzeto nastavitev?</string>
+  <string name="qs_tiles_reset_confirmation">Ponastavi ploščice Hitrih nastavitev na privzeto nastavitev?</string>
   <string name="quick_settings_tile_reset_to_default">Ponastavi na privzeto razporeditev</string>
   <string name="quick_settings_title_header">Glava</string>
   <string name="quick_settings_title_tiles">Ploščice</string>
   <string name="quick_settings_title_show_weather">Prikaži vreme</string>
   <string name="quick_settings_title_show_brightness_slider">Prikaži drsnik za svetlost</string>
   <string name="quick_settings_title_enlarge_first_row">Povečaj prvo vrstico</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">To jo ohrani prikazano, dokler je ne odpnete. Tapnite in pridržite gumb Nazaj, da jo odpnete.</string>
   <string name="quick_settings_custom_tile_detail_title">Ploščica po meri</string>
   <string name="quick_settings_remove">Odstrani ploščico</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profili onemogočeni</string>
   <string name="quick_settings_heads_up_label">Obvestila na zaslonu</string>
   <string name="quick_settings_battery_saver_label">Ohranjevalnik baterije</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Ohranjevalnik baterije (polnjenje)</string>
   <string name="quick_settings_caffeine_label">Kofein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Sinhronizacija izklopljena.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Sinhronizacija vklopljena.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Sinhronizacija izklopljena.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Sinhronizacija vklopljena.</string>
   <string name="quick_settings_sync_label">Sinhronizacija</string>
   <string name="quick_settings_volume_panel_label">Plošča za glasnost</string>
@@ -79,68 +105,124 @@
   <string name="quick_settings_screen_timeout_detail_title">Časovna omejitev zaslona</string>
   <string name="quick_settings_lockscreen_label">Zakleni zaslon</string>
   <string name="quick_settings_ambient_display_label">Okoliški zaslon</string>
-  <string name="quick_settings_lockscreen_label_enforced">Vsiljen zaslon za zaklepanje</string>
+  <string name="quick_settings_lockscreen_label_enforced">Vsiljen zaklenjen zaslon</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Onemogočeno s profilom</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Časovna omejitev zaslona: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Časovna omejitev zaslona spremenjena na <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Način varčevanja energije</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Način varčevanja energije: način varčevanja.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Način varčevanja energije: uravnotežen način.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Način varčevanja energije: zmogljivostni način.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Način varčevanja energije: učinkoviti način.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Način varčevanja energije: hitri način.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Način varčevanja energije spremenjen v način varčevanja.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Način varčevanja energije spremenjen v uravnotežen način.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Način varčevanja energije spremenjen v zmogljivostni način.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Način varčevanja energije spremenjen v učinkoviti način.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Način varčevanja energije spremenjen v hitri način.</string>
   <string name="quick_settings_performance_profile_detail_title">Način varčevanja energije</string>
-  <string name="accessibility_quick_settings_lock_screen_off">Zaslon za zaklepanje izklopljen.</string>
-  <string name="accessibility_quick_settings_lock_screen_on">Zaslon za zaklepanje vklopljen.</string>
-  <string name="accessibility_quick_settings_lock_screen_changed_off">Zaslon za zaklepanje izklopljen.</string>
-  <string name="accessibility_quick_settings_lock_screen_changed_on">Zaslon za zaklepanje vklopljen.</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">Zaklepanje zaslona izklopljeno.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">Zaklepanje zaslona vklopljeno.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">Zaklepanje zaslona izklopljeno.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">Zaklepanje zaslona vklopljeno.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Okoliški zaslon izklopljen.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Okoliški zaslon vklopljen.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Okoliški zaslon izklopljen.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Okoliški zaslon vklopljen.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Obvestila na zas. izk.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Obvestila na zas. vkl.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Obvestila na zaslonu izklopljena.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Obvestila na zaslonu vklopljena.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Kofein izklopljen.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Kofein vklopljen.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Ohranjevalnik baterije izklopljen.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Ohranjevalnik baterije vklopljen.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Ohranjevalnik baterije izklopljen.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Ohranjevalnik baterije vklopljen.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dinamične ploščice</string>
   <string name="dynamic_qs_tile_next_alarm_label">Naslednja budilka</string>
   <string name="dynamic_qs_tile_ime_selector_label">Izbirnik IME</string>
   <string name="dynamic_qs_tile_su_label">Skrbniški dostop</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay izklopljen.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: samodejni način.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: dnevni način.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: nočni način.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: zunanji način.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay izklopljen.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay spremenjen v samodejni način.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay spremenjen v dnevni način.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay spremenjen v nočni način.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay spremenjen v zunanji način.</string>
+  <string name="dynamic_qs_tile_themes_label">Teme</string>
   <string name="quick_settings_title_advanced_location">Tri stanja lokacije</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Poročanje o lokaciji: način varčevanja energije.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Poročanje o lokaciji: način \'samo tipala\'.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Poročanje o lokaciji: način visoke natančnosti.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Način lokacije</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Varčevanje z energijo</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Samo naprava</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Visoka natančnost</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Poročanje o lokaciji spremenjeno v način varčevanja energije.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Poročanje o lokaciji spremenjeno v način \'samo tipala\'.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Poročanje o lokaciji spremenjen v način visoke natančnosti.</string>
   <string name="quick_settings_tiles_category_system">Sistemske ploščice</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Dodaj ploščico</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Povezava z mobilnimi omrežji ni možna v načinu za letalo. Onemogočite način za letalo in poskusite znova.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Svetilka je vklopljena</string>
   <string name="quick_settings_tile_flashlight_not_summary">Tapnite, če želite izklopiti</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d odjemalec</item>
+    <item quantity="two">%1$d odjemalca</item>
+    <item quantity="few">%1$d odjemalci</item>
+    <item quantity="other">%1$d odjemalcev</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Ni podatkovne kartice SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level"><xliff:g id="number">%d</xliff:g> odstotkov baterije v postaji.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Prikaži čak. vrsto pred.</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Za razširitev potegnite navzdol</string>
+  <string name="swipe_left_hint">Za <xliff:g id="app_name">%1$s</xliff:g> potegnite levo</string>
+  <string name="swipe_right_hint">Za obvestila potegnite desno</string>
 </resources>
diff --git a/packages/SystemUI/res/values-sq-rAL/cm_arrays.xml b/packages/SystemUI/res/values-sq-rAL/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-sq-rAL/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-sq-rAL/cm_strings.xml b/packages/SystemUI/res/values-sq-rAL/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-sq-rAL/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-sr/cm_arrays.xml b/packages/SystemUI/res/values-sr/cm_arrays.xml
index 977ddf0..ed1ef4d 100644
--- a/packages/SystemUI/res/values-sr/cm_arrays.xml
+++ b/packages/SystemUI/res/values-sr/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>С</item>
+    <!-- North -->
     <item>СИ</item>
+    <!-- North east -->
     <item>И</item>
+    <!-- East -->
     <item>ЈИ</item>
+    <!-- South east -->
     <item>Ј</item>
+    <!-- South -->
     <item>ЈЗ</item>
+    <!-- South west -->
     <item>З</item>
+    <!-- West -->
     <item>СЗ</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-sr/cm_strings.xml b/packages/SystemUI/res/values-sr/cm_strings.xml
index d17f8e5..8bf4c5e 100644
--- a/packages/SystemUI/res/values-sr/cm_strings.xml
+++ b/packages/SystemUI/res/values-sr/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA +</string>
-  <string name="accessibility_data_connection_4g_plus">4G +</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Превуци десно за %1$s</string>
   <string name="right_shortcut_hint">Превуци лево за %1$s</string>
   <string name="lockscreen_message">Додирни икону лево или десно да доделиш пречицу за закључани екран.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Изабери апликацију</string>
   <string name="lockscreen_choose_action_title">Изабери акцију</string>
   <string name="lockscreen_none_target">Ниједан</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Изабери акцију да доделиш</string>
   <string name="navbar_home_button">Главно дугме</string>
   <string name="navbar_recent_button">Дугме за Недавно</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Дугме за Мени</string>
   <string name="accessibility_dpad_left">Курсор лево</string>
   <string name="accessibility_dpad_right">Курсор десно</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Избриши податке апликације</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Приморај заустављање</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Деинсталирај</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Осветљење</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Профили искључени.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Профил: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Профили су искључени.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Профил је промењен у <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Покретање\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Поставке светла</string>
   <string name="led_notification_text">LED светло омогућено помоћу поставки</string>
   <string name="qs_tile_edit_header_instruction">Притисни и држи плочицу за реорганизацију</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Покажи време</string>
   <string name="quick_settings_title_show_brightness_slider">Прикажи клизач оветљености</string>
   <string name="quick_settings_title_enlarge_first_row">Увећајте први ред</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Ово задржава преглед док га не уклониш. Додирни и држи дугме за назад да уклониш.</string>
   <string name="quick_settings_custom_tile_detail_title">Промени назив</string>
   <string name="quick_settings_remove">Уклони назив</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Профили онемогућени</string>
   <string name="quick_settings_heads_up_label">Искачуће поруке</string>
   <string name="quick_settings_battery_saver_label">Уштеда батерије</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Чувар батерије (пуњење)</string>
   <string name="quick_settings_caffeine_label">Кофеин</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Синхрон. искључено.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Синхрон. укључено.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Синхронизација је искључена.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Синхронизација је укључена.</string>
   <string name="quick_settings_sync_label">Синхрон</string>
   <string name="quick_settings_volume_panel_label">Панел гласноће</string>
@@ -81,66 +107,121 @@
   <string name="quick_settings_ambient_display_label">Амбијент приказ</string>
   <string name="quick_settings_lockscreen_label_enforced">Присилно закључани екран</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Онемогућено профилом</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Време искључења екрана: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Време искључења екрана промењено у <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Режим батерије</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Режим батерије: режим уштеде енергије.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Режим батерије: балансирани режим.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Режим батерије: режим учинка.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Режим батерије: режим ефикасности.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Режим батерије: режим брзине.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Режим батерије промењен у режим уштеде енергије.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Режим батерије промењен у балансирани режим.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Режим батерије промењен у режим учинка.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Режим батерије промењен у режим ефикасности.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Режим батерије промењен у режим брзине.</string>
   <string name="quick_settings_performance_profile_detail_title">Режим батерије</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Закључани екран искључен.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Закључани екран укључен.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Закључани екран је искључен.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Закључани екран је укључен.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Амбијент приказ искључен.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Амбијент приказ укључен.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Амбијент приказ ће бити искључен.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Амбијент приказ ће бити укључен.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Искачуће поруке искључене.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Искачуће поруке укључене.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Искачуће поруке ће бити искључене.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Искачуће поруке ће бити укључене.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Кофеин је искључен.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Кофеин је укључен.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Уштеда батерије искључена.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Уштеда батерије укључена.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Уштеда батерије је искључена.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Уштеда батерије је укључена.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Динамичне плочице</string>
   <string name="dynamic_qs_tile_next_alarm_label">Следећи аларм</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME бирач</string>
   <string name="dynamic_qs_tile_su_label">Root приступ</string>
-  <string name="accessibility_quick_settings_live_display_off">Активни екран искључен.</string>
-  <string name="accessibility_quick_settings_live_display_auto">Активни Екран: ауто режим.</string>
-  <string name="accessibility_quick_settings_live_display_day">Активни Екран: дневни режим.</string>
-  <string name="accessibility_quick_settings_live_display_night">Активни Екран: ноћни режим.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">Активни Екран: режим на отвореном.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">Активни Екран је искључен.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">Активни Екран промењен у ауто режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">Активни Екран промењен у дневни режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">Активни Екран промењен у ноћни режим.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">Активни Екран промењен у режим на отвореном.</string>
+  <string name="dynamic_qs_tile_themes_label">Теме</string>
   <string name="quick_settings_title_advanced_location">Локација три-државе</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Локација извештај: режим чувања батерије.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Локација извештај: режим само сензори.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Локација извештај: режим високе тачности.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Режими локације</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Уштеда батерије</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Само уређај</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Велика прецизност</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Извештај о локацији промењен у режим уштеде батерије.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Извештај о локацији промењен у режим само сензора.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Извештај о локацији промењен у режим високе прецизности.</string>
   <string name="quick_settings_tiles_category_system">Плочице система</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Додај плочицу</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Није се могуће конектовати на мобилне мреже док је режим авиона омогућен. Онемогући режим авиона и пробај поново.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Блиц је укључен</string>
   <string name="quick_settings_tile_flashlight_not_summary">Додирни да угасиш</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d клијент</item>
+    <item quantity="few">%1$d клијента</item>
+    <item quantity="other">%1$d клијента</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Нема SIM-а за податке</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Батерија <xliff:g id="number">%d</xliff:g> процената.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Прикажи на чекању</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">Листај надоле да би проширио</string>
+  <string name="swipe_left_hint">Замах на лево за <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">Замах на десно за обавештења</string>
 </resources>
diff --git a/packages/SystemUI/res/values-sv/cm_arrays.xml b/packages/SystemUI/res/values-sv/cm_arrays.xml
index fe795f4..bdbe6b4 100644
--- a/packages/SystemUI/res/values-sv/cm_arrays.xml
+++ b/packages/SystemUI/res/values-sv/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NO</item>
+    <!-- North east -->
     <item>O</item>
+    <!-- East -->
     <item>SO</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SV</item>
+    <!-- South west -->
     <item>V</item>
+    <!-- West -->
     <item>NV</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-sv/cm_strings.xml b/packages/SystemUI/res/values-sv/cm_strings.xml
index 73840fc..0363610 100644
--- a/packages/SystemUI/res/values-sv/cm_strings.xml
+++ b/packages/SystemUI/res/values-sv/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Svep höger för %1$s</string>
   <string name="right_shortcut_hint">Svep vänster för %1$s</string>
   <string name="lockscreen_message">Tryck på en ikon till vänster eller höger för att tilldela en låsskärmgenväg.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Välj app</string>
   <string name="lockscreen_choose_action_title">Välj åtgärd</string>
   <string name="lockscreen_none_target">Ingen</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Välj åtgärd att tilldela</string>
   <string name="navbar_home_button">Hemknapp</string>
   <string name="navbar_recent_button">Senasteknapp</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Menyknapp</string>
   <string name="accessibility_dpad_left">Markör till vänster</string>
   <string name="accessibility_dpad_right">Markör till höger</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Rensa appdata</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Tvinga avslutning</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Avinstallera</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Ljusstyrka</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiler av.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiler har stängts av.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Profil ändrades till <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Initierar\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Ljusinställningar</string>
   <string name="led_notification_text">LED-ljus aktiverat av inställningar</string>
   <string name="qs_tile_edit_header_instruction">Tryck och håll brickor för att arrangera om</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">Visa väder</string>
   <string name="quick_settings_title_show_brightness_slider">Visa Ljusstyrkereglaget</string>
   <string name="quick_settings_title_enlarge_first_row">Förstora första raden</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Detta håller den synlig tills du frigör den. Tryck och håll nere Bakåt-knappen för att frigöra.</string>
   <string name="quick_settings_custom_tile_detail_title">Anpassad bricka</string>
   <string name="quick_settings_remove">Ta bort bricka</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">Profiler inaktiverad</string>
   <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="quick_settings_battery_saver_label">Strömsparläge</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Batterisparfunktion (laddar)</string>
   <string name="quick_settings_caffeine_label">Koffein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Synk av.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Synk på.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Synk inaktiverad.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Synk aktiverad.</string>
   <string name="quick_settings_sync_label">Synk</string>
   <string name="quick_settings_volume_panel_label">Volympanel</string>
@@ -81,66 +107,115 @@
   <string name="quick_settings_ambient_display_label">Ambient display</string>
   <string name="quick_settings_lockscreen_label_enforced">Tvingad låsskärm</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">Inaktiverad av profil</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Skärm-timeout: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Skärm-timeout ändrades till <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Batteriläge</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Batteriläge: energisparläge.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Batteriläge: balanserat läge.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Batteriläge: prestandaläge.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Batteriläge: strömsparande läge.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Batteriläge: prestandaläge.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Batteriläge ändrat till energisparläge.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Batteriläge ändrat till balanserat läge.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Batteriläge ändrat till prestandaläge.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Batteriläge ändrat till strömsparande läge.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Batteriläge ändrat till prestandaläge.</string>
   <string name="quick_settings_performance_profile_detail_title">Batteriläge</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Låsskärm av.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Låsskärm på.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Låsskärm inaktiverad.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Låsskärm aktiverad.</string>
-  <string name="accessibility_quick_settings_ambient_display_off">Ambient display avslagen.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">Ambient display av.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display påslagen.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient display avslagen.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display påslagen.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Heads up av.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Heads up på.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads up avslaget.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Heads up påslaget.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_off">Koffein av.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_caffeine_on">Koffein på.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Strömsparläge är inaktiverat.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Strömsparläge är aktiverat.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Strömsparläge inaktiverat.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Strömsparläge aktiverat.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dynamiska bricka</string>
   <string name="dynamic_qs_tile_next_alarm_label">Nästa alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME-väljare</string>
   <string name="dynamic_qs_tile_su_label">Root-åtkomst</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay av.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: automatiskt läge.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: dagläge.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: nattläge.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: utomhusläge.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay inaktiverad.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay ändrad till auto-läge.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay ändrad till dagläge.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay ändrad till nattläge.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay ändrad till utomhusläge.</string>
   <string name="quick_settings_title_advanced_location">Tri-state placering</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Platsrapportering: batterisparläge.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Platsrapportering: endast sensorläge.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Platsrapportering: högt precisionsläge.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Platsläge</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Batterisparläge</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Endast enhet</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Hög noggrannhet</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Platsrapportering ändrades till batterispararläge.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Platsrapportering ändrad till endast sensor.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Platsrapportering ändrad till hög noggrannhet.</string>
   <string name="quick_settings_tiles_category_system">Systembrickor</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Lägg till en bricka</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">Det går inte att ansluta till mobila nät när flygplansläge är aktiverat. Inaktivera flygplansläge och försök igen.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">Ficklampan är på</string>
   <string name="quick_settings_tile_flashlight_not_summary">Tryck för att stänga av</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d klient</item>
+    <item quantity="other">%1$d klienter</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Inget data SIM</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Dockningsstationens batteri<xliff:g id="number">%d</xliff:g> procent.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Visa uppspelningskö</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-sw/cm_arrays.xml b/packages/SystemUI/res/values-sw/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-sw/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-sw/cm_strings.xml b/packages/SystemUI/res/values-sw/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-sw/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/cm_arrays.xml b/packages/SystemUI/res/values-ta-rIN/cm_arrays.xml
new file mode 100644
index 0000000..3110756
--- /dev/null
+++ b/packages/SystemUI/res/values-ta-rIN/cm_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>N</item>
+    <!-- North -->
+    <item>NE</item>
+    <!-- North east -->
+    <item>E</item>
+    <!-- East -->
+    <item>SE</item>
+    <!-- South east -->
+    <item>S</item>
+    <!-- South -->
+    <item>SW</item>
+    <!-- South west -->
+    <item>W</item>
+    <!-- West -->
+    <item>NW</item>
+    <!-- North west -->
+  </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-ta-rIN/cm_strings.xml b/packages/SystemUI/res/values-ta-rIN/cm_strings.xml
new file mode 100644
index 0000000..eb45d15
--- /dev/null
+++ b/packages/SystemUI/res/values-ta-rIN/cm_strings.xml
@@ -0,0 +1,215 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">%1$sக்காக வலதுபுறம் தேய்.</string>
+  <string name="right_shortcut_hint">%1$sக்காக இடதுபுறம் தேய்.</string>
+  <string name="lockscreen_message">ஒரு லாக் திரை குறுக்குவழியை மறுசீரமைக்க இடது அல்லது வலதுபுறம் உள்ள ஐகானை தட்டு</string>
+  <string name="lockscreen_default_target">இயல்புநிலை</string>
+  <string name="select_application">பயன்பாட்டைத் தேர்ந்தெடுக்கவும்</string>
+  <string name="lockscreen_choose_action_title">செயல்பாட்டை தேர்வுசெய்</string>
+  <string name="lockscreen_none_target">ஏதுமில்லை</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">ஒதுக்குவதற்கான செயலை தேர்வுசெய்</string>
+  <string name="navbar_home_button">முகப்பு பட்டன்</string>
+  <string name="navbar_recent_button">சமீபத்திய பொத்தான்</string>
+  <string name="navbar_search_button">பட்டனை தேடுதல்</string>
+  <string name="navbar_back_button">பின்செல் பொத்தான்</string>
+  <string name="navbar_empty_button">வெறுமை பொத்தான்</string>
+  <string name="navbar_menu_conditional_button">மெனு(autoHide) பொத்தான்</string>
+  <string name="navbar_menu_always_button">மெனு(alwaysShow) பொத்தான்</string>
+  <string name="navbar_menu_big_button">மெனு பொத்தான்</string>
+  <string name="accessibility_dpad_left">இடஞ்சுட்டி இடது</string>
+  <string name="accessibility_dpad_right">இடஞ்சுட்டி வலது</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">பயன்பாட்டு தரவை துடைக்க</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">உடனே நிறுத்து</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">நிறுவல்நீக்கு</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">ஒளி ஒளிர்வு</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">சுயவிவரங்கள் ஆஃப்.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">சுயவிவரம்: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">சுயவிவரங்கள் ஆஃப் செய்யப்பட்டன.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">சுயவிவரம் <xliff:g id="profile" example="Default">%s</xliff:g>க்கு மாற்றப்பட்டது.</string>
+  <string name="quick_settings_compass_init">துவக்குகிறது\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">ஒளி அமைப்புகள்</string>
+  <string name="led_notification_text">LED ஒளி அமைப்பினால் செயல்படுத்தப்படுதல்</string>
+  <string name="qs_tile_edit_header_instruction">மறு ஒழுங்கமைக்க ஓடுகளை அழுத்தி பிடித்துக்கொள்ளவும்</string>
+  <string name="quick_settings_edit_label">ஓடுகளை திருத்து</string>
+  <string name="quick_settings_cannot_delete_edit_tile">ஒட்டு திருத்தத்தை நீக்க முடியாது</string>
+  <string name="qs_tiles_reset_confirmation">விரைவு அமைப்புகள் டைல்களை இயல்புநிலை கட்டமைப்புக்கு மீட்டமைக்கவா?</string>
+  <string name="quick_settings_tile_reset_to_default">இயல்புநிலை தளவமைப்புக்கு மீட்டமை</string>
+  <string name="quick_settings_title_header">மேற்குறிப்பு</string>
+  <string name="quick_settings_title_tiles">ஓடுகள்</string>
+  <string name="quick_settings_title_show_weather">வானிலையை காட்டு</string>
+  <string name="quick_settings_title_show_brightness_slider">பிரகாச ஸ்லைடரை காட்டு</string>
+  <string name="quick_settings_title_enlarge_first_row">முதல் வரிசையை பெரிதாக்கு</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">நீங்கள் பின்நீக்கு செய்யும்வரை இது காட்சியில் வைக்கும். பின்நீக்கு செய்ய பின்செல் பொத்தானை தொட்டு பிடித்துக்கொள்.</string>
+  <string name="quick_settings_custom_tile_detail_title">தனிப்பயன் ஓடு</string>
+  <string name="quick_settings_remove">டைலை அகற்று</string>
+  <string name="quick_settings_network_adb_label">பிணையத்தின் மீது ADB</string>
+  <string name="quick_settings_compass_label">காம்பஸ்</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">சிஸ்டம் சுயவிவரங்கள்</string>
+  <string name="quick_settings_profiles_off">சுயவிவரங்கள் முடக்கப்பட்டன</string>
+  <string name="quick_settings_heads_up_label">ஹெட்ஸ் அப்</string>
+  <string name="quick_settings_battery_saver_label">பேட்டரி சேமிப்பான்</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">கேஃபைன்</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">ஒத்திசைவு ஆஃப்</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">ஒத்திசைவு ஆன்</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">ஒத்திசைவு அணைக்கப்பட்டது</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">ஒத்திசைவு துவக்கப்பட்டது</string>
+  <string name="quick_settings_sync_label">ஒத்திசை</string>
+  <string name="quick_settings_volume_panel_label">வால்யூம் பேனல்</string>
+  <string name="quick_settings_usb_tether_label">USB டெதெரிங்</string>
+  <string name="quick_settings_screen_timeout_detail_title">திரை டைமவுட்</string>
+  <string name="quick_settings_lockscreen_label">பூட்டுத் திரை</string>
+  <string name="quick_settings_ambient_display_label">சூழல்சார் திரை</string>
+  <string name="quick_settings_lockscreen_label_enforced">பூட்டுத் திரை அமலாக்கப்பட்டது</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">சுயவிவரம் முடக்கப்பட்டது</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">திரை நேரம்முடிவு: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">திரை நேரம்முடிவு <xliff:g id="timeout" example="30 seconds">%s</xliff:g>க்கு மாற்றப்பட்டது.</string>
+  <string name="qs_tile_performance">பேட்டரி முறை</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">மின்கல பயன்முறை: மின்சக்தி பயன்முறை.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">மின்கல பயன்முறை: சமச்சீரான பயன்முறை.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">மின்கல பயன்முறை: செயல்திறன் பயன்முறை.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">மின்கல பயன்முறை: ஆற்றல் பயன்முறை</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">மின்கல பயன்முறை: விரைவு பயன்முறை</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">மின்கல பயன்முறை மின்சக்தி சேமிப்பு பயன்முறைக்கு மாற்றப்பட்டது.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">மின்கல பயன்முறை சமச்சீரான பயன்முறைக்கு மாற்றப்பட்டது.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">மின்கல பயன்முறை செயல்திறன் பயன்முறைக்கு மாற்றப்பட்டது.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">மின்கல பயன்முறை ஆற்றல் பயன்முறைக்கு மாற்றப்பட்டது.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">மின்கல பயன்முறை விரைவு பயன்முறைக்கு மாறியது.</string>
+  <string name="quick_settings_performance_profile_detail_title">பேட்டரி முறை</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">பூட்டுத் திரை ஆஃப்.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">பூட்டுத் திரை ஆன்.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">பூட்டுத் திரை ஆஃப் செய்யப்பட்டது</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">பூட்டுத் திரை ஆன் செய்யப்பட்டது</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">சூழல் காட்சி ஆஃப்.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">சூழல் காட்சி ஆன்.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">சூழல் காட்சி ஆஃப் செய்யப்பட்டது.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">சூழல் காட்சி ஆன் செய்யப்பட்டது.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">ஹெட்ஸ் அப் ஆஃப்.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">ஹெட்ஸ் அப் ஆன்.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">ஹெட்ஸ் அப் ஆஃப் செய்யப்பட்டது.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">ஹெட்ஸ் அப் ஆன் செய்யப்பட்டது.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">கேஃபைன் ஆஃப்.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">கேஃபைன் ஆன்.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">பேட்டரி பாதுகாப்பான் ஆஃப்</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">பேட்டரி சேமிப்பான் ஆன்</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">பேட்டரி பாதுகாப்பான் அணைக்கப்பட்டது</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">பேட்டரி பாதுகாப்பான் துவக்கப்பட்டது</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">இயங்குநிலை டைல்</string>
+  <string name="dynamic_qs_tile_next_alarm_label">அடுத்த அலாரம்</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME தேர்ந்தெடுப்பான்</string>
+  <string name="dynamic_qs_tile_su_label">மூல அணுகல்</string>
+  <string name="quick_settings_title_advanced_location">மூன்று-நிலை இருப்பிடம்</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">இருப்பிடம் அறிவித்தல்: மின்கல சேமிப்பு பயன்முறை.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">இருப்பிடம் அறிவித்தல்: உணர்கருவிகள் மட்டும் பயன்முறை.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">இருப்பிடம் அறிவித்தல்: உயர் துல்லிய பயன்முறை.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">இருப்பிடப் பயன்முறை</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">பேட்டரி சேமிப்பு</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">சாதனம் மட்டும்</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">அதிக துல்லியத்தன்மை</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">இருப்பிடம் அறிவித்தல் மின்கல சேமிப்பு பயன்முறைக்கு மாற்றப்பட்டது.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">இருப்பிடம் அறிவித்தல் உணர்கருவிகள் மட்டும் பயன்முறைக்கு மாற்றப்பட்டது.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">இருப்பிடம் அறிவித்தல் உயர் துல்லிய பயன்முறைக்கு மாற்றப்பட்டது.</string>
+  <string name="quick_settings_tiles_category_system">கணினி ஓடுகள்</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">ஒரு ஓட்டை சேர்</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">விமான பயன்முறை செயல்படுத்தப்பட்டு இருக்கும்போது மொபைல் பிணையங்களை இணைக்க முடியவில்லை. விமான பயன்முறையை முடக்கிவிட்டு மீண்டும் முயற்சிக்கவும்.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ஃபிளாஷ்லைட் இயக்கத்தில் உள்ளது</string>
+  <string name="quick_settings_tile_flashlight_not_summary">ஆஃப் செய்ய தட்டவும்</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">பொருத்தப்பட்ட மின்கல <xliff:g id="number">%d</xliff:g> சதவிகிதம்.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">இயக்கு சாரை காண்பி</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-te-rIN/cm_arrays.xml b/packages/SystemUI/res/values-te-rIN/cm_arrays.xml
new file mode 100644
index 0000000..3110756
--- /dev/null
+++ b/packages/SystemUI/res/values-te-rIN/cm_arrays.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <string-array name="cardinal_directions">
+    <item>N</item>
+    <!-- North -->
+    <item>NE</item>
+    <!-- North east -->
+    <item>E</item>
+    <!-- East -->
+    <item>SE</item>
+    <!-- South east -->
+    <item>S</item>
+    <!-- South -->
+    <item>SW</item>
+    <!-- South west -->
+    <item>W</item>
+    <!-- West -->
+    <item>NW</item>
+    <!-- North west -->
+  </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-te-rIN/cm_strings.xml b/packages/SystemUI/res/values-te-rIN/cm_strings.xml
new file mode 100644
index 0000000..aee0b52
--- /dev/null
+++ b/packages/SystemUI/res/values-te-rIN/cm_strings.xml
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">హెచ్ఎస్పిఎ+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
+  <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <string name="left_shortcut_hint">%1$s కొరకు కుడి వైపుకు స్వైప్ చేయుము</string>
+  <string name="right_shortcut_hint">%1$s కొరకు ఎడమ వైపుకు స్వైప్ చేయుము</string>
+  <string name="lockscreen_message">లాక్ స్క్రీన్ సత్వరమార్గాన్ని తిరిగి కేటాయించేందుకు ఎడమ లేదా కుడి వైపున ఉన్న చిహ్నం పైన ట్యాప్ చేయండి.</string>
+  <string name="lockscreen_default_target">డిఫాల్ట్</string>
+  <string name="select_application">అనువర్తనాన్ని ఎంచుకోండి</string>
+  <string name="lockscreen_choose_action_title">కార్యాచరణను ఎంచుకోండి</string>
+  <string name="lockscreen_none_target">ఏదీ లేదు</string>
+  <!-- Dialog title for navigation bar button selection -->
+  <string name="navbar_dialog_title">కేటాయించేందుకు చర్యను ఎంచుకొనుము</string>
+  <string name="navbar_home_button">హోమ్ బటన్</string>
+  <string name="navbar_recent_button">ఇటీవలి బటన్</string>
+  <string name="navbar_search_button">శోధన బటన్</string>
+  <string name="navbar_back_button">బ్యాక్ బటన్</string>
+  <string name="navbar_empty_button">ఖాళీ బటన్</string>
+  <string name="navbar_menu_conditional_button">మెనూ (ఆటోహైడ్) బటన్</string>
+  <string name="navbar_menu_always_button">మెనూ (ఆల్వేస్ షో) బటన్</string>
+  <string name="navbar_menu_big_button">మెనూ బటన్</string>
+  <string name="accessibility_dpad_left">కర్సర్ ఎడమకి</string>
+  <string name="accessibility_dpad_right">కర్సర్ కుడికి</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <string name="advanced_dev_option_wipe_app">ప్రోగ్రాం డేటాను తుడిపివేయుము</string>
+  <!-- Title shown in recents popup for force stopping the application -->
+  <string name="advanced_dev_option_force_stop">నిర్బంధ ఆపివేత</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <string name="advanced_dev_option_uninstall">అన్ఇన్‌స్టాల్ చేయి</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">లైట్ ప్రకాశవంతం</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">ప్రోఫైళ్ళు ఆఫ్.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">ప్రొఫైల్: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">ప్రోఫైళ్ళు ఆపివేయబడినవి.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">ప్రొఫైల్ <xliff:g id="profile" example="Default">%s</xliff:g>కు మార్చబడింది.</string>
+  <string name="quick_settings_compass_init">ప్రారంభించబడుతోంది\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">లైట్ సెట్టింగ్స్</string>
+  <string name="led_notification_text">సెట్టింగ్సుచే చేతనపరచబడిన LED లైట్</string>
+  <string name="qs_tile_edit_header_instruction">తిరిగి అమర్చడానికి టైల్స్ ను నొక్కి పట్టుకోండి</string>
+  <string name="quick_settings_edit_label">టైల్స్ ను సంకలనం చేయండి</string>
+  <string name="quick_settings_cannot_delete_edit_tile">సంకలన టైల్ ను తొలగించలేకపోయింది</string>
+  <string name="qs_tiles_reset_confirmation">స్వయంసిద్ధ నిర్మితీకరణకు త్వరిత సెట్టింగ్‌ల టైల్స్ ను రీసెట్ చేయాలా?</string>
+  <string name="quick_settings_tile_reset_to_default">స్వయంసిద్ధ లేవుట్‌ కు రీసెట్ చేయి</string>
+  <string name="quick_settings_title_header">శీర్షిక</string>
+  <string name="quick_settings_title_tiles">టైల్స్</string>
+  <string name="quick_settings_title_show_weather">వాతావరణాన్ని చూపించు</string>
+  <string name="quick_settings_title_show_brightness_slider">ప్రకాశం స్థితి నిర్థారణిను చూపుము</string>
+  <string name="quick_settings_title_enlarge_first_row">మొదటి వరుసను పెద్దది చేయుము</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">మీరు అన్పిన్ చేసేంతవరకు ఇది దానిని వీక్షణలో ఉంచుతుంది. అన్పిన్ చేసేందుకు బ్యాక్ బటనును తాకి అంతే పట్టుకోండి.</string>
+  <string name="quick_settings_custom_tile_detail_title">అనుకూలీకరించిన టైల్</string>
+  <string name="quick_settings_remove">టైలును తొలిగించుము</string>
+  <string name="quick_settings_network_adb_label">ADB ఓవర్ నెట్వర్క్</string>
+  <string name="quick_settings_compass_label">దిక్సూచి</string>
+  <string name="quick_settings_nfc_label">NFC</string>
+  <string name="quick_settings_profiles">సిస్టమ్ ప్రోఫైళ్ళు</string>
+  <string name="quick_settings_profiles_off">ప్రోఫైళ్ళు నిలిపివేయబడ్డాయి</string>
+  <string name="quick_settings_heads_up_label">హెచ్చరిక</string>
+  <string name="quick_settings_battery_saver_label">బ్యాటరీ సేవర్</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_caffeine_label">కాఫిన్</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">సమకాలీకరణ ఆఫ్.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">సమకాలీకరణ ఆన్.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">సమకాలీకరణ ఆపివేయబడింది.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">సమకాలీకరణ ఆన్ చేయబడింది.</string>
+  <string name="quick_settings_sync_label">సమకాలీకరణ</string>
+  <string name="quick_settings_volume_panel_label">వాల్యూమ్ ప్యానల్</string>
+  <string name="quick_settings_usb_tether_label">USB టీథరింగ్</string>
+  <string name="quick_settings_screen_timeout_detail_title">స్క్రీన్ సమయం ముగిసింది</string>
+  <string name="quick_settings_lockscreen_label">స్క్రీన్‌ను లాక్ చేయడం</string>
+  <string name="quick_settings_ambient_display_label">యాంబియెంట్ డిస్‌ప్లే</string>
+  <string name="quick_settings_lockscreen_label_enforced">లాక్ స్క్రీన్ అమలు</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">ప్రొఫైల్‌ను నిలిపివెయ్యబడింది</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">స్క్రీన్ సమయం ముగిసింది: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">స్క్రీన్ ముగింపు సమయం <xliff:g id="timeout" example="30 seconds">%s</xliff:g>కు మార్చబడింది.</string>
+  <string name="qs_tile_performance">బ్యాటరీ మోడ్</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">బ్యాటరీ మోడ్: పవర్ సేవ్ మోడ్.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">బ్యాటరీ మోడ్: సంతులిత మోడ్.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">బ్యాటరీ మోడ్: పనితనపు మోడ్.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">బ్యాటరీ మోడ్: సమర్థత మోడ్.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">బ్యాటరీ మోడ్: త్వరిత మోడ్.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">బ్యాటరీ మోడ్ పవర్ సేవ్ మోడుకు మార్చబడింది.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">బ్యాటరీ మోడ్ సంతులిత మోడుకు మార్చబడింది.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">బ్యాటరీ మోడ్ పనితనపు మోడుకు మార్చబడింది.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">బ్యాటరీ మోడ్ సమర్థత మోడుకు మార్చబడింది.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">బ్యాటరీ మోడ్ త్వరిత మోడుకు మార్చబడింది.</string>
+  <string name="quick_settings_performance_profile_detail_title">బ్యాటరీ మోడ్</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">లాక్ స్క్రీన్ ఆఫ్.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">లాక్ స్క్రీన్ ఆన్.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">లాక్ స్క్రీన్ ఆపివేయబడింది.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">లాక్ స్క్రీన్ ఆన్ చేయబడింది.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">పరిసర ప్రదర్శన ఆఫ్.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">పరిసర ప్రదర్శన ఆన్.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">పరిసర ప్రదర్శన ఆపివేయబడింది.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">పరిసర ప్రదర్శన ఆన్ చేయబడింది.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">హెచ్చరిక ఆఫ్.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">హెచ్చరిక ఆన్.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">హెచ్చరిక ఆపివేయబడింది.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">హెచ్చరిక ఆన్ చేయబడింది.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">కాఫిన్ ఆఫ్</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">కాఫిన్ ఆన్</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">బ్యాటరీ సేవర్ ఆఫ్.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">బ్యాటరీ సేవర్ ఆన్.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">బ్యాటరీ సేవర్ ఆఫ్ చేయబడింది</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">బ్యాటరీ సేవర్ ఆన్ చేయబడింది.</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">డైనమిక్ టైల్</string>
+  <string name="dynamic_qs_tile_next_alarm_label">తరువాతి అలారం</string>
+  <string name="dynamic_qs_tile_ime_selector_label">IME సెలక్టర్</string>
+  <string name="dynamic_qs_tile_su_label">మూల ప్రాప్తి</string>
+  <string name="quick_settings_title_advanced_location">మూడు-స్థితుల స్థానం</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_battery_saving">స్థాన నివేదిక: బ్యాటరీ సేవింగ్ మోడ్.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_gps_only">స్థాన నివేదిక: సెన్సార్లు మాత్రమే మోడ్.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_high_accuracy">స్థాన నివేదిక: అధిక ఖచ్చితత్వ మోడ్.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_detail_title">స్థానం మోడ్</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_battery_saving_label">బ్యాటరీ ఆదా</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_gps_only_label">పరికరం మాత్రమే</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <string name="quick_settings_location_high_accuracy_label">అధిక నిర్దుష్టత</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">స్థాన నివేదిక బ్యాటరీ సేవింగ్ మోడుకు మార్చబడింది.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">స్థాన నివేదిక సెన్సార్లు మాత్రమే మోడుకు మార్చబడింది.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">స్థాన నివేదిక అధిక ఖచ్చితత్వ మోడుకు మార్చబడింది.</string>
+  <string name="quick_settings_tiles_category_system">సిస్టమ్ టైల్స్</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">టైల్‌ ను జోడించు</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">విమాన మోడ్ అమలుపరచునప్పుడు మొబైల్ నెట్వర్క్ కనెక్ట్ చేయుటకు సాధ్యపడలేదు. విమాన మోడ్ ను నిలిపివేసి, తిరిగి ప్రయత్నించండి.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ఫ్లాష్లైట్ ఆన్ అయ్యింది</string>
+  <string name="quick_settings_tile_flashlight_not_summary">ఆఫ్ చెయ్యడానికి టాప్ నొక్కండి</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d క్లయింట్</item>
+    <item quantity="other">%1$d క్లయింట్
+
+%1$d క్లయింట్స్</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">డాక్ బ్యాటరీ <xliff:g id="number">%d</xliff:g> పర్సెంట్.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">ప్లే క్యూను చూపుము</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-th/cm_arrays.xml b/packages/SystemUI/res/values-th/cm_arrays.xml
index cf5825b..3110756 100644
--- a/packages/SystemUI/res/values-th/cm_arrays.xml
+++ b/packages/SystemUI/res/values-th/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>N</item>
+    <!-- North -->
     <item>NE</item>
+    <!-- North east -->
     <item>E</item>
+    <!-- East -->
     <item>SE</item>
+    <!-- South east -->
     <item>S</item>
+    <!-- South -->
     <item>SW</item>
+    <!-- South west -->
     <item>W</item>
+    <!-- West -->
     <item>NW</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-th/cm_strings.xml b/packages/SystemUI/res/values-th/cm_strings.xml
index 2651986..a70602e 100644
--- a/packages/SystemUI/res/values-th/cm_strings.xml
+++ b/packages/SystemUI/res/values-th/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">ปัดไปทางขวาเพื่อ %1$s</string>
   <string name="right_shortcut_hint">ปัดไปทางซ้ายเพื่อ %1$s</string>
   <string name="lockscreen_message">แตะที่ไอคอนด้านซ้ายหรือขวาเพื่อกำหนดทางลัดสำหรับหน้าจอล็อค</string>
@@ -26,6 +34,7 @@
   <string name="select_application">เลือกแอปพลิเคชัน</string>
   <string name="lockscreen_choose_action_title">เลือกการกระทำ</string>
   <string name="lockscreen_none_target">ไม่มี</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">เลือกใช้การกระทำ</string>
   <string name="navbar_home_button">ปุ่มหลัก</string>
   <string name="navbar_recent_button">ปุ่มแอปล่าสุด</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">ปุ่มเมนู</string>
   <string name="accessibility_dpad_left">เคอร์เซอร์ซ้าย</string>
   <string name="accessibility_dpad_right">เคอร์เซอร์ขวา</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">ล้างข้อมูลแอป</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">บังคับปิด</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">ยกเลิกการติดตั้ง</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">ความสว่าง</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">โปรไฟล์ปิดอยู่</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">โปรไฟล์: <xliff:g id="profile" example="Default">%s</xliff:g></string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">ปิดโปรไฟล์</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">โปรไฟล์เปลี่ยนเป็น <xliff:g id="profile" example="Default">%s</xliff:g></string>
   <string name="quick_settings_compass_init">กำลังเตรียมการ\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">การตั้งค่าแสง</string>
   <string name="led_notification_text">LED ถูกเปิดใช้งานโดยการตั้งค่า</string>
   <string name="qs_tile_edit_header_instruction">แตะไทต์ค้างไว้เพื่อย้ายตำแหน่ง</string>
@@ -56,7 +75,9 @@
   <string name="quick_settings_title_header">หัวข้อ</string>
   <string name="quick_settings_title_tiles">ไทต์</string>
   <string name="quick_settings_title_show_weather">แสดงสภาพอากาศ</string>
+  <string name="quick_settings_title_show_brightness_slider">แสดงแถบเลื่อนปรับความสว่าง</string>
   <string name="quick_settings_title_enlarge_first_row">ขยายแถวแรก</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">จะแสดงหน้านี้จนกว่าคุณจะเลิกปักหมุด กดปุ่มกลับค้างเพื่อเลิกปักหมุด</string>
   <string name="quick_settings_custom_tile_detail_title">ไทล์กำหนดเอง</string>
   <string name="quick_settings_remove">ลบไทล์ออก</string>
@@ -67,9 +88,16 @@
   <string name="quick_settings_profiles_off">โปรไฟล์ถูกปิดอยู่</string>
   <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="quick_settings_battery_saver_label">ประหยัดแบตเตอรี่</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">ประหยัดแบตเตอรี่ (ขณะชาร์จ)</string>
+  <string name="quick_settings_caffeine_label">คาเฟอีน</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">ปิดการซิงค์</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">การซิงค์เปิดอยู่</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">การซิงค์ปิดอยู่</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">การซิงค์เปิดอยู่</string>
   <string name="quick_settings_sync_label">ซิงค์</string>
   <string name="quick_settings_volume_panel_label">แผงควบคุมระดับเสียง</string>
@@ -78,59 +106,115 @@
   <string name="quick_settings_lockscreen_label">หน้าจอล็อค</string>
   <string name="quick_settings_ambient_display_label">หน้าจอแวดล้อม</string>
   <string name="quick_settings_lockscreen_label_enforced">บังคับล็อคหน้าจอ</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">ปิดการใช้งานโปรไฟล์</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">หมดเวลาหน้าจอ: <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">หมดเวลาหน้าจอเปลี่ยนเป็น <xliff:g id="timeout" example="30 seconds">%s</xliff:g></string>
   <string name="qs_tile_performance">รูปแบบแบตเตอรี่</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">รูปแบบแบตเตอรี่: ประหยัดพลังงาน</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">รูปแบบแบตเตอรี่: สมดุล</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">รูปแบบแบตเตอรี่: ประสิทธิภาพ</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">รูปแบบแบตเตอรี่: รูปแบบใช้พลังงานต่ำ</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">รูปแบบแบตเตอรี่: รูปแบบรวดเร็ว</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">รูปแบบแบตเตอรี่เปลี่ยนเป็นรูปแบบประหยัดพลังงาน</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">รูปแบบแบตเตอรี่เปลี่ยนเป็นสมดุล</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">รูปแบบแบตเตอรี่เปลี่ยนเป็นรูปแบบประสิทธิภาพ</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">รูปแบบแบตเตอรี่เปลี่ยนเป็นรูปแบบใช้พลังงานต่ำ</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">รูปแบบแบตเตอรี่เปลี่ยนเป็นรูปแบบรวดเร็ว</string>
   <string name="quick_settings_performance_profile_detail_title">รูปแบบแบตเตอรี่</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">หน้าจอล็อคปิดอยู่</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">หน้าจอล็อคเปิดอยู่</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">หน้าจอล็อคถูกปิด</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">หน้าจอล็อคถูกเปิด</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">ปิดหน้าจอแวดล้อม</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">เปิดหน้าจอแวดล้อม</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">หน้าจอแวดล้อมปิดอยู่</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">หน้าจอแวดล้อมเปิดอยู่</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Heads up ปิดอยู่</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Heads up เปิดอยู่</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads up ปิดอยู่</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Heads up เปิดอยู่</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">คาเฟอีนปิดอยู่</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">คาเฟอีนเปิดอยู่</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">ตัวประหยัดแบตเตอรี่ปิดอยู่</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">ตัวประหยัดแบตเตอรี่เปิดอยู่</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">ตัวประหยัดแบตเตอรีถูกปิด</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">ตัวประหยัดแบตเตอรีถูกเปิด</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">ไทล์แบบไดนามิก</string>
   <string name="dynamic_qs_tile_next_alarm_label">การปลุกครั้งต่อไป</string>
   <string name="dynamic_qs_tile_ime_selector_label">ตัวเลือก IME</string>
   <string name="dynamic_qs_tile_su_label">สิทธิผู้ดูแลระบบ</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay ปิดอยู่</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: รูปแบบอัตโนมัติ</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: รูปแบบกลางวัน</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: รูปแบบกลางคืน</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: รูปแบบกลางแจ้ง</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay ถูกปิด</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay เปลี่ยนเป็นรูปแบบอัตโนมัติ</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay เปลี่ยนเป็นรูปแบบกลางวัน</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay เปลี่ยนเป็นรูปแบบกลางคืน</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay เปลี่ยนเป็นรูปแบบกลางแจ้ง</string>
   <string name="quick_settings_title_advanced_location">ตำแหน่งแบบสามสถานะ</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">การระบุตำแหน่ง: รูปแบบประหยัดแบตเตอรี่</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">รายงานตำแหน่งที่ตั้ง: เซนเซอร์เท่านั้น</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">รูปแบบการระบุตำแหน่ง: ความแม่นยำสูง</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">รูปแบบตำแหน่งที่ตั้ง</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">ประหยัดแบตเตอรี่</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">อุปกรณ์เท่านั้น</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">ความแม่นยำสูง</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">ตำแหน่งการระบุเปลี่ยนเป็นรูปแบบประหยัดแบตเตอรี่</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">การระบุตำแหน่งเปลี่ยนเป็นรูปแบบเฉพาะเซนเซอร์</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">การระบุตำแหน่งเปลี่ยนรูปแบบเป็นความแม่นยำสูง</string>
+  <string name="quick_settings_tiles_category_system">ไทล์ระบบ</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">เพิ่มไทล์</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">ไม่สามารถเชื่อมต่อเครือข่ายมือถือขณะใช้รูปแบบบนเครื่องบิน กรุณาปิดรูปแบบบนเครื่องบินและลองอีกครั้ง</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">ไฟฉายเปิดอยู่</string>
+  <string name="quick_settings_tile_flashlight_not_summary">แตะเพื่อปิด</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="other">%1$d ลูกข่าย</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">ไม่มี SIM ข้อมูล</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">แท่นชาร์จแบตเตอรี่ <xliff:g id="number">%d</xliff:g> เปอร์เซ็นต์</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">แสดงคิวเล่น</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-tr/cm_arrays.xml b/packages/SystemUI/res/values-tr/cm_arrays.xml
index 472dd22..8658c49 100644
--- a/packages/SystemUI/res/values-tr/cm_arrays.xml
+++ b/packages/SystemUI/res/values-tr/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>K</item>
+    <!-- North -->
     <item>KD</item>
+    <!-- North east -->
     <item>D</item>
+    <!-- East -->
     <item>GD</item>
+    <!-- South east -->
     <item>G</item>
+    <!-- South -->
     <item>GB</item>
+    <!-- South west -->
     <item>B</item>
+    <!-- West -->
     <item>KB</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-tr/cm_strings.xml b/packages/SystemUI/res/values-tr/cm_strings.xml
index a70ea9e..a126402 100644
--- a/packages/SystemUI/res/values-tr/cm_strings.xml
+++ b/packages/SystemUI/res/values-tr/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">%1$s için sağa kaydırın</string>
   <string name="right_shortcut_hint">%1$s için sola kaydırın</string>
   <string name="lockscreen_message">Kilit ekranı kısayollarını ayarlamak için sağ ya da soldaki simgeye dokunun.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Uygulama seçin</string>
   <string name="lockscreen_choose_action_title">Eylem seçin</string>
   <string name="lockscreen_none_target">Yok</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Atamak için işlev seçin</string>
   <string name="navbar_home_button">Ana ekran tuşu</string>
   <string name="navbar_recent_button">Son uyg. tuşu</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Menü tuşu</string>
   <string name="accessibility_dpad_left">Sol imleç</string>
   <string name="accessibility_dpad_right">Sağ imleç</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Uygulama verisini sil</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Durmaya zorla</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Kaldır</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Işık parlaklığı</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Profiller kapalı.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Profil: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Profiller kapatıldı.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed"><xliff:g id="profile" example="Default">%s</xliff:g> profiline geçildi.</string>
   <string name="quick_settings_compass_init">Başlatılıyor\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Işık ayarları</string>
   <string name="led_notification_text">LED ışık ayarlar tarafından etkinleştirilmiş</string>
   <string name="qs_tile_edit_header_instruction">Kareleri yeniden düzenlemek için basılı tutun</string>
@@ -56,7 +75,9 @@
   <string name="quick_settings_title_header">Başlık</string>
   <string name="quick_settings_title_tiles">Kareler</string>
   <string name="quick_settings_title_show_weather">Hava durumunu göster</string>
+  <string name="quick_settings_title_show_brightness_slider">Parlaklık kaydırıcısını göster</string>
   <string name="quick_settings_title_enlarge_first_row">İlk satırı büyüt</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Ekrandan kaldırana kadar görünümde tutar. Kaldırmak için Geri tuşuna dokunun ve tutun.</string>
   <string name="quick_settings_custom_tile_detail_title">Özel kare</string>
   <string name="quick_settings_remove">Kareyi kaldır</string>
@@ -67,9 +88,16 @@
   <string name="quick_settings_profiles_off">Profiller devre dışı</string>
   <string name="quick_settings_heads_up_label">Bildirim pencereleri</string>
   <string name="quick_settings_battery_saver_label">Pil tasarrufu</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Batarya kurtarıcı (şarj ediliyor)</string>
+  <string name="quick_settings_caffeine_label">Kafein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Eşitleme kapalı.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Eşitleme açık.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Eşitleme kapatıldı.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Eşitleme açıldı.</string>
   <string name="quick_settings_sync_label">Eşitleme</string>
   <string name="quick_settings_volume_panel_label">Ses paneli</string>
@@ -78,59 +106,116 @@
   <string name="quick_settings_lockscreen_label">Kilit ekranı</string>
   <string name="quick_settings_ambient_display_label">Bildirim ekranı</string>
   <string name="quick_settings_lockscreen_label_enforced">Kilit ekranı zorunlu</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Profil tarafından devre dışı</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Ekran zaman aşımı : <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Ekran zaman aşımı <xliff:g id="timeout" example="30 seconds">%s</xliff:g> olarak ayarlandı.</string>
   <string name="qs_tile_performance">Pil modu</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Pil modu: güç tasarruf modu.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Pil modu: dengeli mod.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Pil modu: performans modu.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Pil modu: verimlilik modu.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Pil modu: hızlı mod.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Pil modu güç tasarruf moduna geçti.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Pil modu dengeli moda geçti.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Pil modu performans moduna geçti.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Pil modu verimlilik moduna geçti.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Pil modu hızlı moda geçti.</string>
   <string name="quick_settings_performance_profile_detail_title">Pil modu</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Kilit ekranı kapalı.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Kilit ekranı açık.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Kilit ekranı kapatıldı.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Kilit ekranı açıldı.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Bildirim ekranı kapalı.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Bildirim ekranı açık.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Bildirim ekranı kapatıldı.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Bildirim ekranı açıldı.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Bildirim pencereleri kapalı.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Bildirim pencereleri açık.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Bildirim pencereleri kapatıldı.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Bildirim pencereleri açıldı.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Kafein kapalı.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Kafein açık.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Pil tasarrufu kapalı.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Pil tasarrufu açık.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Pil tasarrufu kapatıldı.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Pil tasarrufu açıldı.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Dinamik kare</string>
   <string name="dynamic_qs_tile_next_alarm_label">Sonraki alarm</string>
   <string name="dynamic_qs_tile_ime_selector_label">IME seçici</string>
   <string name="dynamic_qs_tile_su_label">Root erişimi</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay kapalı.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: otomatik mod.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: gündüz modu.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: gece modu.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: açık hava modu.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay kapatıldı.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay otomatik moda geçti.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay gündüz moduna geçti.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay gece moduna geçti.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay açık hava moduna geçti.</string>
   <string name="quick_settings_title_advanced_location">3-durumlu konum</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Konum bildirimi: pil tasarruf modu.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Konum bildirimi: sadece sensörler modu.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Konum bildirimi: yüksek hassasiyet modu.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Konum modu</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Pil tasarrufu</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Sadece cihaz</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Yüksek doğruluk</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Konum bildirimi pil tasarruf moduna geçti.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Konum bildirimi sadece sensörler moduna geçti.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Konum bildirimi yüksek hassasiyet moduna geçti.</string>
+  <string name="quick_settings_tiles_category_system">Sistem başlıkları</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Başlık ekle</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Uçak modu etkinken hücresel ağlarla bağlantı kurulamıyor. Uçak modunu devre dışı bırakın ve tekrar deneyin.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Flaş ışığı açık</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Kapatmak için dokunun</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="one">%1$d istemci</item>
+    <item quantity="other">%1$d istemci</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">SIM verisi yok</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Ünite pili yüzde <xliff:g id="number">%d</xliff:g>.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Oynatma kuyruğunu göster</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-ug/cm_arrays.xml b/packages/SystemUI/res/values-ug/cm_arrays.xml
index e5c5ade..0d61eb4 100644
--- a/packages/SystemUI/res/values-ug/cm_arrays.xml
+++ b/packages/SystemUI/res/values-ug/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>شىمال</item>
+    <!-- North -->
     <item>شەرقىي شىمال</item>
+    <!-- North east -->
     <item>شەرق</item>
+    <!-- East -->
     <item>شەرقىي جەنۇپ</item>
+    <!-- South east -->
     <item>جەنۇپ</item>
+    <!-- South -->
     <item>غەربىي جەنۇپ</item>
+    <!-- South west -->
     <item>غەرب</item>
+    <!-- West -->
     <item>غەربىي شىمال</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-ug/cm_strings.xml b/packages/SystemUI/res/values-ug/cm_strings.xml
index 21480ce..bb0eb55 100644
--- a/packages/SystemUI/res/values-ug/cm_strings.xml
+++ b/packages/SystemUI/res/values-ug/cm_strings.xml
@@ -16,12 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">%1$s ئۈچۈن ئوڭغا سۈرۈڭ</string>
   <string name="right_shortcut_hint">%1$s ئۈچۈن سولغا سۈرۈڭ</string>
+  <string name="lockscreen_message">ئوڭ ياكى سول تەرەپتىكى سىنبەلگىنى چېكىپ قۇلۇپ ئېكران قىسقا يولىنى قايتا تەقسىملەڭ.</string>
+  <string name="lockscreen_default_target">كۆڭۈلدىكى</string>
   <string name="select_application">ئەپ تاللاڭ</string>
   <string name="lockscreen_choose_action_title">مەشغۇلات تاللاڭ</string>
   <string name="lockscreen_none_target">يوق</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">تەقسىملەيدىغان مەشغۇلاتنى تاللاڭ</string>
   <string name="navbar_home_button">باش بەت توپچا</string>
   <string name="navbar_recent_button">يېقىنقى توپچىلار</string>
@@ -33,23 +46,175 @@
   <string name="navbar_menu_big_button">تىزىملىك توپچا</string>
   <string name="accessibility_dpad_left">نۇربەلگە سولغا</string>
   <string name="accessibility_dpad_right">نۇر بەلگە ئوڭغا</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">ئەپ سانلىق مەلۇماتىنى تازىلا</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">مەجبۇرى توختات</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">ئۆچۈر</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">چىراق يورۇقلىقى</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_off">مۇھىت ھالىتى تاقاق.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles">مۇھىت ھالىتى: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed_off">مۇھىت ھالىتى تاقالدى.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_profiles_changed">مۇھىت ھالىتى <xliff:g id="profile" example="Default">%s</xliff:g> گە ئۆزگەرتىلدى.</string>
   <string name="quick_settings_compass_init">دەسلەپلەشتۈرۈۋاتىدۇ\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">يورۇقلۇق تەكشىكى</string>
+  <string name="led_notification_text">تەڭشەكتىن LED نى قوزغىتىش</string>
+  <string name="qs_tile_edit_header_instruction">خىشنى بېسىپ تۇرۇپ قايتا ئورۇنلاشتۇرۇڭ</string>
+  <string name="quick_settings_edit_label">خىشنى تەھرىرلەش</string>
+  <string name="quick_settings_cannot_delete_edit_tile">خىش تەھرىرلەشنى ئۆچۈرەلمەيدۇ</string>
+  <string name="qs_tiles_reset_confirmation">خىشنىڭ تىز تەڭشەكلىرىنى كۆڭۈلدىكى سەپلەنمىگە قايتا بېكىتەمسىز؟</string>
+  <string name="quick_settings_tile_reset_to_default">كۆڭۈلدىكى ئورۇنلاشتۇرۇشقا قايتۇرۇڭ</string>
+  <string name="quick_settings_title_header">باش</string>
+  <string name="quick_settings_title_tiles">خىش</string>
+  <string name="quick_settings_title_show_weather">ھاۋارايىنى كۆرستىڭ</string>
+  <string name="quick_settings_title_show_brightness_slider">يورۇقلۇق سۈرگۈچنى كۆرسىتىدۇ</string>
+  <string name="quick_settings_title_enlarge_first_row">بىرىنچى قۇرنى چوڭايتىڭ</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <string name="screen_pinning_description_no_navbar">بۇ ئېكراننى سىز بىكار قىلغانغا قەدەر مۇقىملاشتۇرىدۇ. قايتىش كونۇپكىسىنى بېسىپ تۇرۇش ئارقىلىق مۇقىملاشتۇرۇشنى بىكار قىلىڭ.</string>
+  <string name="quick_settings_custom_tile_detail_title">خىش خاسلاشتۇرۇش</string>
+  <string name="quick_settings_remove">ماۋزۇ چىقىرىۋېتىش</string>
   <string name="quick_settings_network_adb_label">ADB تور سازلاش</string>
   <string name="quick_settings_compass_label">كومپاس</string>
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">سىستېما سەپلىمە ھۆججەتلىرى</string>
   <string name="quick_settings_profiles_off">سەپلىمە ھۆججەت چەكلەندى</string>
+  <string name="quick_settings_heads_up_label">لەيلىمە ئۇقتۇرۇش</string>
+  <string name="quick_settings_battery_saver_label">توكدان ياردەمچىسى</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">توك تىجىگۈچى (توك قاچىلاۋاتىدۇ)</string>
+  <string name="quick_settings_caffeine_label">قەھۋەخانە ھالىتى</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_off">قەدەمداش تاقاق.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_on">قەدەمداش ئوچۇق.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_off">قەدەمداش قىلىش تاقاق.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_sync_changed_on">قەدەمداش قىلىش ئوچۇق.</string>
+  <string name="quick_settings_sync_label">قەدەمداش</string>
+  <string name="quick_settings_volume_panel_label">ئاۋاز تاختىسى</string>
+  <string name="quick_settings_usb_tether_label">USB ھەمبەھىر</string>
   <string name="quick_settings_screen_timeout_detail_title">ئېكران مۆھلىتى</string>
   <string name="quick_settings_lockscreen_label">قۇلۇپ ئېكرانى</string>
+  <string name="quick_settings_ambient_display_label">مۇھىتنى كۆرسىتىدۇ</string>
   <string name="quick_settings_lockscreen_label_enforced">ئېكراننى مەجبۇرىي قۇلۇپلا</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">ھالەت تەڭشىكىدە تاقالدى</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout">ئېكران ۋاقتى ئېشىپ كەتتى: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_screen_timeout_changed">ئېكران ۋاقىت ئېشىمى <xliff:g id="timeout" example="30 seconds">%s</xliff:g> گە ئۆزگەرتىلدى.</string>
+  <string name="qs_tile_performance">توكدان ھالىتى</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_pwrsv">باتارىيە ھالىتى: توك تىجەش ھالىتى.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bal">باتارىيە ھالىتى: تەڭپۇڭ ھالەت.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_perf">باتارىيە ھالىتى: ئىقتىدار ھالىتى.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_power">باتارىيە ھالىتى: ئۆنۈم ھالىتى.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_bias_perf">باتارىيە ھالىتى: تىز سۈرەت ھالىتى.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">باتارىيە ھالىتى توك تىجەش ھالىتىگە ئۆزگەرتىلدى.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bal">باتارىيە ھالىتى تەڭپۇڭ ھالەتكە ئۆزگەرتىلدى.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_perf">باتارىيە ھالىتى ئىقتىدار ھالىتىگە ئۆزگەرتىلدى.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_power">باتارىيە ھالىتى ئۆنۈم ھالىتىگە ئۆزگەرتىلدى.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">باتارىيە ھالىتى تىز سۈرەت ھالىتىگە ئۆزگەرتىلدى.</string>
+  <string name="quick_settings_performance_profile_detail_title">توكدان ھالىتى</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_off">ئېكران قۇلۇپى تاقاق.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_on">ئېكران قۇلۇپى ئوچۇق.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_off">ئېكران قۇلۇپى تاقالدى.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_lock_screen_changed_on">ئېكران قۇلۇپى ئېچىلدى.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_off">مۇھىت كۆرسىتىش تاقاق.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_on">مۇھىت كۆرسىتىش ئوچۇق.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_off">مۇھىت كۆرسىتىش تاقالدى.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_ambient_display_changed_on">مۇھىت كۆرسىتىش ئېچىلدى.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_off">لەيلىمە ئۇقتۇرۇش تاقاق.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_on">لەيلىمە ئۇقتۇرۇش ئوچۇق.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_off">لەيلىمە ئۇقتۇرۇش تاقالدى.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_heads_up_changed_on">لەيلىمە ئۇقتۇرۇش ئېچىلدى.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">قەھۋەخانە ھالىتىنى تاقاش.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">قەھۋەخانە ھالىتىنى ئېچىش.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_off">توك تىجەش ھالىتى تاقاق.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_on">توك تىجەش ھالىتى ئوچۇق.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_off">توك تىجەش ھالىتى تاقالدى.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_battery_saver_changed_on">توك تىجەش ھالىتى ئېچىلدى.</string>
+  <!-- Dynamic tiles -->
+  <string name="quick_settings_dynamic_tile_detail_title">ھەرىكەتچان توپچا</string>
+  <string name="dynamic_qs_tile_next_alarm_label">كىيىنكى قوڭغۇراق</string>
+  <string name="dynamic_qs_tile_ime_selector_label">كىرگۈزگۈچ تاللىغۇچ</string>
+  <string name="dynamic_qs_tile_su_label">Root ھوقۇقى</string>
+  <string name="quick_settings_title_advanced_location">ئۈچ ھالەت ئورۇن بەلگىلەش</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">ئورۇن دوكلاتى: توك تېجەش ھالىتى.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">ئورۇن دوكلاتى: سەزگۈچ ھالىتىلا.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">ئورۇن دوكلاتى: يۇقىرى ئېنىقلىق ھالىتى.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">ئورۇن ھالىتى</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">توك سەرپىياتى تۆۋەن</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">ئۈسكۈنىلا</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">دەللىكى يۇقىرى</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_battery_saving">جۇغراپىيەلىك ئورۇن دوكىلاتى توك تىجەش ھالىتىگە ئۆزگەرتىلدى.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_gps_only">جۇغراپىيەلىك ئورۇن دوكىلاتى سېنزور ھالىتىگە ئۆزگەرتىلدى.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_location_changed_high_accuracy">جۇغراپىيەلىك ئورۇن دوكىلاتى توغرىلىقى يوقىرى ھالەتكە ئۆزگەرتىلدى.</string>
+  <string name="quick_settings_tiles_category_system">سىستېما خىشى</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">خىش قوشۇش</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">ئايروپىلان ھالىتى ئېچىلسا كۆچمە تورنى ئىشلەتكىلى بولمايدۇ. ئايروپىلان ھالىتىنى تاقاڭ ھەم قايتا سىناڭ.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">قولچىراق ئوچۇق</string>
+  <string name="quick_settings_tile_flashlight_not_summary">يىنىك بېسىپ ئۆچۈرۈڭ</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="other">%1$d مۇئامىلىدار</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">تورغا ئۇلىنىدىغان SIM كارتا يوق</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">لەڭگەر توكدان <xliff:g id="number">%d</xliff:g>%%.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">قويۇش تىزىملىكىنى كۆرسىتىش</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-ug/strings.xml b/packages/SystemUI/res/values-ug/strings.xml
index 8ae8ed7..95d4f4d 100644
--- a/packages/SystemUI/res/values-ug/strings.xml
+++ b/packages/SystemUI/res/values-ug/strings.xml
@@ -18,149 +18,587 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Name of the status bar as seen in the applications info settings page. [CHAR LIMIT=12] -->
   <string name="app_label">سىستېما ئارايۈزى</string>
+  <!-- The text for the button in the notification window-shade that clears
+         all of the currently visible notifications. [CHAR LIMIT=10]-->
   <string name="status_bar_clear_all_button">تازىلا</string>
+  <!-- Title shown in recents popup for removing an application from the list -->
   <string name="status_bar_recent_remove_item_title">تىزىمدىن چىقىرىۋەت</string>
+  <!-- Title shown in recents popup for inspecting an application's properties -->
   <string name="status_bar_recent_inspect_item_title">ئەپ ئۇچۇرى</string>
+  <!-- Message shown in the middle of the screen after clicking on the recent apps button
+         when there are no recent apps to show. Also used for accessibility. [CHAR LIMIT=45]-->
+  <!-- Content description for the button to dismiss Recent Apps (only present on large
+         devices) -->
   <string name="status_bar_accessibility_dismiss_recents">يېقىنقى ئەپلەرنى بىكار قىل</string>
+  <!-- Message that is read when you enter recent apps in TalkBack -->
+  <!-- The label in the bar at the top of the status bar when there are no notifications
+         showing.  [CHAR LIMIT=40]-->
   <string name="status_bar_no_notifications_title">ئۇقتۇرۇش يوق</string>
+  <!-- The label for the group of notifications for ongoing events in the opened version of
+         the status bar.  An ongoing call is the prime example of this.  The MP3 music player
+         might be another example.   [CHAR LIMIT=40] -->
   <string name="status_bar_ongoing_events_title">ئېلىپ بېرىلىۋاتىدۇ</string>
+  <!-- The label for the group of notifications for recent events in the opened version of
+         the status bar.  Recently received text messsages (SMS), emails, calendar alerts, etc.
+         [CHAR LIMIT=40] -->
   <string name="status_bar_latest_events_title">ئۇقتۇرۇشلار</string>
+  <!-- When the battery is low, this is displayed to the user in a dialog.  The title of the low battery alert.  [CHAR LIMIT=NONE]-->
+  <!-- A message that appears when the battery level is getting low in a dialog.  This is
+        appened to the subtitle of the low battery alert.  "percentage" is the percentage of battery
+        remaining [CHAR LIMIT=none]-->
+  <!-- Same as battery_low_percent_format, with a notice about battery saver if on. [CHAR LIMIT=none]-->
+  <!-- A message that appears when a USB charger is plugged in and the device does not
+    support charging on it.  That is, a charger that fits into the USB port and goes into
+    a wall socket, not into a computer. (This happens because some devices require more
+    current than the USB spec allows.  [CHAR LIMIT=NONE] -->
   <string name="invalid_charger">USB دىن توكلاشنى قوللىمايدۇ.\nتوكلىغۇچتىن توڭلاڭ.</string>
+  <!-- First line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- Second line of invalid_charger, used in the notification form.  [CHAR LIMIT=NONE]-->
+  <!-- When the battery is low, this is the label of the button to go to the
+         power usage activity to find out what drained the battery.  [CHAR LIMIT=30] -->
+  <!-- Battery saver confirmation dialog title [CHAR LIMIT=NONE]-->
+  <!-- Battery saver confirmation dialog ok text [CHAR LIMIT=40]-->
+  <!-- Battery saver notification action [CHAR LIMIT=NONE]-->
+  <!-- Name of the button that links to the Settings app. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_settings_button">تەڭشەكلەر</string>
+  <!-- Name of the button that links to the Wifi settings screen. [CHAR LIMIT=NONE] -->
   <string name="status_bar_settings_wifi_button">Wi-Fi</string>
+  <!-- Label in system panel saying the device will use the orientation sensor to rotate [CHAR LIMIT=30] -->
   <string name="status_bar_settings_auto_rotation">ئېكراننى ئۆزلۈكىدىن ئايلاندۇر</string>
+  <!-- Abbreviation / label for mute brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
   <string name="status_bar_settings_mute_label">ئۈنسىز</string>
+  <!-- Abbreviation / label for automatic brightness mode button. Should be all caps. [CHAR LIMIT=6] -->
   <string name="status_bar_settings_auto_brightness_label">ئاپتوماتىك</string>
+  <!-- Label in system panel saying the device will show notifications [CHAR LIMIT=30] -->
   <string name="status_bar_settings_notifications">ئۇقتۇرۇشلار</string>
+  <!-- Separator for PLMN and SPN in network name. -->
+  <!-- Network connection string for Bluetooth Reverse Tethering -->
   <string name="bluetooth_tethered">كۆكچىش چەكلىمىسى</string>
+  <!-- Title of a button to open the settings for input methods [CHAR LIMIT=30] -->
   <string name="status_bar_input_method_settings_configure_input_methods">كىرگۈزگۈچ تەڭشەك</string>
+  <!-- Label of a toggle switch to disable use of the physical keyboard in favor of the IME. [CHAR LIMIT=25] -->
   <string name="status_bar_use_physical_keyboard">فىزىكىلىق ھەرپتاختا</string>
+  <!-- Prompt for the USB device permission dialog [CHAR LIMIT=80] -->
   <string name="usb_device_permission_prompt"><xliff:g id="APPLICATION">%1$s</xliff:g>  ئەپنىڭ USB ئۈسكۈنىنى زىيارەت قىلىشىغا يول قويامدۇ؟</string>
+  <!-- Prompt for the USB accessory permission dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_permission_prompt"><xliff:g id="APPLICATION">%1$s</xliff:g>  ئەپنىڭ USB قوشۇمچىسىنى زىيارەت قىلىشىغا يول قويامدۇ؟</string>
+  <!-- Prompt for the USB device confirm dialog [CHAR LIMIT=80] -->
   <string name="usb_device_confirm_prompt">بۇ USB ئۈسكۈنە باغلانغاندا <xliff:g id="ACTIVITY">%1$s</xliff:g> نى ئاچامدۇ؟</string>
+  <!-- Prompt for the USB accessory confirm dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_confirm_prompt">بۇ USB قوشۇمچىسى باغلانغاندا <xliff:g id="ACTIVITY">%1$s</xliff:g> نى ئاچامدۇ؟</string>
+  <!-- Prompt for the USB accessory URI dialog [CHAR LIMIT=80] -->
   <string name="usb_accessory_uri_prompt">بۇ USB قوشۇمچىسىغا ماس كېلىدىغان ئەپ ئورنىتىلمىغان. بۇ قوشۇمچە ھەققىدىكى تېخىمۇ كۆپ ئۇچۇرنى <xliff:g id="URL">%1$s</xliff:g> دىن زىيارەت قىلىڭ.</string>
+  <!-- Title for USB accessory dialog.  Used when the name of the accessory cannot be determined.  [CHAR LIMIT=50] -->
   <string name="title_usb_accessory">USB قوشۇمچە</string>
+  <!-- View button label for USB dialogs.  [CHAR LIMIT=15] -->
   <string name="label_view">كۆرۈنۈش</string>
+  <!-- Checkbox label for USB device dialogs.  [CHAR LIMIT=50] -->
   <string name="always_use_device">كۆڭۈلدىكى ئەھۋالدا بۇ USB ئۈسكۈنىنى ئىشلەت</string>
+  <!-- Checkbox label for USB accessory dialogs.  [CHAR LIMIT=50] -->
   <string name="always_use_accessory">كۆڭۈلدىكى ئەھۋالدا بۇ USB قوشۇمچىنى ئىشلەت</string>
+  <!-- Title of confirmation dialog for USB debugging -->
   <string name="usb_debugging_title">USB سازلاشقا يول قويامدۇ؟</string>
+  <!-- Message of confirmation dialog for USB debugging -->
   <string name="usb_debugging_message">بۇ كومپيۇتېرنىڭ RSA ئاچقۇچىنىڭ بارماق ئىزى: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g></string>
+  <!-- Option to always allow USB debugging from the attached computer -->
   <string name="usb_debugging_always">بۇ كومپيۇتېرغا ھەمىشە يول قوي</string>
+  <!-- Title of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Message of notification shown when trying to enable USB debugging but a secondary user is the current foreground user. -->
+  <!-- Checkbox label for application compatibility mode ON (zooming app to look like it's running
+         on a phone).  [CHAR LIMIT=25] -->
   <string name="compat_mode_on">پۈتۈن ئېكرانغا چوڭايت</string>
+  <!-- Checkbox label for application compatibility mode OFF (normal mode on tablets).
+         [CHAR LIMIT=25] -->
   <string name="compat_mode_off">پۈتۈن ئېكرانغا ياي</string>
+  <!-- Notification ticker displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=30] -->
   <string name="screenshot_saving_ticker">ئېكران كەسمىسىنى ساقلاۋاتىدۇ…</string>
+  <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->
   <string name="screenshot_saving_title">ئېكران كەسمىسىنى ساقلاۋاتىدۇ…</string>
+  <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->
   <string name="screenshot_saving_text">ئېكران كەسمىسى ساقلاندى.</string>
+  <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->
   <string name="screenshot_saved_title">ئېكران كەسمىسىگە ئېرىشتى.</string>
+  <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->
   <string name="screenshot_saved_text">چېكىلسە ئېكران كەسمىسىنى كۆرسىتىدۇ.</string>
+  <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->
   <string name="screenshot_failed_title">ئېكران كەسمىسىگە ئېرىشەلمەيدۇ.</string>
+  <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->
+  <!-- Title for the USB function chooser in UsbPreferenceActivity. [CHAR LIMIT=30] -->
   <string name="usb_preference_title">USB ھۆججەت يوللاش تاللانمىسى</string>
+  <!-- Label for the MTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_mtp_button_title">ۋاستە چالغۇچ سۈپىتىدە ئېگەرلە (MTP)</string>
+  <!-- Label for the PTP USB function in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="use_ptp_button_title">كامېرا سۈپىتىدە ئېگەرلە (PTP)</string>
+  <!-- Label for the installer CD image option in UsbPreferenceActivity. [CHAR LIMIT=50] -->
   <string name="installer_cd_button_title">Mac ئۈچۈن Android ھۆججەت يوللايدىغان ئەپنى ئورنات</string>
+  <!-- Content description of the back button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_back">قايت</string>
+  <!-- Content description of the home button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_home">باش بەت</string>
+  <!-- Content description of the menu button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_menu">تىزىملىك</string>
+  <!-- Content description of the recents button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the search button for accessibility. [CHAR LIMIT=NONE] -->
   <string name="accessibility_search_light">ئىزدە</string>
+  <!-- Content description of the camera button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_camera_button">كامېرا</string>
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the voice assist button. This is not shown on-screen and is an accessibility label for the icon which launches the voice assist from the lock screen.[CHAR LIMIT=NONE] -->
+  <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] -->
+  <!-- Caption for "Recents resize" developer debug feature. [CHAR LIMIT=NONE] -->
+  <!-- Button name for "Cancel". [CHAR LIMIT=NONE] -->
+  <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_compatibility_zoom_button">ماسلىشىشچان چوڭايت كىچىكلەت توپچىسى.</string>
+  <!-- Content description of picture of the compatibility zoom example for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_compatibility_zoom_example">ئېكراننى كىچىكتىن چوڭايتىدۇ.</string>
+  <!-- Content description of the bluetooth icon when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_connected">كۆكچىش باغلاندى.</string>
+  <!-- Content description of the bluetooth icon when connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_disconnected">كۆكچىش ئۈزۈلدى.</string>
+  <!-- Content description of the battery when no battery for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_battery">توكدان يوق.</string>
+  <!-- Content description of the battery when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_one_bar">توكدان بىر بالداق.</string>
+  <!-- Content description of the battery when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_two_bars">توكدان ئىككى بالداق.</string>
+  <!-- Content description of the battery when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_three_bars">توكدان ئۈچ بالداق.</string>
+  <!-- Content description of the battery when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_full">توكدان لىق.</string>
+  <!-- Content description of the phone signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_phone">تېلېفون يوق.</string>
+  <!-- Content description of the phone signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_one_bar">تېلېفون بىر بالداق.</string>
+  <!-- Content description of the phone signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_two_bars">تېلېفون ئىككى بالداق.</string>
+  <!-- Content description of the phone signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_three_bars">تېلېفون ئۈچ بالداق.</string>
+  <!-- Content description of the phone signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_phone_signal_full">تېلېفون سىگنالى لىق.</string>
+  <!-- Content description of the data signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_data">سانلىق مەلۇمات يوق.</string>
+  <!-- Content description of the data signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_one_bar">سانلىق مەلۇمات بىر بالداق.</string>
+  <!-- Content description of the data signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_two_bars">سانلىق مەلۇمات ئىككى بالداق.</string>
+  <!-- Content description of the data signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_three_bars">سانلىق مەلۇمات ئۈچ بالداق.</string>
+  <!-- Content description of the data signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_signal_full">سانلىق مەلۇمات سىگنالى لىق.</string>
+  <!-- Content description of the wifi label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth label showing what we are connected to. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the WiMAX signal when no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_wimax">WiMAX يوق.</string>
+  <!-- Content description of the WiMAX signal when it is one bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_one_bar">WiMAX بىر بالداق.</string>
+  <!-- Content description of the WiMAX signal when it is two bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_two_bars">WiMAX ئىككى بالداق.</string>
+  <!-- Content description of the WiMAX signal when it is three bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_three_bars">WiMAX ئۈچ بالداق.</string>
+  <!-- Content description of the WiMAX signal when it is full for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_wimax_signal_full">WiMAX سىگنالى لىق.</string>
+  <!-- Content description of the Ethernet connection when disconnected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the Ethernet connection when connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of an item with no signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_signal">سىگنال يوق.</string>
+  <!-- Content description of an item with no signal and no connection for accessibility (not shown on the screen) [CHAR LIMIT=NONE] -->
   <string name="accessibility_not_connected">باغلانمىدى.</string>
+  <!-- Content description of an item with zero signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_zero_bars">نۆل بالداق.</string>
+  <!-- Content description of an item with one signal bar for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_one_bar">بىر بالداق.</string>
+  <!-- Content description of an item with two signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_two_bars">ئىككى بالداق.</string>
+  <!-- Content description of an item with three signal bars for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_three_bars">ئۈچ بالداق.</string>
+  <!-- Content description of an item with full signal for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_signal_full">سىگنال لىق.</string>
+  <!-- Content description of an item that is turned on for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_on">ئوچۇق.</string>
+  <!-- Content description of an item that is turned off for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_off">تاقاق.</string>
+  <!-- Content description of an item that is connected for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_connected">باغلاندى.</string>
+  <!-- Content description of an item that is connecting for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type GPRS for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_gprs">GPRS</string>
+  <!-- Content description of the data connection type 1x for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_1x">1 X</string>
+  <!-- Content description of the data connection type HSPA and its variants for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspa">HSPA</string>
+  <!-- Content description of the data connection type 3G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_3g">3G</string>
+  <!-- Content description of the data connection type 3.5G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_3.5g">3.5G</string>
+  <!-- Content description of the data connection type 4G for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g">4G</string>
+  <!-- Content description of the data connection type LTE for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_lte">LTE</string>
+  <!-- Content description of the data connection type CDMA for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_cdma">CDMA</string>
+  <!-- Content description of the roaming data connection type for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_roaming">كەزمە</string>
+  <!-- Content description of the data connection type Edge for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_edge">Edge</string>
+  <!-- Content description of the data connection type WiFi for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection with no SIM for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_no_sim">SIM كارتا يوق.</string>
+  <!-- Content description of the bluetooth tethering icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_bluetooth_tether">كۆكچىش ھەمبەھىر</string>
+  <!-- Content description of the airplane mode icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_airplane_mode">ئايروپىلان ھالىتى</string>
+  <!-- Content description of the no sim icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the carrier network changing icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_battery_level">توكدان <xliff:g id="NUMBER">%d</xliff:g> پىرسەنت.</string>
+  <!-- Content description of the button for showing a settings panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_settings_button">سىستېما تەڭشەكلىرى</string>
+  <!-- Content description of the button for showing a notifications panel in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notifications_button">ئۇقتۇرۇشلار.</string>
+  <!-- Content description of the button for removing a notification in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_remove_notification">ئۇقتۇرۇشنى تازىلا.</string>
+  <!-- Content description of the enabled GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_gps_enabled">GPS قوزغىتىلدى.</string>
+  <!-- Content description of the acquiring GPS icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_gps_acquiring">GPS بايقاۋاتىدۇ.</string>
+  <!-- Content description of the TeleTypewriter(TTY) enabled icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_tty_enabled">TeleTypewriter قوزغىتىلدى.</string>
+  <!-- Content description of the ringer vibrate icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ringer_vibrate">قوڭغۇراق تىترەت.</string>
+  <!-- Content description of the ringer silent icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_ringer_silent">قوڭغۇراق ئۈنسىز.</string>
+  <!-- Content description of the cast icon in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description to tell the user that this button will remove an application from recents -->
+  <!-- Content description to tell the user an application has been removed from recents -->
   <string name="accessibility_recents_item_dismissed"><xliff:g id="APP">%s</xliff:g> بوشىتىلدى.</string>
+  <!-- Content description to tell the user all applications has been removed from recents -->
+  <!-- Content description to tell the user an application has been launched from recents -->
+  <!-- Content description of individual recents task. -->
+  <!-- Content description to tell the user a notification has been removed from the notification shade -->
   <string name="accessibility_notification_dismissed">ئۇقتۇرۇش رەت قىلىندى.</string>
+  <!-- Content description for the notification shade panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_notification_shade">ئۇقتۇرۇش سايەسى.</string>
+  <!-- Content description for the quick settings panel (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_desc_quick_settings">تېز تەڭشەكلەر.</string>
+  <!-- Content description for the lock screen (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the settings button in the status bar header. [CHAR LIMIT=NONE] -->
+  <!-- Content description for the recent apps panel (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description for the close button in the zen mode panel introduction message. [CHAR LIMIT=NONE] -->
+  <!-- Content description of the user tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_user">ئىشلەتكۈچى <xliff:g id="USER">%s.</xliff:g></string>
+  <!-- Content description of the wifi tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the wifi is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the mobile data tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_mobile">كۆچمە <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>
+  <!-- Content description of the battery tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery">توكدان <xliff:g id="STATE">%s</xliff:g>.</string>
+  <!-- Content description of the airplane mode tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the airplane mode tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the do not disturb tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when do not disturb changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connecting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the bluetooth tile in quick settings when connected (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the bluetooth is turned on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the alarm tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_alarm">قوڭغۇراق تەڭشەك <xliff:g id="TIME">%s</xliff:g>.</string>
+  <!-- Content description of quick settings detail panel close button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition plus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of zen mode time condition minus button (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the flashlight tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the flashlight state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the color inversion state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the hotspot state changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the display brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Title of dialog shown when 2G-3G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when 4G data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when mobile data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Title of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=48] -->
+  <!-- Body of dialog shown when data usage has exceeded limit and has been disabled. [CHAR LIMIT=NONE] -->
+  <!-- Dialog button indicating that data connection should be re-enabled. [CHAR LIMIT=28] -->
+  <!-- Text to display underneath the graphical signal strength meter when
+         no connection is available. [CHAR LIMIT=20] -->
   <string name="status_bar_settings_signal_meter_disconnected">ئىنتېرنېت باغلىنىشى يوق</string>
+  <!-- Text to display underneath the graphical signal strength meter when
+         it is displaying Wi-Fi status and Wi-Fi is connected to a network
+         whose SSID is not available.
+         [CHAR LIMIT=20] -->
   <string name="status_bar_settings_signal_meter_wifi_nossid">Wi-Fi ئۇلاندى</string>
+  <!-- Notification text: when GPS is getting a fix [CHAR LIMIT=50] -->
   <string name="gps_notification_searching_text">GPS ئىزدەۋاتىدۇ</string>
+  <!-- Notification text: when GPS has found a fix [CHAR LIMIT=50] -->
   <string name="gps_notification_found_text">GPS تە ئورۇن تەڭشەك</string>
+  <!-- Accessibility text describing the presence of active location requests by one or more apps -->
   <string name="accessibility_location_active">ئورۇن ئۇچۇرى ئىلتىماسى ئاكتىپ</string>
+  <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_clear_all">بارلىق ئۇقتۇرۇشلارنى تازىلا</string>
+  <!-- Content description of button in notification inspector for system settings relating to
+         notifications from this application [CHAR LIMIT=NONE] -->
+  <!-- Content description of button in notification inspetor for application-provided settings
+         for its own notifications [CHAR LIMIT=NONE] -->
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is on. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_off">ئېكران ئۆزلۈكىدىن ئايلىنىدۇ.</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_landscape">ئېكران توغرىسىغا كۆز يۈگۈرتۈش ھالىتىگە قۇلۇپلاندى.</string>
+  <!-- Description of the button in the phone-style notification panel that controls auto-rotation, when auto-rotation is off. [CHAR LIMIT=NONE] -->
   <string name="accessibility_rotation_lock_on_portrait">ئېكران بويىغا كۆز يۈگۈرتۈش ھالىتىگە قۇلۇپلاندى.</string>
+  <!-- Announcement made when the screen is rotating automatically again (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to landscape only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the rotation lock state changes to portrait only (not shown on the screen).  [CHAR LIMIT=NONE] -->
+  <!-- Name of the K-release easter egg: a display case for all our tastiest desserts. [CHAR LIMIT=30] -->
   <string name="dessert_case">تاتلىق تۈرۈم قۇتىسى</string>
+  <!-- Name of the launcher shortcut icon that allows dreams to be started immediately [CHAR LIMIT=20] -->
   <string name="start_dreams">ئېكران قوغدىغۇچ</string>
+  <!-- Textual description of Ethernet connections -->
   <string name="ethernet_label">دائىرىلىك تور</string>
+  <!-- QuickSettings: Do not disturb [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Priority only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Alarms only [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Do not disturb - Total silence [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Bluetooth [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_label">كۆكچىش</string>
+  <!-- QuickSettings: Bluetooth (Multiple) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_multiple_devices_label">كۆكچىش (<xliff:g id="NUMBER">%d</xliff:g> ئۈسكۈنە)</string>
+  <!-- QuickSettings: Bluetooth (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_bluetooth_off_label">كۆكچىش تاقاق</string>
+  <!-- QuickSettings: Bluetooth detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_label">يورۇقلۇق</string>
+  <!-- QuickSettings: Rotation Unlocked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Rotation Locked [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Portrait [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Locked to Landscape [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: IME [CHAR LIMIT=NONE] -->
   <string name="quick_settings_ime_label">كىرگۈزگۈچ</string>
+  <!-- QuickSettings: Location [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_label">ئورنى</string>
+  <!-- QuickSettings: Location (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_off_label">ئورۇن ئۇچۇرى تاقاق</string>
+  <!-- QuickSettings: Media device [CHAR LIMIT=NONE] -->
   <string name="quick_settings_media_device_label">ۋاستە ئۈسكۈنە</string>
+  <!-- QuickSettings: RSSI [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_label">RSSI</string>
+  <!-- QuickSettings: RSSI (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_rssi_emergency_only">جىددىي تېلېفونلا ئۇرغىلى بولىدۇ</string>
+  <!-- QuickSettings: Settings [CHAR LIMIT=NONE] -->
   <string name="quick_settings_settings_label">تەڭشەكلەر</string>
+  <!-- QuickSettings: Time [CHAR LIMIT=NONE] -->
   <string name="quick_settings_time_label">ۋاقىت</string>
+  <!-- QuickSettings: User [CHAR LIMIT=NONE] -->
   <string name="quick_settings_user_label">مەن</string>
+  <!-- QuickSettings: Title of the user detail panel [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label on the item for adding a new user [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Wifi (Not connected) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_not_connected">باغلانمىدى</string>
+  <!-- QuickSettings: Wifi (No network) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_no_network">تور يوق</string>
+  <!-- QuickSettings: Wifi (Off) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_wifi_off_label">Wi-Fi تاقاق</string>
+  <!-- QuickSettings: Wifi detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, status text when casting [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device name [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, default device description [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cast detail panel, text when there are no items [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Brightness dialog title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_title">يورۇقلۇق</string>
+  <!-- QuickSettings: Brightness dialog auto brightness button [CHAR LIMIT=NONE] -->
   <string name="quick_settings_brightness_dialog_auto_brightness_label">ئاپتوماتىك</string>
+  <!-- QuickSettings: Label for the toggle that controls whether display inversion is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Label for the toggle that controls whether display color correction is enabled. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that navigates to settings. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connected device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Control panel: Label for connecting device. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Tethering. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Hotspot. [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Notifications [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Flashlight [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data usage title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, remaining data title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, over limit title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data used format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data limit format string [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Cellular detail panel, data warning format string [CHAR LIMIT=NONE] -->
+  <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The info panel app info button string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: The screen pinning button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Temporary string for the button in the recents search bar. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Launch error string. [CHAR LIMIT=NONE] -->
+  <!-- Recents: Dismiss all button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split horizontal radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split vertical radio button. [CHAR LIMIT=NONE] -->
+  <!-- Recents: MultiStack add stack split custom radio button. [CHAR LIMIT=NONE] -->
+  <!-- Expanded Status Bar Header: Battery Charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, no known time [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Charging, showing time left until charged [CHAR LIMIT=40] -->
+  <!-- Expanded Status Bar Header: Not charging [CHAR LIMIT=40] -->
+  <!-- Glyph to be overlaid atop the battery when the level is extremely low. Do not translate. -->
   <string name="battery_meter_very_low_overlay_symbol">!</string>
+  <!-- Shows up when there is a user SSL CA Cert installed on the
+         device.  Indicates to the user that SSL traffic can be intercepted.
+         If the text fits on one line (~14 chars), it should start with a
+         linebreak to position it correctly.  [CHAR LIMIT=45] -->
   <string name="ssl_ca_cert_warning">تور نازارەت قىلىنغان\nبولۇشى مۇمكىن</string>
+  <!-- Description of the unlock target in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the up direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
+  <!-- Zen mode: Priority only introduction message on first use -->
+  <!-- Zen mode: Priority only customization button label -->
+  <!-- Zen mode: Total silence introduction message on first use (voice capable devices) -->
+  <!-- Zen mode: Total silence introduction message on first use (non-voice capable devices) -->
+  <!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
+  <!-- An explanation for the visual speed bump in the notifications, which will appear when you click on it. [CHAR LIMIT=50] -->
+  <!-- Shows to explain the double tap interaction with notifications: After tapping a notification on Keyguard, this will explain users to tap again to launch a notification. [CHAR LIMIT=60] -->
+  <!-- Shows when people have pressed the unlock icon to explain how to unlock. [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the phone icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the voice assist icon [CHAR LIMIT=60] -->
+  <!-- Shows when people have clicked on the camera icon [CHAR LIMIT=60] -->
+  <!-- Accessibility content description for Interruption level: None. [CHAR LIMIT=NONE] -->
+  <!-- Interruption level: None. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only. [CHAR LIMIT=40] -->
+  <!-- Interruption level: None.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Priority.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Interruption level: Alarms only.  Optimized for narrow two-line display. [CHAR LIMIT=40] -->
+  <!-- Indication on the keyguard that is shown when the device is charging. [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging rapidly. Should match keyguard_plugged_in_charging_fast [CHAR LIMIT=40]-->
+  <!-- Indication on the keyguard that is shown when the device is charging slowly. Should match keyguard_plugged_in_charging_slowly [CHAR LIMIT=40]-->
+  <!-- Related to user switcher -->
+  <!-- Accessibility label for the button that opens the user switcher. -->
+  <!-- Accessibility label for the button that opens the user switcher and announces the current user. -->
+  <!-- Accessibility label for the user icon on the lock screen. -->
+  <!-- Accessibility label for the button that opens the quick contact of the user. -->
+  <!-- Label for the adding a new user in the user switcher [CHAR LIMIT=35] -->
+  <!-- Name for a freshly added user [CHAR LIMIT=30] -->
+  <!-- Name for the guest user [CHAR LIMIT=35] -->
+  <!-- Label for adding a new guest in the user switcher [CHAR LIMIT=35] -->
+  <!-- Label for exiting and removing the  guest session in the user switcher [CHAR LIMIT=35] -->
+  <!-- Title of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the confirmation dialog when exiting guest session [CHAR LIMIT=NONE] -->
+  <!-- Label for button in confirmation dialog when exiting guest session [CHAR LIMIT=35] -->
+  <!-- Title of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Message of the notification when resuming an existing guest session [CHAR LIMIT=NONE] -->
+  <!-- Notification when resuming an existing guest session: Action that starts a new session [CHAR LIMIT=35] -->
+  <!-- Notification when resuming an existing guest session: Action that continues with the current session [CHAR LIMIT=35] -->
+  <!-- Title of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Text of the notification shown to a new guest user [CHAR LIMIT=60] -->
+  <!-- Remove action in the notification shown to a new guest user [CHAR LIMIT=30] -->
+  <!-- Title for add user confirmation dialog [CHAR LIMIT=30] -->
+  <!-- Message for add user confirmation dialog - short version. [CHAR LIMIT=none] -->
+  <!-- Battery saver notification title. [CHAR LIMIT=60]-->
+  <!-- Battery saver notification text. [CHAR LIMIT=60] -->
+  <!-- Battery saver notification action text. [CHAR LIMIT=60] -->
+  <!-- Text shown in place of notification contents when the notification is hidden on a secure lockscreen -->
+  <!-- Media projection permission dialog warning text. [CHAR LIMIT=NONE] -->
+  <!-- Media projection permission dialog permanent grant check box. [CHAR LIMIT=NONE] -->
+  <!-- The text to clear all notifications. [CHAR LIMIT=60] -->
+  <!-- Media projection permission dialog action text. [CHAR LIMIT=60] -->
+  <!-- Text which is shown in the notification shade when there are no notifications. [CHAR LIMIT=30] -->
+  <!-- Footer device owned text [CHAR LIMIT=50] -->
+  <!-- Footer profile owned text [CHAR LIMIT=50] -->
+  <!-- Footer vpn present text [CHAR LIMIT=50] -->
+  <!-- Monitoring dialog title for device owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for profile owned devices [CHAR LIMIT=35] -->
+  <!-- Monitoring dialog title for normal devices  [CHAR LIMIT=35]-->
+  <!-- Monitoring dialog disable vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] -->
+  <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with device owner text [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog VPN with profile owner text [CHAR LIMIT=400] -->
+  <!-- Name for a generic legacy VPN connection [CHAR LIMIT=20] -->
+  <!-- Monitoring dialog text for single app (no profile or device owner) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside personal profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (inside work profile) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for multiple apps (in personal and work profiles) [CHAR LIMIT=400] -->
+  <!-- Monitoring dialog text for single app (with device owner) [CHAR LIMIT=400] -->
+  <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] -->
+  <!-- Title of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=40] -->
+  <!-- Body of notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=60] -->
+  <!-- Cancel action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to show notification children [CHAR LIMIT=20] -->
+  <!-- Text for the button to expand the notifications to hide notification children [CHAR LIMIT=20] -->
+  <!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
+  <!-- Button label for ending zen mode in the volume dialog -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog expand button. [CHAR LIMIT=NONE] -->
+  <!-- Content description for accessibility (not shown on the screen): volume dialog collapse button. [CHAR LIMIT=NONE] -->
+  <!-- Screen pinning dialog title. -->
+  <!-- Screen pinning dialog description. -->
+  <!-- Screen pinning dialog description when in accessibility mode. -->
+  <!-- Screen pinning positive response. -->
+  <!-- Screen pinning negative response. -->
+  <!-- Hide quick settings tile confirmation title -->
+  <!-- Hide quick settings tile confirmation message -->
+  <!-- Hide quick settings tile confirmation button -->
+  <!-- VolumeUI activation dialog: warning message -->
+  <!-- VolumeUI activation dialog: allow button label -->
+  <!-- VolumeUI activation dialog: deny button label -->
+  <!-- VolumeUI restoration notification: title -->
+  <!-- VolumeUI restoration notification: text -->
+  <!-- Toast shown when user unlocks screen and managed profile activity is in the foreground -->
+  <!-- Name of special SystemUI debug settings -->
+  <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->
+  <!-- Summary for battery percentage preference [CHAR LIMIT=NONE] -->
+  <!-- Name of quick settings -->
+  <!-- Name of status bar -->
+  <!-- Name of demo mode (mode with preset icons for screenshots) -->
+  <!-- Enable demo mode -->
+  <!-- Show demo mode icons -->
+  <!-- Name of the ethernet status bar icon. -->
   <string name="status_bar_ethernet">دائىرىلىك تور</string>
+  <!-- Name of the alarm status bar icon. -->
+  <!-- Name of the work status bar icon. -->
+  <!-- Name of the airplane status bar icon. -->
   <string name="status_bar_airplane">ئايروپىلان ھالىتى</string>
+  <!-- Description for adding  a quick settings tile -->
+  <!-- Name of a quick settings tile controlled by broadcast -->
+  <!-- For preview release. DO NOT TRANSLATE -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb [CHAR LIMIT=NONE] -->
+  <!-- Warning text when an alarm might be silenced by Do Not Disturb due to a time-based condition [CHAR LIMIT=NONE] -->
+  <!-- Alarm template for near alarms [CHAR LIMIT=25] -->
+  <!-- Alarm template for far alarms [CHAR LIMIT=25] -->
+  <!-- Accessibility label for Quick Settings detail screens [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for hotspot icon [CHAR LIMIT=NONE] -->
+  <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->
+  <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->
+  <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->
+  <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->
+  <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->
+  <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->
+  <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->
+  <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->
+  <!-- Dialog title asking if Bluetooth should be enabled [CHAR LIMIT=NONE] -->
+  <!-- Dialog message explaining why Bluetooth should be enabled when a packaged keyboard is
+         conncted to the device [CHAR LIMIT=NONE] -->
+  <!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
 </resources>
diff --git a/packages/SystemUI/res/values-uk/cm_arrays.xml b/packages/SystemUI/res/values-uk/cm_arrays.xml
index 8d05dc1..6f9b23f 100644
--- a/packages/SystemUI/res/values-uk/cm_arrays.xml
+++ b/packages/SystemUI/res/values-uk/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>Пн</item>
+    <!-- North -->
     <item>ПнСх</item>
+    <!-- North east -->
     <item>Сх</item>
+    <!-- East -->
     <item>ПдСх</item>
+    <!-- South east -->
     <item>Пд</item>
+    <!-- South -->
     <item>ПдЗх</item>
+    <!-- South west -->
     <item>Зх</item>
+    <!-- West -->
     <item>ПнЗх</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-uk/cm_strings.xml b/packages/SystemUI/res/values-uk/cm_strings.xml
index 7168559..57b9cb5 100644
--- a/packages/SystemUI/res/values-uk/cm_strings.xml
+++ b/packages/SystemUI/res/values-uk/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Проведіть вправо для %1$s</string>
   <string name="right_shortcut_hint">Проведіть вліво для %1$s</string>
   <string name="lockscreen_message">Натисніть на іконку ліворуч або праворуч для зміни ярлика екрану блокування.</string>
@@ -26,6 +34,7 @@
   <string name="select_application">Вибрати програму</string>
   <string name="lockscreen_choose_action_title">Виберіть дію</string>
   <string name="lockscreen_none_target">НІчого</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Виберіть дію щоб призначити</string>
   <string name="navbar_home_button">Кнопка Додому</string>
   <string name="navbar_recent_button">Останні програми</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">Кнопка Меню</string>
   <string name="accessibility_dpad_left">Курсор ліворуч</string>
   <string name="accessibility_dpad_right">Курсор праворуч</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Стерти дані програм</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Примусово зупинити</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Деінсталювати</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">Яскравість</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Профілі вимкнено.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Профіль: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Профілі вимкнено.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Профіль змінено на <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Ініціалізація\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">Індикатор подій</string>
   <string name="led_notification_text">Світлодіод увімкнено параметрами</string>
   <string name="qs_tile_edit_header_instruction">Натисніть і утримуйте плитку, щоб змінити</string>
@@ -57,6 +76,7 @@
   <string name="quick_settings_title_tiles">Плитки</string>
   <string name="quick_settings_title_show_weather">Показати погоду</string>
   <string name="quick_settings_title_enlarge_first_row">Збільшити перший рядок</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Триматиме це перед Вами, доки не відкріпите. Торкніться й утримуйте кнопку «Назад», щоб відкріпити.</string>
   <string name="quick_settings_custom_tile_detail_title">Власна плитка</string>
   <string name="quick_settings_remove">Видалити плитку</string>
@@ -67,9 +87,14 @@
   <string name="quick_settings_profiles_off">Профілі вимкнуто</string>
   <string name="quick_settings_heads_up_label">Спливаючі сповіщення</string>
   <string name="quick_settings_battery_saver_label">Енергозбереження</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Синхронізацію вимкнено.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Синхронізацію увімкнено.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Синхронізацію вимкнено.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Синхронізація увімкнено.</string>
   <string name="quick_settings_sync_label">Синхронізація</string>
   <string name="quick_settings_volume_panel_label">Панель гучності</string>
@@ -78,61 +103,105 @@
   <string name="quick_settings_lockscreen_label">Заблокувати екран</string>
   <string name="quick_settings_ambient_display_label">Ambient display</string>
   <string name="quick_settings_lockscreen_label_enforced">Блокування екрану ввімкнено</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Вимкнення екрана через: <xliff:g id="timeout" example="30 seconds">%s</xliff:g> секунд.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Вимкнення екрана відбувається через <xliff:g id="timeout" example="30 seconds">%s</xliff:g> секунд бездіяльності.</string>
   <string name="qs_tile_performance">Енергоспоживання</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Режим батареї: збереження енергії.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Режим батареї: збалансований режим.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Режим батареї: висока продуктивність.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Енергоспоживання: енергоефективне.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Енергоспоживання: продуктивне.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Акумулятор тепер в режимі економії енергії.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Режим акумулятора змінено на збалансований.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Режим акумулятора змінено для високої продуктивності.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Енергоспоживання змінено на ефективне.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Енергоспоживання змінено на продуктивне.</string>
   <string name="quick_settings_performance_profile_detail_title">Енергоспоживання</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Блокування екрана вимкнено.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Блокування екрана увімкнено.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Блокування екрана вимкнено.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Блокування екрана увімкнено.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Ambient display вимкнено.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Ambient display увімкнено.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Ambient дисплей вимкнено.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Ambient display увімкнено.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Спливаючі сповіщення вимкнено.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Спливаючі сповіщення увімкнено.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Спливаючі сповіщення вимкнено.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Спливаючі сповіщення увімкнено.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Енергозбереження вимкнено.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Енергозбереження увімкнено.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Енергозбереження вимкнено.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Енергозбереження увімкнено.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Динамічні плитки</string>
   <string name="dynamic_qs_tile_next_alarm_label">Наступний сигнал</string>
   <string name="dynamic_qs_tile_ime_selector_label">Вибір способу вводу</string>
   <string name="dynamic_qs_tile_su_label">Root доступ</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay вимкнено.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: автоматичний режим.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: денний режим.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: нічний режим.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: режим «На вулиці».</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay вимкнено.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay у автоматичниому режимі.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay у денному режимі.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay у нічному режимі.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay у режимі «На вулиці».</string>
   <string name="quick_settings_title_advanced_location">Параметри відправки геоданих</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Надсилання місця розташування: економія батареї.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Надсилання місця розташування: тільки датчики.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Надсилання місця розташування: висока точність.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Режим розташування</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Економія батареї</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">По датчиках пристрою</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Висока точність</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Визначення місцезнаходження у режимі економії батареї.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Визначення місцезнаходження тепер використовує лише датчики пристрою.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Визначення місцезнаходження у режимі високої точності.</string>
   <string name="quick_settings_tiles_category_system">Системні плитки</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">Додати плитку</string>
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Заряд батареї док-станції <xliff:g id="number">%d</xliff:g> процентів.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Показати чергу відтворення</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-ur-rPK/cm_arrays.xml b/packages/SystemUI/res/values-ur-rPK/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-ur-rPK/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-ur-rPK/cm_strings.xml b/packages/SystemUI/res/values-ur-rPK/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-ur-rPK/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-uz-rUZ/cm_arrays.xml b/packages/SystemUI/res/values-uz-rUZ/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-uz-rUZ/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-uz-rUZ/cm_strings.xml b/packages/SystemUI/res/values-uz-rUZ/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-uz-rUZ/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values-vi/cm_arrays.xml b/packages/SystemUI/res/values-vi/cm_arrays.xml
index 582b87c..073293f 100644
--- a/packages/SystemUI/res/values-vi/cm_arrays.xml
+++ b/packages/SystemUI/res/values-vi/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>B</item>
+    <!-- North -->
     <item>ĐB</item>
+    <!-- North east -->
     <item>Đ</item>
+    <!-- East -->
     <item>ĐN</item>
+    <!-- South east -->
     <item>N</item>
+    <!-- South -->
     <item>TN</item>
+    <!-- South west -->
     <item>T</item>
+    <!-- West -->
     <item>TB</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-vi/cm_strings.xml b/packages/SystemUI/res/values-vi/cm_strings.xml
index d094a3e..e60cee2 100644
--- a/packages/SystemUI/res/values-vi/cm_strings.xml
+++ b/packages/SystemUI/res/values-vi/cm_strings.xml
@@ -16,12 +16,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_hspap">HSPA +</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_data_connection_4g_plus">4 G +</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">Vuốt sang phải cho %1$s</string>
   <string name="right_shortcut_hint">Vuốt sang trái cho %1$s</string>
+  <string name="lockscreen_message">Chạm vào một biểu tượng bên trái hoặc phải để tái chỉ định một lối tắt màn hình khóa.</string>
+  <string name="lockscreen_default_target">Mặc định</string>
   <string name="select_application">Chọn ứng dụng</string>
   <string name="lockscreen_choose_action_title">Chọn hành động</string>
   <string name="lockscreen_none_target">Không</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">Chọn hành động để gán</string>
   <string name="navbar_home_button">Nút Home</string>
   <string name="navbar_recent_button">Nút ứng dụng gần đây</string>
@@ -33,14 +46,38 @@
   <string name="navbar_menu_big_button">Nút trình đơn</string>
   <string name="accessibility_dpad_left">Trỏ trái</string>
   <string name="accessibility_dpad_right">Trỏ phải</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">Xoá dữ liệu ứng dụng</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">Buộc dừng</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">Gỡ cài đặt</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_notification_brightness">Độ sáng đèn</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">Hồ sơ tắt.</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">Hồ sơ: <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">Hồ sơ đã tắt.</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">Hồ sơ đã đổi thành <xliff:g id="profile" example="Default">%s</xliff:g>.</string>
   <string name="quick_settings_compass_init">Đang khởi tạo\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <string name="led_notification_title">Cài đặt đèn</string>
+  <string name="led_notification_text">Đèn LED được kích hoạt theo cài đặt</string>
+  <string name="qs_tile_edit_header_instruction">Bấm và giữ ô để sắp xếp lại</string>
+  <string name="quick_settings_edit_label">Chỉnh sửa ô</string>
+  <string name="quick_settings_cannot_delete_edit_tile">Không thể xoá ô Chỉnh sửa</string>
+  <string name="qs_tiles_reset_confirmation">Đặt lại ô cài đặt nhanh về cấu hình mặc định?</string>
+  <string name="quick_settings_tile_reset_to_default">Đặt lại bố cục mặc định</string>
+  <string name="quick_settings_title_header">Tiêu đề</string>
+  <string name="quick_settings_title_tiles">Ô</string>
+  <string name="quick_settings_title_show_weather">Hiện thời tiết</string>
+  <string name="quick_settings_title_show_brightness_slider">Hiện thanh điều chỉnh độ sáng</string>
+  <string name="quick_settings_title_enlarge_first_row">Phóng lớn hàng đầu tiên</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">Điều này sẽ giúp nó hiển thị cho đến khi bạn bỏ ghim. Chạm và giữ nút Quay lại để bỏ ghim.</string>
   <string name="quick_settings_custom_tile_detail_title">Kiểu xếp cạnh nhau tùy chỉnh</string>
   <string name="quick_settings_remove">Gỡ kiểu xếp cạnh nhau</string>
@@ -51,9 +88,16 @@
   <string name="quick_settings_profiles_off">Cấu hình bị vô hiệu hóa</string>
   <string name="quick_settings_heads_up_label">Heads up</string>
   <string name="quick_settings_battery_saver_label">Trình tiết kiệm pin</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">Trình tiết kiệm pin (đang sạc)</string>
+  <string name="quick_settings_caffeine_label">Cafein</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">Tắt đồng bộ.</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">Bật đồng bộ.</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">Đã tắt đồng bộ.</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">Đã bật đồng bộ.</string>
   <string name="quick_settings_sync_label">Đồng bộ</string>
   <string name="quick_settings_volume_panel_label">Bảng điều khiển âm lượng</string>
@@ -62,58 +106,115 @@
   <string name="quick_settings_lockscreen_label">Màn hình khoá</string>
   <string name="quick_settings_ambient_display_label">Hiển thị môi trường xung quanh</string>
   <string name="quick_settings_lockscreen_label_enforced">Buộc khoá màn hình</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">Bị vô hiệu theo cấu hình</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">Thời gian chờ của màn hình: <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">Thời gian chờ của màn hình đã đổi thành <xliff:g id="timeout" example="30 seconds">%s</xliff:g>.</string>
   <string name="qs_tile_performance">Chế độ pin</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">Chế độ pin: chế độ tiết kiệm năng lượng.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">Chế độ pin: chế độ cân bằng.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">Pin chế độ: chế độ hiệu suất.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">Chế độ pin: chế độ hiệu quả.</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">Chế độ pin: chế độ nhanh.</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">Chế độ pin đã đổi sang chế độ tiết kiệm năng lượng.</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">Chế độ pin đã đổi sang chế độ cân bằng.</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">Chế độ pin đã đổi sang chế độ hiệu suất.</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">Chế độ pin được chuyển sang hiệu quả.</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">Chế độ pin được chuyển sang nhanh.</string>
   <string name="quick_settings_performance_profile_detail_title">Chế độ pin</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">Màn hình khóa tắt.</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">Màn hình khóa bật.</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">Màn hình khóa đã tắt.</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">Màn hình khóa đã bật.</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">Tắt hiển thị môi trường xung quanh.</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">Hiển thị môi trường xung quanh bật.</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">Hiển thị môi trường xung quanh đã tắt.</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">Hiển thị môi trường xung quanh đã bật.</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">Heads up tắt.</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">Heads up bật.</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">Heads up đã tắt.</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">Heads up đã bật.</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">Đã tắt Cafein.</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">Đã bật Cafein.</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">Trình tiết kiệm pin: Tắt.</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">Trình tiết kiệm pin: Bật.</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">Đã tắt Trinh tiết kiệm pin.</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">Đã bật Trình tiết kiệm pin.</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">Kiểu xếp cạnh nhau động</string>
   <string name="dynamic_qs_tile_next_alarm_label">Báo thức tiếp theo</string>
   <string name="dynamic_qs_tile_ime_selector_label">Trình chọn IME</string>
   <string name="dynamic_qs_tile_su_label">Truy cập root</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay tắt.</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: chế độ tự động.</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: chế độ ban ngày.</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: chế độ ban đêm.</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: chế độ ngoài trời.</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay đã tắt.</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay đã đổi sang chế độ tự động.</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay đã đổi sang chế độ ban ngày.</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay đã đổi sang chế độ ban đêm.</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay đã đổi sang chế độ ngoài trời.</string>
+  <string name="quick_settings_title_advanced_location">Ba trạng thái cho cài đặt vị trí</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">Báo cáo vị trí: chế độ tiết kiệm pin.</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">Báo cáo vị trí: chế độ chỉ cám biến.</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">Báo cáo vị trí: chế độ chính xác cao.</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">Chế độ vị trí</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">Tiết kiệm pin</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">Chỉ thiết bị</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">Chính xác cao</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">Báo cáo vị trí đã đổi sang chế độ tiết kiệm pin.</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">Báo cáo vị trí đã đổi sang chế độ chỉ cảm biến.</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">Báo cáo vị trí đã đổi sang chế độ chính xác cao.</string>
+  <string name="quick_settings_tiles_category_system">Ô hệ thống</string>
+  <!-- detail header when adding a tile -->
+  <string name="quick_settings_tiles_add_tiles">Thêm một ô</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">Không thể kết nối với mạng di động khi đã kích hoạt chế độ trên Máy bay. Vô hiệu chế độ trên Máy bay và thử lại.</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">Đã bật đèn pin</string>
+  <string name="quick_settings_tile_flashlight_not_summary">Chạm vào để tắt</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="other">%1$d máy khách</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">Không có SIM dữ liệu</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">Thanh pin <xliff:g id="number">%d</xliff:g> phần trăm.</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">Hiện danh sách chờ phát</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/cm_arrays.xml b/packages/SystemUI/res/values-zh-rCN/cm_arrays.xml
index e8a8e90..26094b4 100644
--- a/packages/SystemUI/res/values-zh-rCN/cm_arrays.xml
+++ b/packages/SystemUI/res/values-zh-rCN/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>北</item>
+    <!-- North -->
     <item>东北</item>
+    <!-- North east -->
     <item>东</item>
+    <!-- East -->
     <item>东南</item>
+    <!-- South east -->
     <item>南</item>
+    <!-- South -->
     <item>西南</item>
+    <!-- South west -->
     <item>西</item>
+    <!-- West -->
     <item>西北</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
index 612b327..525300b 100644
--- a/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">向右滑动以%1$s</string>
   <string name="right_shortcut_hint">向左滑动以%1$s</string>
   <string name="lockscreen_message">轻触左边或右边的图标来重新分配锁屏快捷方式。</string>
@@ -26,6 +34,7 @@
   <string name="select_application">选择应用</string>
   <string name="lockscreen_choose_action_title">选择操作</string>
   <string name="lockscreen_none_target">无</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">选择要分配的动作</string>
   <string name="navbar_home_button">Home 键</string>
   <string name="navbar_recent_button">任务键</string>
@@ -37,15 +46,25 @@
   <string name="navbar_menu_big_button">菜单键</string>
   <string name="accessibility_dpad_left">光标左移</string>
   <string name="accessibility_dpad_right">光标右移</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">擦除应用数据</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">强行停止</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">卸载</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">指示灯亮度</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">情景模式关闭。</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">情景模式：<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">情景模式已关闭。</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">情景模式已修改为<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
   <string name="quick_settings_compass_init">正在初始化\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示灯设置</string>
   <string name="led_notification_text">LED 灯由设置启用</string>
   <string name="qs_tile_edit_header_instruction">长按瓷块来重新排列</string>
@@ -58,6 +77,7 @@
   <string name="quick_settings_title_show_weather">显示天气</string>
   <string name="quick_settings_title_show_brightness_slider">显示亮度滑块</string>
   <string name="quick_settings_title_enlarge_first_row">扩大第一行</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">这将会固定显示此屏幕，直到您取消固定为止。触摸并按住返回键即可取消固定。</string>
   <string name="quick_settings_custom_tile_detail_title">自定义瓷片</string>
   <string name="quick_settings_remove">移除瓷片</string>
@@ -68,10 +88,16 @@
   <string name="quick_settings_profiles_off">已禁用情景模式</string>
   <string name="quick_settings_heads_up_label">浮动通知</string>
   <string name="quick_settings_battery_saver_label">省电模式</string>
-  <string name="quick_settings_caffeine_label">咖啡因</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">省电模式（充电中）</string>
+  <string name="quick_settings_caffeine_label">保持亮屏</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">同步关闭。</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">同步开启。</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">同步已关闭。</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">同步已开启。</string>
   <string name="quick_settings_sync_label">同步</string>
   <string name="quick_settings_volume_panel_label">音量面板</string>
@@ -81,66 +107,119 @@
   <string name="quick_settings_ambient_display_label">环境显示</string>
   <string name="quick_settings_lockscreen_label_enforced">强制锁屏</string>
   <string name="quick_settings_lockscreen_label_locked_by_profile">已在情景模式中禁用</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">屏幕超时：<xliff:g id="timeout" example="30 seconds">%s</xliff:g>。</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">屏幕超时已修改为<xliff:g id="timeout" example="30 seconds">%s</xliff:g>。</string>
   <string name="qs_tile_performance">电池模式</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">电池模式：节电模式。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">电池模式：平衡模式。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">电池模式：性能模式。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_power">电池模式：效率模式。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bias_perf">电池模式：快速模式。</string>
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">电池模式已更改为省电模式。</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">电池模式已修改为平衡模式。</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">电池模式已修改为性能模式。</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_power">电池模式已修改为效率模式。</string>
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bias_perf">电池模式已修改为快速模式。</string>
   <string name="quick_settings_performance_profile_detail_title">电池模式</string>
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">锁屏关闭。</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">锁屏开启。</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">锁屏已关闭。</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">锁屏已开启。</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">关闭环境显示。</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">开启环境显示。</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">环境显示已关闭。</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">环境显示已开启。</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">浮动通知关。</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">浮动通知开。</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">浮动通知已关闭。</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">浮动通知已开启。</string>
-  <string name="accessibility_quick_settings_caffeine_off">咖啡因模式关闭</string>
-  <string name="accessibility_quick_settings_caffeine_on">咖啡因模式开启</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">保持亮屏关闭。</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">保持亮屏开启。</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_off">省电模式关闭。</string>
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_on">省电模式开启。</string>
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_off">已关闭省电模式。</string>
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_battery_saver_changed_on">已开启省电模式。</string>
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">动态按钮</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一个闹铃</string>
   <string name="dynamic_qs_tile_ime_selector_label">输入法选择器</string>
   <string name="dynamic_qs_tile_su_label">Root 授权</string>
-  <string name="accessibility_quick_settings_live_display_off">LiveDisplay 关闭。</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay：自动模式。</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay：白天模式。</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay：夜晚模式。</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay：户外模式。</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay 已关闭。</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay 已修改为自动模式。</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay 已修改为白天模式。</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay 已修改为夜晚模式。</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay 已修改为户外模式。</string>
+  <string name="dynamic_qs_tile_themes_label">主题</string>
   <string name="quick_settings_title_advanced_location">三种状态的位置设置</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">位置报告：节电模式。</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">位置报告：仅传感器模式。</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">位置报告：高准确度模式。</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">位置信息模式</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">耗电量低</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">仅限设备</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">准确度高</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">地理位置报告已修改为节能模式。</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">位置报告已修改为仅使用传感器模式。</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">位置报告已修改为准确度高模式。</string>
   <string name="quick_settings_tiles_category_system">系统磁块</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">添加磁块</string>
+  <!-- Hotspot dialog message -->
   <string name="hotspot_apm_message">飞行模式启用时无法连接到移动网络。请禁用飞行模式并重试。</string>
+  <!-- Notification which notifies user flashlight is enabled -->
   <string name="quick_settings_tile_flashlight_not_title">手电筒已开</string>
   <string name="quick_settings_tile_flashlight_not_summary">轻按以关闭</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="other">%1$d 台设备</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">没有数据 SIM 卡</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">底座电池百分之 <xliff:g id="number">%d</xliff:g>。</string>
+  <!-- Play queue -->
+  <string name="play_queue_extention">显示播放队列</string>
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+  <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+  <string name="expand_hint">向下滑动以展开</string>
+  <string name="swipe_left_hint">向左滑动以 <xliff:g id="app_name">%1$s</xliff:g></string>
+  <string name="swipe_right_hint">向右滑动以查看通知</string>
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rHK/cm_arrays.xml b/packages/SystemUI/res/values-zh-rHK/cm_arrays.xml
index 1808f89..4280641 100644
--- a/packages/SystemUI/res/values-zh-rHK/cm_arrays.xml
+++ b/packages/SystemUI/res/values-zh-rHK/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>北</item>
+    <!-- North -->
     <item>東北</item>
+    <!-- North east -->
     <item>東</item>
+    <!-- East -->
     <item>東南</item>
+    <!-- South east -->
     <item>南</item>
+    <!-- South -->
     <item>西南</item>
+    <!-- South west -->
     <item>西</item>
+    <!-- West -->
     <item>西北</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rHK/cm_strings.xml b/packages/SystemUI/res/values-zh-rHK/cm_strings.xml
index 9d6d7ed..ecd9d00 100644
--- a/packages/SystemUI/res/values-zh-rHK/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/cm_strings.xml
@@ -16,26 +16,46 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">向右滑動即可%1$s</string>
   <string name="right_shortcut_hint">向左滑動即可%1$s</string>
   <string name="select_application">選擇應用程式</string>
   <string name="lockscreen_choose_action_title">選擇操作</string>
   <string name="lockscreen_none_target">無</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_empty_button">清空按鈕</string>
   <string name="navbar_menu_conditional_button">功能表（自動隱藏）按鈕</string>
   <string name="navbar_menu_always_button">功能表（一律顯示）按鈕</string>
   <string name="navbar_menu_big_button">功能表按鈕</string>
   <string name="accessibility_dpad_left">游標向左</string>
   <string name="accessibility_dpad_right">游標向右</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">擦除應用程式數據</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">強制停止</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">解除安裝</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_off">設定檔已關閉。</string>
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles">設定檔：<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed_off">設定檔已關閉。</string>
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_profiles_changed">設定檔已改為<xliff:g id="profile" example="Default">%s</xliff:g>。</string>
   <string name="quick_settings_compass_init">正在初始化\u2026</string>
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="screen_pinning_description_no_navbar">這將保持畫面在視野範圍內，直至您解鎖畫面位置。觸摸并按住返回按鈕即可解鎖畫面。</string>
   <string name="quick_settings_custom_tile_detail_title">自訂方塊</string>
   <string name="quick_settings_remove">移除方塊</string>
@@ -44,9 +64,14 @@
   <string name="quick_settings_nfc_label">NFC</string>
   <string name="quick_settings_profiles">系統設定檔</string>
   <string name="quick_settings_heads_up_label">浮動通知</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">已關閉同步。</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">已開啟同步。</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">同步已關閉。</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">同步已開啟。</string>
   <string name="quick_settings_sync_label">同步</string>
   <string name="quick_settings_volume_panel_label">音量區</string>
@@ -54,44 +79,87 @@
   <string name="quick_settings_screen_timeout_detail_title">螢幕逾時</string>
   <string name="quick_settings_ambient_display_label">環境顯示</string>
   <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定螢幕</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout">螢幕逾時：<xliff:g id="timeout" example="30 seconds">%s</xliff:g>。</string>
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_screen_timeout_changed">螢幕逾時設定已改為<xliff:g id="timeout" example="30 seconds">%s</xliff:g>。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_pwrsv">電池模式：省電模式</string>
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_bal">電池模式：平衡模式。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_perf">電池模式：性能模式。</string>
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_pwrsv">電池模式已改為省電模式。</string>
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_bal">電池模式已改為平衡模式。</string>
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_perf_profile_changed_perf">電池模式已改為性能模式。</string>
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_off">已關閉鎖定螢幕功能。</string>
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_on">已開啟鎖定螢幕功能。</string>
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_off">已關閉鎖定螢幕功能。</string>
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_lock_screen_changed_on">已開啟鎖定螢幕功能。</string>
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">已關閉浮動通知。</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">已開啟浮動通知。</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">已關閉浮動通知。</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">已開啟浮動通知。</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">動態方塊</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
   <string name="dynamic_qs_tile_su_label">Root 權限</string>
-  <string name="accessibility_quick_settings_live_display_off">已關閉 LiveDisplay。</string>
-  <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: 自動模式。</string>
-  <string name="accessibility_quick_settings_live_display_day">LiveDisplay: 日間模式。</string>
-  <string name="accessibility_quick_settings_live_display_night">LiveDisplay: 夜間模式。</string>
-  <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: 戶外模式。</string>
-  <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay 已關閉。</string>
-  <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay 已改為自動模式。</string>
-  <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay 已改為日間模式。</string>
-  <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay 已改為夜間模式。</string>
-  <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay 已改為戶外模式。</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">定位報告：省電模式。</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">定位報告：僅感應器模式。</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">定位報告：高精度模式。</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">定位模式</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">省電</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">僅限裝置</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">高精度</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_battery_saving">定位報告已改為省電模式。</string>
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_gps_only">定位報告已改為僅感應器模式。</string>
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_changed_high_accuracy">定位報告已改為高精度模式。</string>
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_dock_battery_level">座架電池 <xliff:g id="number">%d</xliff:g>%%。</string>
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_arrays.xml b/packages/SystemUI/res/values-zh-rTW/cm_arrays.xml
index 1808f89..4280641 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_arrays.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_arrays.xml
@@ -16,14 +16,26 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
   <string-array name="cardinal_directions">
     <item>北</item>
+    <!-- North -->
     <item>東北</item>
+    <!-- North east -->
     <item>東</item>
+    <!-- East -->
     <item>東南</item>
+    <!-- South east -->
     <item>南</item>
+    <!-- South -->
     <item>西南</item>
+    <!-- South west -->
     <item>西</item>
+    <!-- West -->
     <item>西北</item>
+    <!-- North west -->
   </string-array>
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
 </resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
index 17b1c99..09770c6 100644
--- a/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/cm_strings.xml
@@ -16,9 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_hspap">HSPA+</string>
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_data_connection_4g_plus">4G+</string>
+  <!-- Weather string format in expanded statusbar header -->
   <string name="status_bar_expanded_header_weather_format"><xliff:g id="temp">%1$s</xliff:g> - <xliff:g id="condition">%2$s</xliff:g></string>
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
   <string name="left_shortcut_hint">向右滑動即可%1$s</string>
   <string name="right_shortcut_hint">向左滑動即可%1$s</string>
   <string name="lockscreen_message">輕觸左側或右側的圖示以設定鎖定畫面捷徑</string>
@@ -26,6 +34,7 @@
   <string name="select_application">選取應用程式</string>
   <string name="lockscreen_choose_action_title">選取操作</string>
   <string name="lockscreen_none_target">無</string>
+  <!-- Dialog title for navigation bar button selection -->
   <string name="navbar_dialog_title">選擇要指定的操作</string>
   <string name="navbar_home_button">主螢幕鍵</string>
   <string name="navbar_recent_button">多工鍵</string>
@@ -37,11 +46,21 @@
   <string name="navbar_menu_big_button">選單鍵</string>
   <string name="accessibility_dpad_left">游標左移</string>
   <string name="accessibility_dpad_right">游標右移</string>
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
   <string name="advanced_dev_option_wipe_app">清除應用程式資料</string>
+  <!-- Title shown in recents popup for force stopping the application -->
   <string name="advanced_dev_option_force_stop">強制停止</string>
+  <!-- Title shown in recents popup for uninstalling the application -->
   <string name="advanced_dev_option_uninstall">解除安裝</string>
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_notification_brightness">亮度</string>
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_compass_init">正在初始化\u2026</string>
+  <!-- Lights settings, LED notification -->
   <string name="led_notification_title">指示燈設定</string>
   <string name="led_notification_text">已透過設定啟用 LED 指示燈</string>
   <string name="qs_tile_edit_header_instruction">按住瓷磚以重新排列</string>
@@ -54,6 +73,7 @@
   <string name="quick_settings_title_show_weather">顯示天氣資訊</string>
   <string name="quick_settings_title_show_brightness_slider">顯示亮度滑桿</string>
   <string name="quick_settings_title_enlarge_first_row">擴大首行</string>
+  <!-- Screen pinning dialog description (for devices without navbar) -->
   <string name="quick_settings_custom_tile_detail_title">自訂瓷磚</string>
   <string name="quick_settings_remove">移除瓷磚</string>
   <string name="quick_settings_network_adb_label">網路 ADB</string>
@@ -62,9 +82,16 @@
   <string name="quick_settings_profiles">系統設定檔</string>
   <string name="quick_settings_profiles_off">已停用設定檔</string>
   <string name="quick_settings_heads_up_label">浮動通知</string>
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <string name="quick_settings_battery_saver_label_charging">省電模式（充電中）</string>
+  <string name="quick_settings_caffeine_label">暫停休眠</string>
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_off">同步關閉</string>
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_on">同步開啟</string>
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_off">同步已關閉</string>
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_sync_changed_on">同步已開啟</string>
   <string name="quick_settings_sync_label">同步</string>
   <string name="quick_settings_usb_tether_label">USB 網路共用</string>
@@ -72,26 +99,88 @@
   <string name="quick_settings_lockscreen_label">鎖定畫面</string>
   <string name="quick_settings_ambient_display_label">環境顯示</string>
   <string name="quick_settings_lockscreen_label_enforced">強制執行鎖定畫面</string>
+  <string name="quick_settings_lockscreen_label_locked_by_profile">已由設定檔禁用</string>
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_off">環境顯示關閉</string>
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_on">環境顯示開啟</string>
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_off">環境顯示已關閉</string>
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_ambient_display_changed_on">環境顯示已開啟</string>
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_off">浮動通知關閉</string>
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_on">浮動通知開啟</string>
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_off">浮動通知已關閉</string>
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_heads_up_changed_on">浮動通知已開啟</string>
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_off">暫停休眠關閉</string>
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <string name="accessibility_quick_settings_caffeine_on">暫停休眠開啟</string>
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
   <string name="quick_settings_dynamic_tile_detail_title">動態磚</string>
   <string name="dynamic_qs_tile_next_alarm_label">下一個鬧鐘</string>
   <string name="dynamic_qs_tile_ime_selector_label">輸入法選擇器</string>
   <string name="dynamic_qs_tile_su_label">Root 權限</string>
   <string name="quick_settings_title_advanced_location">定位模式</string>
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_battery_saving">位置回報：節約耗電量</string>
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_gps_only">位置回報：僅限裝置</string>
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="accessibility_quick_settings_location_high_accuracy">位置回報：高精確度</string>
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_detail_title">定位模式</string>
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_battery_saving_label">節約耗電量</string>
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_gps_only_label">僅限裝置</string>
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
   <string name="quick_settings_location_high_accuracy_label">高精確度</string>
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
   <string name="quick_settings_tiles_category_system">系統瓷磚</string>
+  <!-- detail header when adding a tile -->
   <string name="quick_settings_tiles_add_tiles">新增瓷磚</string>
+  <!-- Hotspot dialog message -->
+  <string name="hotspot_apm_message">飛航模式啟用時無法連接行動網路，請停用飛航模式後再嘗試。</string>
+  <!-- Notification which notifies user flashlight is enabled -->
+  <string name="quick_settings_tile_flashlight_not_title">手電筒已經開啟</string>
+  <string name="quick_settings_tile_flashlight_not_summary">點擊關閉</string>
+  <!-- Wi-Fi hotspot label when enabled -->
+  <plurals name="wifi_hotspot_connected_clients_label">
+    <item quantity="other">%1$d 用戶</item>
+  </plurals>
+  <!-- CellularTile data sim not configured state string -->
+  <string name="data_sim_not_configured">沒有數據資料傳輸的 SIM 卡</string>
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
 </resources>
diff --git a/packages/SystemUI/res/values-zu/cm_arrays.xml b/packages/SystemUI/res/values-zu/cm_arrays.xml
new file mode 100644
index 0000000..44e4c6a
--- /dev/null
+++ b/packages/SystemUI/res/values-zu/cm_arrays.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2014 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Cardinal directions for the compass tile -->
+  <!-- Performance profiles description-->
+  <!-- Performance profiles announcement-->
+  <!-- Dynamic tiles -->
+</resources>
diff --git a/packages/SystemUI/res/values-zu/cm_strings.xml b/packages/SystemUI/res/values-zu/cm_strings.xml
new file mode 100644
index 0000000..b75332c
--- /dev/null
+++ b/packages/SystemUI/res/values-zu/cm_strings.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!--
+     Copyright (C) 2012-2015 The CyanogenMod 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Content description of the data connection type HSPA+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the data connection type 4G+ for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Weather string format in expanded statusbar header -->
+  <!-- Text to use when the number in a notification info is too large
+         (greater than status_bar_notification_info_maxnum, defined in
+         values/config.xml) and must be truncated.
+         [CHAR LIMIT=4] -->
+  <!-- Strings for lockscreen shortcut hints -->
+  <!-- Dialog title for navigation bar button selection -->
+  <!-- Development shortcuts -->
+  <!-- Title shown in recents popup for wiping application's data -->
+  <!-- Title shown in recents popup for force stopping the application -->
+  <!-- Title shown in recents popup for uninstalling the application -->
+  <!-- Content description of the light brightness slider (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the profiles tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the profiles tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Lights settings, LED notification -->
+  <!-- Screen pinning dialog description (for devices without navbar) -->
+  <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+  <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the sync tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when sync changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the screen timeout tile in quick settings (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the screen timeout tile changes (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, power save mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, balanced mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, performance mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, efficiency mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery mode tile in quick settings when on, quick mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to power save (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to balanced (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to performance (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to efficiency (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the battery mode tile changes to quick (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the lock screen tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when lock screen changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the ambient display tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when ambient display changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the heads up tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when heads up changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the caffeine tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the battery saver tile in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when battery saver changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Dynamic tiles -->
+  <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, sensors only mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Content description of the location tile in quick settings when on, high accuracy mode (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location detail panel title [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, low-power) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, gps-only) [CHAR LIMIT=NONE] -->
+  <!-- QuickSettings: Location (On, high-accuracy) [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to battery saving (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to sensors only (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Announcement made when the location tile changes to high accuracy (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- detail header when adding a tile -->
+  <!-- Hotspot dialog message -->
+  <!-- Notification which notifies user flashlight is enabled -->
+  <!-- Wi-Fi hotspot label when enabled -->
+  <!-- CellularTile data sim not configured state string -->
+  <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
+  <!-- Play queue -->
+  <!-- Path data for portrait battery -->
+  <!-- Path data for landscape battery -->
+  <!-- Path data for circle battery -->
+  <!-- Weather string format in keyguard -->
+</resources>
diff --git a/packages/SystemUI/res/values/cm_arrays.xml b/packages/SystemUI/res/values/cm_arrays.xml
index 7508a65..d4be9d5 100644
--- a/packages/SystemUI/res/values/cm_arrays.xml
+++ b/packages/SystemUI/res/values/cm_arrays.xml
@@ -61,45 +61,24 @@
         <item>@string/dynamic_qs_tile_ime_selector_label</item>
         <item>@string/dynamic_qs_tile_su_label</item>
         <item>@string/dynamic_qs_tile_adb_label</item>
+        <item>@string/dynamic_qs_tile_live_display_label</item>
+        <item>@string/dynamic_qs_tile_themes_label</item>
     </string-array>
     <string-array name="dynamic_qs_tiles_icons_resources_ids" translatable="false">
         <item>ic_dynamic_qs_next_alarm</item>
         <item>ic_dynamic_qs_ime_selector</item>
         <item>ic_dynamic_qs_su</item>
         <item>ic_dynamic_qs_adb</item>
+        <item>ic_dynamic_qs_live_display</item>
+        <item>ic_dynamic_qs_themes</item>
     </string-array>
     <string-array name="dynamic_qs_tiles_values" translatable="false">
         <item>next_alarm</item>
         <item>ime_selector</item>
         <item>su</item>
         <item>adb</item>
-    </string-array>
-
-    <!-- LiveDisplay drawables -->
-    <string-array name="live_display_drawables" translatable="false">
-        <item>@drawable/ic_livedisplay_auto</item>
-        <item>@drawable/ic_livedisplay_off</item>
-        <item>@drawable/ic_livedisplay_day</item>
-        <item>@drawable/ic_livedisplay_night</item>
-        <item>@drawable/ic_livedisplay_outdoor</item>
-    </string-array>
-
-    <!-- LiveDisplay description-->
-    <string-array name="live_display_description" translatable="false">
-        <item>@string/accessibility_quick_settings_live_display_auto</item>
-        <item>@string/accessibility_quick_settings_live_display_off</item>
-        <item>@string/accessibility_quick_settings_live_display_day</item>
-        <item>@string/accessibility_quick_settings_live_display_night</item>
-        <item>@string/accessibility_quick_settings_live_display_outdoor</item>
-    </string-array>
-
-    <!-- LiveDisplay announcement-->
-    <string-array name="live_display_announcement" translatable="false">
-        <item>@string/accessibility_quick_settings_live_display_changed_auto</item>
-        <item>@string/accessibility_quick_settings_live_display_changed_off</item>
-        <item>@string/accessibility_quick_settings_live_display_changed_day</item>
-        <item>@string/accessibility_quick_settings_live_display_changed_night</item>
-        <item>@string/accessibility_quick_settings_live_display_changed_outdoor</item>
+        <item>live_display</item>
+        <item>themes</item>
     </string-array>
 
     <array name="dockbatterymeter_bolt_points" translatable="false">
diff --git a/packages/SystemUI/res/values/cm_attrs.xml b/packages/SystemUI/res/values/cm_attrs.xml
index 0e4933a..36edac0 100644
--- a/packages/SystemUI/res/values/cm_attrs.xml
+++ b/packages/SystemUI/res/values/cm_attrs.xml
@@ -30,5 +30,46 @@
         <attr name="android:title" />
         <attr name="defaultValue" format="integer"/>
     </declare-styleable>
+
+    <declare-styleable name="BatteryMeterViewDrawable">
+        <attr name="android:gravity"/>
+        <!-- Blending mode used for drawing charging bolt and percentage text -->
+        <attr name="blendMode">
+            <!-- [0, 0] -->
+            <enum name="clear" value="0" />
+            <!-- [Sa, Sc] -->
+            <enum name="src" value="1" />
+            <!-- [Da, Dc] -->
+            <enum name="dst" value="2" />
+            <!-- [Sa + (1 - Sa)*Da, Rc = Sc + (1 - Sa)*Dc] -->
+            <enum name="src_over" value="3" />
+            <!-- [Sa + (1 - Sa)*Da, Rc = Dc + (1 - Da)*Sc] -->
+            <enum name="dst_over" value="4" />
+            <!-- [Sa * Da, Sc * Da] -->
+            <enum name="src_in" value="5" />
+            <!-- [Sa * Da, Sa * Dc] -->
+            <enum name="dst_in" value="6" />
+            <!-- [Sa * (1 - Da), Sc * (1 - Da)] -->
+            <enum name="src_out" value="7" />
+            <!-- [Da * (1 - Sa), Dc * (1 - Sa)] -->
+            <enum name="dst_out" value="8" />
+            <!-- [Da, Sc * Da + (1 - Sa) * Dc] -->
+            <enum name="src_atop" value="9" />
+            <!-- [Sa, Sa * Dc + Sc * (1 - Da)] -->
+            <enum name="dst_atop" value="10" />
+            <!-- [Sa + Da - 2 * Sa * Da, Sc * (1 - Da) + (1 - Sa) * Dc] -->
+            <enum name="xor" value="11" />
+            <!-- Saturate(S + D) -->
+            <enum name="add" value="12" />
+            <!-- [Sa * Da, Sc * Dc] -->
+            <enum name="multiply" value="13" />
+            <!-- [Sa + Da - Sa * Da, Sc + Dc - Sc * Dc] -->
+            <enum name="screen" value="14" />
+            <!-- Draw on top without any blending operations performed -->
+            <enum name="overlay" value="15" />
+            <!-- [Sa + Da - Sa*Da, Sc*(1 - Da) + Dc*(1 - Sa) + min(Sc, Dc)] -->
+            <enum name="darken" value="16" />
+        </attr>
+    </declare-styleable>
 </resources>
 
diff --git a/packages/SystemUI/res/values/cm_colors.xml b/packages/SystemUI/res/values/cm_colors.xml
index 37b34b0..5b6e2c0 100644
--- a/packages/SystemUI/res/values/cm_colors.xml
+++ b/packages/SystemUI/res/values/cm_colors.xml
@@ -117,4 +117,12 @@
 
     <!-- Active color for volume slider -->
     <color name="volume_slider_active">@color/system_accent_color</color>
+
+    <!-- Play Queue -->
+    <color name="notification_guts_media_bg_color">#ff606060</color>
+    <color name="queue_background">#ff303030</color>
+    <color name="queue_background_pressed">#ff606060</color>
+
+    <color name="live_lockscreen_gradient_start">#00000000</color>
+    <color name="live_lockscreen_gradient_end">#66000000</color>
 </resources>
diff --git a/packages/SystemUI/res/values/cm_dimens.xml b/packages/SystemUI/res/values/cm_dimens.xml
index 3bce97b..60774cd 100644
--- a/packages/SystemUI/res/values/cm_dimens.xml
+++ b/packages/SystemUI/res/values/cm_dimens.xml
@@ -53,7 +53,6 @@
 
     <dimen name="detail_exterior_padding">8dp</dimen>
 
-    <!-- Size of unlock FAB used when showing external keyguard views -->
-    <dimen name="unlock_fab_size">48dp</dimen>
-
+    <dimen name="queue_row_height">52dp</dimen>
+    <dimen name="queue_top_shadow">3dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/cm_strings.xml b/packages/SystemUI/res/values/cm_strings.xml
index 200a236..2996d21 100644
--- a/packages/SystemUI/res/values/cm_strings.xml
+++ b/packages/SystemUI/res/values/cm_strings.xml
@@ -104,6 +104,8 @@
     <string name="quick_settings_profiles_off">Profiles disabled</string>
     <string name="quick_settings_heads_up_label">Heads up</string>
     <string name="quick_settings_battery_saver_label">Battery saver</string>
+    <!-- quick settings battery saver label to show when device is charging and tile is disabled -->
+    <string name="quick_settings_battery_saver_label_charging">Battery saver (charging)</string>
     <string name="quick_settings_caffeine_label">Caffeine</string>
 
     <!-- Content description of the sync tile in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -204,19 +206,9 @@
     <string name="dynamic_qs_tile_ime_selector_label">IME selector</string>
     <string name="dynamic_qs_tile_su_label">Root access</string>
     <string name="dynamic_qs_tile_adb_label" translatable="false">ADB</string>
+    <string name="dynamic_qs_tile_live_display_label" translatable="false">LiveDisplay</string>
+    <string name="dynamic_qs_tile_themes_label">Themes</string>
 
-    <!-- LiveDisplay strings -->
-    <string name="live_display_title" translatable="false">LiveDisplay</string>
-    <string name="accessibility_quick_settings_live_display_off">LiveDisplay off.</string>
-    <string name="accessibility_quick_settings_live_display_auto">LiveDisplay: auto mode.</string>
-    <string name="accessibility_quick_settings_live_display_day">LiveDisplay: day mode.</string>
-    <string name="accessibility_quick_settings_live_display_night">LiveDisplay: night mode.</string>
-    <string name="accessibility_quick_settings_live_display_outdoor">LiveDisplay: outdoor mode.</string>
-    <string name="accessibility_quick_settings_live_display_changed_off">LiveDisplay turned off.</string>
-    <string name="accessibility_quick_settings_live_display_changed_auto">LiveDisplay changed to auto mode.</string>
-    <string name="accessibility_quick_settings_live_display_changed_day">LiveDisplay changed to day mode.</string>
-    <string name="accessibility_quick_settings_live_display_changed_night">LiveDisplay changed to night mode.</string>
-    <string name="accessibility_quick_settings_live_display_changed_outdoor">LiveDisplay changed to outdoor mode.</string>
     <string name="quick_settings_title_advanced_location">Tri-state location</string>
 
     <!-- Content description of the location tile in quick settings when on, battery saving mode (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -264,4 +256,28 @@
 
     <!-- Content description of the dock battery level icon for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->
     <string name="accessibility_dock_battery_level">Dock battery <xliff:g id="number">%d</xliff:g> percent.</string>
+
+   <!-- Play queue -->
+   <string name="play_queue_extention">Show play queue</string>
+
+    <!-- Path data for portrait battery -->
+    <string name="battery_portrait_path_full" translatable="false">M 5 2 H 19 V 21 H 5 V 2 Z</string>
+    <string name="battery_portrait_path_empty" translatable="false">M 5 21 H 19 V 21 H 5 V 21 Z</string>
+    <string name="battery_portrait_clip_path" translatable="false">M6,21V4h3V2h6v2h3v17H6z</string>
+
+    <!-- Path data for landscape battery -->
+    <string name="battery_landscape_path_full" translatable="false">M 1 4 H 25 V 20 H 1 V 4 Z</string>
+    <string name="battery_landscape_path_empty" translatable="false">M 1 4 H 1 V 20 H 1 V 4 Z</string>
+    <string name="battery_landscape_clip_path" translatable="false">M25,16h-2v4H1V4h22v4h2V16z</string>
+
+    <!-- Path data for circle battery -->
+    <string name="battery_circle_path" translatable="false">M 12 3.5 C 16.6944203736 3.5 20.5 7.30557962644 20.5 12 C 20.5 16.6944203736 16.6944203736 20.5 12 20.5 C 7.30557962644 20.5 3.5 16.6944203736 3.5 12 C 3.5 7.30557962644 7.30557962644 3.5 12 3.5 Z</string>
+
+    <!-- Weather string format in keyguard -->
+    <string name="keyguard_status_view_weather_format"><xliff:g id="temp">%1$s</xliff:g> <xliff:g id="condition">%2$s</xliff:g></string>
+
+    <string name="expand_hint">Swipe down to expand</string>
+    <string name="swipe_left_hint">Swipe left to <xliff:g id="app_name">%1$s</xliff:g></string>
+    <string name="swipe_right_hint">Swipe right to notifications</string>
+
 </resources>
diff --git a/packages/SystemUI/res/values/cm_styles.xml b/packages/SystemUI/res/values/cm_styles.xml
index 8caa89d..1e63418 100644
--- a/packages/SystemUI/res/values/cm_styles.xml
+++ b/packages/SystemUI/res/values/cm_styles.xml
@@ -41,4 +41,17 @@
         <item name="android:textSize">@dimen/qs_detail_item_secondary_text_size</item>
     </style>
 
+    <!-- Base battery metter drawable style -->
+    <style name="BatteryMeterViewDrawable">
+        <!-- gravity used for positioning text within the battery meter -->
+        <item name="android:gravity">center</item>
+        <item name="blendMode">clear</item>
+    </style>
+    <!-- Battery meter drawable styles -->
+    <style name="BatteryMeterViewDrawable.Portrait"/>
+    <style name="BatteryMeterViewDrawable.Landscape"/>
+    <style name="BatteryMeterViewDrawable.Circle">
+        <item name="blendMode">overlay</item>
+    </style>
+
 </resources>
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index cdbe2fd..8ca58ba 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -300,5 +300,8 @@
     <!-- Allow Flashlight service to use wakelock -->
     <bool name="flashlight_use_wakelock">false</bool>
 
+    <!-- Allow device to be configured to show screen on hints on the lock screen -->
+    <bool name="config_showScreenOnLockScreenHints">false</bool>
+
 </resources>
 
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 03ea73c..a7efccd 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -531,7 +531,7 @@
     <dimen name="fake_shadow_size">8dp</dimen>
 
     <!-- Padding between signal cluster and battery icon -->
-    <dimen name="signal_cluster_battery_padding">7dp</dimen>
+    <dimen name="signal_cluster_battery_padding">3dp</dimen>
 
     <!-- Padding for signal cluster and battery icon when there are not icons in signal cluster -->
     <dimen name="no_signal_cluster_battery_padding">3dp</dimen>
diff --git a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
index e606156..06c2957 100755
--- a/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/BatteryMeterView.java
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2013-14 The Android Open Source Project
+ * Copyright (C) 2016 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,43 +17,47 @@
 
 package com.android.systemui;
 
-import com.android.systemui.statusbar.policy.BatteryController;
-import com.android.systemui.statusbar.policy.BatteryStateRegistar;
-
 import android.animation.ArgbEvaluator;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.pm.PackageManager;
 import android.content.res.Resources;
+import android.content.res.ThemeConfig;
 import android.content.res.TypedArray;
+import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.Path;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
 import android.graphics.Rect;
-import android.graphics.RectF;
 import android.graphics.Typeface;
+import android.graphics.drawable.AnimatedVectorDrawable;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
 import android.os.BatteryManager;
 import android.os.Bundle;
 import android.util.AttributeSet;
+import android.util.Log;
+import android.view.Gravity;
 import android.view.View;
 
+import com.android.systemui.statusbar.policy.BatteryController;
+import com.android.systemui.statusbar.policy.BatteryStateRegistar;
+
+import org.cyanogenmod.graphics.drawable.StopMotionVectorDrawable;
+
 public class BatteryMeterView extends View implements DemoMode,
         BatteryController.BatteryStateChangeCallback {
     public static final String TAG = BatteryMeterView.class.getSimpleName();
     public static final String ACTION_LEVEL_TEST = "com.android.systemui.BATTERY_LEVEL_TEST";
 
-    private static final int FULL = 96;
-
-    private static final float BOLT_LEVEL_THRESHOLD = 0.3f;  // opaque bolt below this fraction
-
     private final int[] mColors;
 
     protected boolean mShowPercent = true;
-    private float mButtonHeightFraction;
-    private float mSubpixelSmoothingLeft;
-    private float mSubpixelSmoothingRight;
 
     public enum BatteryMeterMode {
         BATTERY_METER_GONE,
@@ -66,14 +71,9 @@ public class BatteryMeterView extends View implements DemoMode,
     private int mWidth;
     private String mWarningString;
     private final int mCriticalLevel;
-    private final int mFrameColor;
 
     private boolean mAnimationsEnabled;
 
-    private final Path mShapePath = new Path();
-    private final Path mClipPath = new Path();
-    private final Path mTextPath = new Path();
-
     private BatteryStateRegistar mBatteryStateRegistar;
     private BatteryController mBatteryController;
     private boolean mPowerSaveEnabled;
@@ -94,6 +94,9 @@ public class BatteryMeterView extends View implements DemoMode,
     private BatteryMeterDrawable mBatteryMeterDrawable;
     private int mIconTint = Color.WHITE;
 
+    private int mCurrentBackgroundColor = 0;
+    private int mCurrentFillColor = 0;
+
     protected class BatteryTracker extends BroadcastReceiver {
         public static final int UNKNOWN_LEVEL = -1;
 
@@ -225,8 +228,6 @@ public class BatteryMeterView extends View implements DemoMode,
         final Resources res = context.getResources();
         TypedArray atts = context.obtainStyledAttributes(attrs, R.styleable.BatteryMeterView,
                 defStyle, 0);
-        mFrameColor = atts.getColor(R.styleable.BatteryMeterView_frameColor,
-                res.getColor(R.color.batterymeter_frame_color));
         TypedArray levels = res.obtainTypedArray(R.array.batterymeter_color_levels);
         TypedArray colors = res.obtainTypedArray(R.array.batterymeter_color_values);
 
@@ -242,12 +243,6 @@ public class BatteryMeterView extends View implements DemoMode,
         mWarningString = context.getString(R.string.battery_meter_very_low_overlay_symbol);
         mCriticalLevel = getContext().getResources().getInteger(
                 com.android.internal.R.integer.config_criticalBatteryWarningLevel);
-        mButtonHeightFraction = context.getResources().getFraction(
-                R.fraction.battery_button_height_fraction, 1, 1);
-        mSubpixelSmoothingLeft = context.getResources().getFraction(
-                R.fraction.battery_subpixel_smoothing_left, 1, 1);
-        mSubpixelSmoothingRight = context.getResources().getFraction(
-                R.fraction.battery_subpixel_smoothing_right, 1, 1);
 
         mDarkModeBackgroundColor =
                 context.getColor(R.color.dark_mode_icon_color_dual_tone_background);
@@ -260,17 +255,13 @@ public class BatteryMeterView extends View implements DemoMode,
     }
 
     protected BatteryMeterDrawable createBatteryMeterDrawable(BatteryMeterMode mode) {
-        Resources res = mContext.getResources();
+        Resources res = getResources();
         switch (mode) {
-            case BATTERY_METER_CIRCLE:
-                return new CircleBatteryMeterDrawable(res);
-            case BATTERY_METER_ICON_LANDSCAPE:
-                return new NormalBatteryMeterDrawable(res, true);
             case BATTERY_METER_TEXT:
             case BATTERY_METER_GONE:
                 return null;
             default:
-                return new NormalBatteryMeterDrawable(res, false);
+                return new AllInOneBatteryMeterDrawable(res, mode);
         }
     }
 
@@ -279,13 +270,8 @@ public class BatteryMeterView extends View implements DemoMode,
         int width = MeasureSpec.getSize(widthMeasureSpec);
         int height = MeasureSpec.getSize(heightMeasureSpec);
 
-        if (mMeterMode == BatteryMeterMode.BATTERY_METER_CIRCLE) {
-            height += (CircleBatteryMeterDrawable.STROKE_WITH / 3);
-            width = height;
-        } else if (mMeterMode == BatteryMeterMode.BATTERY_METER_TEXT) {
+        if (mMeterMode == BatteryMeterMode.BATTERY_METER_TEXT) {
             onSizeChanged(width, height, 0, 0); // Force a size changed event
-        } else if (mMeterMode == BatteryMeterMode.BATTERY_METER_ICON_LANDSCAPE) {
-            width = (int)(height * 1.2f);
         }
 
         setMeasuredDimension(width, height);
@@ -378,11 +364,6 @@ public class BatteryMeterView extends View implements DemoMode,
                 mBatteryMeterDrawable.onDispose();
             }
             mBatteryMeterDrawable = createBatteryMeterDrawable(mode);
-            if (mMeterMode == BatteryMeterMode.BATTERY_METER_ICON_PORTRAIT ||
-                    mMeterMode == BatteryMeterMode.BATTERY_METER_ICON_LANDSCAPE) {
-                ((NormalBatteryMeterDrawable)mBatteryMeterDrawable).loadBoltPoints(
-                        mContext.getResources());
-            }
             if (tracker.present) {
                 setVisibility(View.VISIBLE);
                 requestLayout();
@@ -394,7 +375,6 @@ public class BatteryMeterView extends View implements DemoMode,
     }
 
     public int getColorForLevel(int percent) {
-
         // If we are in power save mode, always use the normal color.
         if (mPowerSaveEnabled) {
             return mColors[mColors.length-1];
@@ -418,9 +398,9 @@ public class BatteryMeterView extends View implements DemoMode,
 
     public void setDarkIntensity(float darkIntensity) {
         if (mBatteryMeterDrawable != null) {
-            int backgroundColor = getBackgroundColor(darkIntensity);
-            int fillColor = getFillColor(darkIntensity);
-            mBatteryMeterDrawable.setDarkIntensity(backgroundColor, fillColor);
+            mCurrentBackgroundColor = getBackgroundColor(darkIntensity);
+            mCurrentFillColor = getFillColor(darkIntensity);
+            mBatteryMeterDrawable.setDarkIntensity(mCurrentBackgroundColor, mCurrentFillColor);
         }
     }
 
@@ -482,253 +462,83 @@ public class BatteryMeterView extends View implements DemoMode,
         void setDarkIntensity(int backgroundColor, int fillColor);
     }
 
-    protected class NormalBatteryMeterDrawable implements BatteryMeterDrawable {
+    protected class AllInOneBatteryMeterDrawable  implements BatteryMeterDrawable {
         private static final boolean SINGLE_DIGIT_PERCENT = false;
         private static final boolean SHOW_100_PERCENT = false;
 
         private boolean mDisposed;
 
-        protected final boolean mHorizontal;
+        private boolean mIsAnimating; // stores charge-animation status to remove callbacks
+
+        private float mTextX, mTextY; // precalculated position for drawText() to appear centered
 
-        private final Paint mFramePaint, mBatteryPaint, mWarningTextPaint, mTextPaint, mBoltPaint;
-        private float mTextHeight, mWarningTextHeight;
+        private boolean mInitialized;
 
-        private int mChargeColor;
-        private final float[] mBoltPoints;
-        private final Path mBoltPath = new Path();
+        private Paint mTextAndBoltPaint;
+        private Paint mWarningTextPaint;
+        private Paint mClearPaint;
 
-        private final RectF mFrame = new RectF();
-        private final RectF mButtonFrame = new RectF();
-        private final RectF mBoltFrame = new RectF();
+        private LayerDrawable mBatteryDrawable;
+        private Drawable mFrameDrawable;
+        private StopMotionVectorDrawable mLevelDrawable;
+        private Drawable mBoltDrawable;
 
-        public NormalBatteryMeterDrawable(Resources res, boolean horizontal) {
+        private BatteryMeterMode mMode;
+        private int mTextGravity;
+
+        public AllInOneBatteryMeterDrawable(Resources res, BatteryMeterMode mode) {
             super();
-            mHorizontal = horizontal;
-            mDisposed = false;
 
-            mFramePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            mFramePaint.setColor(mFrameColor);
-            mFramePaint.setDither(true);
-            mFramePaint.setStrokeWidth(0);
-            mFramePaint.setStyle(Paint.Style.FILL_AND_STROKE);
+            loadBatteryDrawables(res, mode);
 
-            mBatteryPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            mBatteryPaint.setDither(true);
-            mBatteryPaint.setStrokeWidth(0);
-            mBatteryPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+            mMode = mode;
+            mDisposed = false;
 
-            mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+            // load text gravity and blend mode
+            int[] attrs = new int[] {android.R.attr.gravity, R.attr.blendMode};
+            int resId = getBatteryDrawableStyleResourceForMode(mode);
+            PorterDuff.Mode xferMode = PorterDuff.Mode.XOR;
+            if (resId != 0) {
+                TypedArray a = getContext().obtainStyledAttributes(
+                        getBatteryDrawableStyleResourceForMode(mode), attrs);
+                mTextGravity = a.getInt(0, Gravity.CENTER);
+                xferMode = PorterDuff.intToMode(a.getInt(1,
+                        PorterDuff.modeToInt(PorterDuff.Mode.XOR)));
+            } else {
+                mTextGravity = Gravity.CENTER;
+            }
+            Log.d(TAG, "mTextGravity=" + mTextGravity);
+
+            mTextAndBoltPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
             Typeface font = Typeface.create("sans-serif-condensed", Typeface.BOLD);
-            mTextPaint.setTypeface(font);
-            mTextPaint.setTextAlign(Paint.Align.CENTER);
+            mTextAndBoltPaint.setTypeface(font);
+            mTextAndBoltPaint.setTextAlign(getPaintAlignmentFromGravity(mTextGravity));
+            mTextAndBoltPaint.setXfermode(new PorterDuffXfermode(xferMode));
+            mTextAndBoltPaint.setColor(mCurrentFillColor != 0
+                    ? mCurrentFillColor
+                    : res.getColor(R.color.batterymeter_bolt_color));
 
             mWarningTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
             mWarningTextPaint.setColor(mColors[1]);
             font = Typeface.create("sans-serif", Typeface.BOLD);
             mWarningTextPaint.setTypeface(font);
-            mWarningTextPaint.setTextAlign(Paint.Align.CENTER);
-
-            mChargeColor = getResources().getColor(R.color.batterymeter_charge_color);
+            mWarningTextPaint.setTextAlign(getPaintAlignmentFromGravity(mTextGravity));
 
-            mBoltPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            mBoltPaint.setColor(res.getColor(R.color.batterymeter_bolt_color));
-            mBoltPoints = loadBoltPoints(res);
+            mClearPaint = new Paint();
+            mClearPaint.setColor(0);
         }
 
         @Override
         public void onDraw(Canvas c, BatteryTracker tracker) {
             if (mDisposed) return;
 
-            final int level = tracker.level;
-
-            if (level == BatteryTracker.UNKNOWN_LEVEL) return;
-
-            float drawFrac = (float) level / 100f;
-            final int pt = getPaddingTop() + (mHorizontal ? (int)(mHeight * 0.12f) : 0);
-            final int pl = getPaddingLeft();
-            final int pr = getPaddingRight();
-            final int pb = getPaddingBottom() + (mHorizontal ? (int)(mHeight * 0.08f) : 0);
-            final int height = mHeight - pt - pb;
-            final int width = mWidth - pl - pr;
-
-            final int buttonHeight = (int) ((mHorizontal ? width : height) * mButtonHeightFraction);
-
-            mFrame.set(0, 0, width, height);
-            mFrame.offset(pl, pt);
-
-            if (mHorizontal) {
-                mButtonFrame.set(
-                        /*cover frame border of intersecting area*/
-                        width - buttonHeight - mFrame.left,
-                        mFrame.top + Math.round(height * 0.25f),
-                        mFrame.right,
-                        mFrame.bottom - Math.round(height * 0.25f));
-
-                mButtonFrame.top += mSubpixelSmoothingLeft;
-                mButtonFrame.bottom -= mSubpixelSmoothingRight;
-                mButtonFrame.right -= mSubpixelSmoothingRight;
-            } else {
-                // button-frame: area above the battery body
-                mButtonFrame.set(
-                        mFrame.left + Math.round(width * 0.25f),
-                        mFrame.top,
-                        mFrame.right - Math.round(width * 0.25f),
-                        mFrame.top + buttonHeight);
-
-                mButtonFrame.top += mSubpixelSmoothingLeft;
-                mButtonFrame.left += mSubpixelSmoothingLeft;
-                mButtonFrame.right -= mSubpixelSmoothingRight;
-            }
-
-            // frame: battery body area
-
-            if (mHorizontal) {
-                mFrame.right -= buttonHeight;
-            } else {
-                mFrame.top += buttonHeight;
-            }
-            mFrame.left += mSubpixelSmoothingLeft;
-            mFrame.top += mSubpixelSmoothingLeft;
-            mFrame.right -= mSubpixelSmoothingRight;
-            mFrame.bottom -= mSubpixelSmoothingRight;
-
-            // set the battery charging color
-            mBatteryPaint.setColor(tracker.plugged ? mChargeColor : getColorForLevel(level));
-
-            if (level >= FULL) {
-                drawFrac = 1f;
-            } else if (level <= mCriticalLevel) {
-                drawFrac = 0f;
-            }
-
-            final float levelTop;
-
-            if (drawFrac == 1f) {
-                if (mHorizontal) {
-                    levelTop = mButtonFrame.right;
-                } else {
-                    levelTop = mButtonFrame.top;
-                }
-            } else {
-                if (mHorizontal) {
-                    levelTop = (mFrame.right - (mFrame.width() * (1f - drawFrac)));
-                } else {
-                    levelTop = (mFrame.top + (mFrame.height() * (1f - drawFrac)));
-                }
-            }
-
-            // define the battery shape
-            mShapePath.reset();
-            mShapePath.moveTo(mButtonFrame.left, mButtonFrame.top);
-            if (mHorizontal) {
-                mShapePath.lineTo(mButtonFrame.right, mButtonFrame.top);
-                mShapePath.lineTo(mButtonFrame.right, mButtonFrame.bottom);
-                mShapePath.lineTo(mButtonFrame.left, mButtonFrame.bottom);
-                mShapePath.lineTo(mFrame.right, mFrame.bottom);
-                mShapePath.lineTo(mFrame.left, mFrame.bottom);
-                mShapePath.lineTo(mFrame.left, mFrame.top);
-                mShapePath.lineTo(mButtonFrame.left, mFrame.top);
-                mShapePath.lineTo(mButtonFrame.left, mButtonFrame.top);
-            } else {
-                mShapePath.lineTo(mButtonFrame.right, mButtonFrame.top);
-                mShapePath.lineTo(mButtonFrame.right, mFrame.top);
-                mShapePath.lineTo(mFrame.right, mFrame.top);
-                mShapePath.lineTo(mFrame.right, mFrame.bottom);
-                mShapePath.lineTo(mFrame.left, mFrame.bottom);
-                mShapePath.lineTo(mFrame.left, mFrame.top);
-                mShapePath.lineTo(mButtonFrame.left, mFrame.top);
-                mShapePath.lineTo(mButtonFrame.left, mButtonFrame.top);
+            if (!mInitialized) {
+                init();
             }
 
-            if (tracker.plugged) {
-                // define the bolt shape
-                final float bl = mFrame.left + mFrame.width() / (mHorizontal ? 9f : 4.5f);
-                final float bt = mFrame.top + mFrame.height() / (mHorizontal ? 4.5f : 6f);
-                final float br = mFrame.right - mFrame.width() / (mHorizontal ? 6f : 7f);
-                final float bb = mFrame.bottom - mFrame.height() / (mHorizontal ? 7f : 10f);
-                if (mBoltFrame.left != bl || mBoltFrame.top != bt
-                        || mBoltFrame.right != br || mBoltFrame.bottom != bb) {
-                    mBoltFrame.set(bl, bt, br, bb);
-                    mBoltPath.reset();
-                    mBoltPath.moveTo(
-                            mBoltFrame.left + mBoltPoints[0] * mBoltFrame.width(),
-                            mBoltFrame.top + mBoltPoints[1] * mBoltFrame.height());
-                    for (int i = 2; i < mBoltPoints.length; i += 2) {
-                        mBoltPath.lineTo(
-                                mBoltFrame.left + mBoltPoints[i] * mBoltFrame.width(),
-                                mBoltFrame.top + mBoltPoints[i + 1] * mBoltFrame.height());
-                    }
-                    mBoltPath.lineTo(
-                            mBoltFrame.left + mBoltPoints[0] * mBoltFrame.width(),
-                            mBoltFrame.top + mBoltPoints[1] * mBoltFrame.height());
-                }
-
-                float boltPct = mHorizontal ?
-                        (mBoltFrame.left - levelTop) / (mBoltFrame.left - mBoltFrame.right) :
-                        (mBoltFrame.bottom - levelTop) / (mBoltFrame.bottom - mBoltFrame.top);
-                boltPct = Math.min(Math.max(boltPct, 0), 1);
-                if (boltPct <= BOLT_LEVEL_THRESHOLD) {
-                    // draw the bolt if opaque
-                    c.drawPath(mBoltPath, mBoltPaint);
-                } else {
-                    // otherwise cut the bolt out of the overall shape
-                    mShapePath.op(mBoltPath, Path.Op.DIFFERENCE);
-                }
-            }
-
-            // compute percentage text
-            boolean pctOpaque = false;
-            float pctX = 0, pctY = 0;
-            String pctText = null;
-            if (!tracker.plugged && level > mCriticalLevel && mShowPercent) {
-                mTextPaint.setColor(getColorForLevel(level));
-                final float full = mHorizontal ? 0.60f : 0.45f;
-                final float nofull = mHorizontal ? 0.75f : 0.6f;
-                final float single = mHorizontal ? 0.86f : 0.75f;
-                mTextPaint.setTextSize(height *
-                        (SINGLE_DIGIT_PERCENT ? single
-                                : (tracker.level == 100 ? full : nofull)));
-                mTextHeight = -mTextPaint.getFontMetrics().ascent;
-                pctText = String.valueOf(SINGLE_DIGIT_PERCENT ? (level/10) : level);
-                pctX = mWidth * 0.5f;
-                pctY = (mHeight + mTextHeight) * 0.47f;
-                if (mHorizontal) {
-                    pctOpaque = pctX > levelTop;
-                } else {
-                    pctOpaque = levelTop > pctY;
-                }
-                if (!pctOpaque) {
-                    mTextPath.reset();
-                    mTextPaint.getTextPath(pctText, 0, pctText.length(), pctX, pctY, mTextPath);
-                    // cut the percentage text out of the overall shape
-                    mShapePath.op(mTextPath, Path.Op.DIFFERENCE);
-                }
-            }
-
-            // draw the battery shape background
-            c.drawPath(mShapePath, mFramePaint);
-
-            // draw the battery shape, clipped to charging level
-            if (mHorizontal) {
-                mFrame.right = levelTop;
-            } else {
-                mFrame.top = levelTop;
-            }
-            mClipPath.reset();
-            mClipPath.addRect(mFrame,  Path.Direction.CCW);
-            mShapePath.op(mClipPath, Path.Op.INTERSECT);
-            c.drawPath(mShapePath, mBatteryPaint);
-
-            if (!tracker.plugged) {
-                if (level <= mCriticalLevel) {
-                    // draw the warning text
-                    final float x = mWidth * 0.5f;
-                    final float y = (mHeight + mWarningTextHeight) * 0.48f;
-                    c.drawText(mWarningString, x, y, mWarningTextPaint);
-                } else if (pctOpaque) {
-                    // draw the percentage text
-                    c.drawText(pctText, pctX, pctY, mTextPaint);
-                }
+            drawBattery(c, tracker);
+            if (mAnimationsEnabled) {
+                // TODO: Allow custom animations to be used
             }
         }
 
@@ -740,282 +550,293 @@ public class BatteryMeterView extends View implements DemoMode,
         @Override
         public void setDarkIntensity(int backgroundColor, int fillColor) {
             mIconTint = fillColor;
-            mFramePaint.setColor(backgroundColor);
-            mBoltPaint.setColor(fillColor);
-            mChargeColor = fillColor;
+            // Make bolt fully opaque for increased visibility
+            mBoltDrawable.setTint(0xff000000 | fillColor);
+            mFrameDrawable.setTint(backgroundColor);
+            updateBoltDrawableLayer(mBatteryDrawable, mBoltDrawable);
             invalidate();
         }
 
         @Override
         public void onSizeChanged(int w, int h, int oldw, int oldh) {
-            mHeight = h;
-            mWidth = w;
-            mWarningTextPaint.setTextSize(h * 0.75f);
-            mWarningTextHeight = -mWarningTextPaint.getFontMetrics().ascent;
-        }
-
-        private float[] loadBoltPoints(Resources res) {
-            final int[] pts = res.getIntArray(getBoltPointsArrayResource());
-            int maxX = 0, maxY = 0;
-            for (int i = 0; i < pts.length; i += 2) {
-                maxX = Math.max(maxX, pts[i]);
-                maxY = Math.max(maxY, pts[i + 1]);
-            }
-            final float[] ptsF = new float[pts.length];
-            for (int i = 0; i < pts.length; i += 2) {
-                ptsF[i] = (float)pts[i] / maxX;
-                ptsF[i + 1] = (float)pts[i + 1] / maxY;
-            }
-            return ptsF;
+            init();
         }
 
-        protected int getBoltPointsArrayResource() {
-            return mHorizontal
-                    ? R.array.batterymeter_inverted_bolt_points
-                    : R.array.batterymeter_bolt_points;
+        private boolean isThemeApplied() {
+            ThemeConfig themeConfig = ThemeConfig.getBootTheme(getContext().getContentResolver());
+            return themeConfig != null &&
+                    !ThemeConfig.SYSTEM_DEFAULT.equals(themeConfig.getOverlayForStatusBar());
         }
-    }
 
-    protected class CircleBatteryMeterDrawable implements BatteryMeterDrawable {
-        private static final boolean SINGLE_DIGIT_PERCENT = false;
-        private static final boolean SHOW_100_PERCENT = false;
-
-        private static final int FULL = 96;
+        private void checkBatteryMeterDrawableValid(Resources res, BatteryMeterMode mode) {
+            final int resId = getBatteryDrawableResourceForMode(mode);
+            final Drawable batteryDrawable;
+            try {
+                batteryDrawable = res.getDrawable(resId);
+            } catch (Resources.NotFoundException e) {
+                throw new BatteryMeterDrawableException(res.getResourceName(resId) + " is an " +
+                        "invalid drawable", e);
+            }
 
-        public static final float STROKE_WITH = 6.5f;
+            // check that the drawable is a LayerDrawable
+            if (!(batteryDrawable instanceof LayerDrawable)) {
+                throw new BatteryMeterDrawableException("Expected a LayerDrawable but received a " +
+                        batteryDrawable.getClass().getSimpleName());
+            }
 
-        private boolean mDisposed;
+            final LayerDrawable layerDrawable = (LayerDrawable) batteryDrawable;
+            final Drawable frame = layerDrawable.findDrawableByLayerId(R.id.battery_frame);
+            final Drawable level = layerDrawable.findDrawableByLayerId(R.id.battery_fill);
+            final Drawable bolt = layerDrawable.findDrawableByLayerId(
+                    R.id.battery_charge_indicator);
+            // now check that the required layers exist and are of the correct type
+            if (frame == null) {
+                throw new BatteryMeterDrawableException("Missing battery_frame drawble");
+            }
+            if (bolt == null) {
+                throw new BatteryMeterDrawableException(
+                        "Missing battery_charge_indicator drawable");
+            }
+            if (level != null) {
+                // check that the level drawable is an AnimatedVectorDrawable
+                if (!(level instanceof AnimatedVectorDrawable)) {
+                    throw new BatteryMeterDrawableException("Expected a AnimatedVectorDrawable " +
+                            "but received a " + level.getClass().getSimpleName());
+                }
+                // make sure we can stop motion animate the level drawable
+                try {
+                    StopMotionVectorDrawable smvd = new StopMotionVectorDrawable(level);
+                    smvd.setCurrentFraction(0.5f);
+                } catch (Exception e) {
+                    throw new BatteryMeterDrawableException("Unable to perform stop motion on " +
+                            "battery_fill drawable", e);
+                }
+            } else {
+                throw new BatteryMeterDrawableException("Missing battery_fill drawable");
+            }
+        }
 
-        private int     mAnimOffset;
-        private boolean mIsAnimating;   // stores charge-animation status to reliably
-        //remove callbacks
+        private void loadBatteryDrawables(Resources res, BatteryMeterMode mode) {
+            if (isThemeApplied()) {
+                try {
+                    checkBatteryMeterDrawableValid(res, mode);
+                } catch (BatteryMeterDrawableException e) {
+                    Log.w(TAG, "Invalid themed battery meter drawable, falling back to system", e);
+                    final Context context = getContext();
+                    PackageManager pm = getContext().getPackageManager();
+                    try {
+                        res = pm.getThemedResourcesForApplication(context.getPackageName(),
+                                ThemeConfig.SYSTEM_DEFAULT);
+                    } catch (PackageManager.NameNotFoundException nnfe) {
+                        /* ignore, this should not happen */
+                    }
+                }
+            }
 
-        private int     mCircleSize;    // draw size of circle
-        private RectF   mRectLeft;      // contains the precalculated rect used in drawArc(),
-        // derived from mCircleSize
-        private float   mTextX, mTextY; // precalculated position for drawText() to appear centered
+            int drawableResId = getBatteryDrawableResourceForMode(mode);
+            mBatteryDrawable = (LayerDrawable) res.getDrawable(drawableResId);
+            mFrameDrawable = mBatteryDrawable.findDrawableByLayerId(R.id.battery_frame);
+            mFrameDrawable.setTint(mCurrentBackgroundColor != 0
+                    ? mCurrentBackgroundColor
+                    : res.getColor(R.color.batterymeter_frame_color));
+            // set the animated vector drawable we will be stop animating
+            Drawable levelDrawable = mBatteryDrawable.findDrawableByLayerId(R.id.battery_fill);
+            mLevelDrawable = new StopMotionVectorDrawable(levelDrawable);
+            mBoltDrawable = mBatteryDrawable.findDrawableByLayerId(R.id.battery_charge_indicator);
+        }
 
-        private Paint   mTextPaint;
-        private Paint   mFrontPaint;
-        private Paint   mBackPaint;
-        private Paint   mBoltPaint;
-        private Paint   mWarningTextPaint;
+        private void drawBattery(Canvas canvas, BatteryTracker tracker) {
+            boolean unknownStatus = tracker.status == BatteryManager.BATTERY_STATUS_UNKNOWN;
+            int level = tracker.level;
 
-        private final RectF mBoltFrame = new RectF();
+            if (unknownStatus || tracker.status == BatteryManager.BATTERY_STATUS_FULL) {
+                level = 100;
+            }
 
-        private int mChargeColor;
-        private final float[] mBoltPoints;
-        private final Path mBoltPath = new Path();
+            mTextAndBoltPaint.setColor(getColorForLevel(level));
 
-        public CircleBatteryMeterDrawable(Resources res) {
-            super();
-            mDisposed = false;
+            // Make sure we don't draw the charge indicator if not plugged in
+            Drawable d = mBatteryDrawable.findDrawableByLayerId(R.id.battery_charge_indicator);
+            if (d instanceof BitmapDrawable) {
+                // In case we are using a BitmapDrawable, which we should be unless something bad
+                // happened, we need to change the paint rather than the alpha in case the blendMode
+                // has been set to clear.  Clear always clears regardless of alpha level ;)
+                BitmapDrawable bd = (BitmapDrawable) d;
+                bd.getPaint().set(tracker.plugged ? mTextAndBoltPaint : mClearPaint);
+            } else {
+                d.setAlpha(tracker.plugged ? 255 : 0);
+            }
 
-            mTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            Typeface font = Typeface.create("sans-serif-condensed", Typeface.BOLD);
-            mTextPaint.setTypeface(font);
-            mTextPaint.setTextAlign(Paint.Align.CENTER);
-
-            mFrontPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            mFrontPaint.setStrokeCap(Paint.Cap.BUTT);
-            mFrontPaint.setDither(true);
-            mFrontPaint.setStrokeWidth(0);
-            mFrontPaint.setStyle(Paint.Style.STROKE);
-
-            mBackPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            mBackPaint.setColor(res.getColor(R.color.batterymeter_frame_color));
-            mBackPaint.setStrokeCap(Paint.Cap.BUTT);
-            mBackPaint.setDither(true);
-            mBackPaint.setStrokeWidth(0);
-            mBackPaint.setStyle(Paint.Style.STROKE);
+            // Now draw the level indicator
+            // set the level and tint color of the fill drawable
+            mLevelDrawable.setCurrentFraction(level / 100f);
+            mLevelDrawable.setTint(getColorForLevel(level));
+            mBatteryDrawable.draw(canvas);
 
-            mWarningTextPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            mWarningTextPaint.setColor(mColors[1]);
-            font = Typeface.create("sans-serif", Typeface.BOLD);
-            mWarningTextPaint.setTypeface(font);
-            mWarningTextPaint.setTextAlign(Paint.Align.CENTER);
+            // if chosen by options, draw percentage text in the middle
+            // always skip percentage when 100, so layout doesnt break
+            if (unknownStatus) {
+                mTextAndBoltPaint.setColor(getContext().getColor(R.color.batterymeter_frame_color));
+                canvas.drawText("?", mTextX, mTextY, mTextAndBoltPaint);
 
-            mChargeColor = getResources().getColor(R.color.batterymeter_charge_color);
+            } else if (!tracker.plugged) {
+                drawPercentageText(canvas, tracker);
+            }
+        }
 
-            mBoltPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            mBoltPaint.setColor(res.getColor(R.color.batterymeter_bolt_color));
-            mBoltPoints = loadBoltPoints(res);
+        private void drawPercentageText(Canvas canvas, BatteryTracker tracker) {
+            final int level = tracker.level;
+            if (level > mCriticalLevel
+                    && (mShowPercent && !(level == 100 && !SHOW_100_PERCENT))) {
+                // draw the percentage text
+                String pctText = String.valueOf(SINGLE_DIGIT_PERCENT ? (level/10) : level);
+                mTextAndBoltPaint.setColor(getColorForLevel(level));
+                canvas.drawText(pctText, mTextX, mTextY, mTextAndBoltPaint);
+            } else if (level <= mCriticalLevel) {
+                // draw the warning text
+                canvas.drawText(mWarningString, mTextX, mTextY, mWarningTextPaint);
+            }
         }
 
-        @Override
-        public void onDraw(Canvas c, BatteryTracker tracker) {
-            if (mDisposed) return;
+        /**
+         * initializes all size dependent variables
+         */
+        private void init() {
+            // not much we can do with zero width or height, we'll get another pass later
+            if (mWidth <= 0 || mHeight <=0) return;
+
+            final float widthDiv2 = mWidth / 2f;
+            // text size is width / 2 - 2dp for wiggle room
+            final float textSize = widthDiv2 - getResources().getDisplayMetrics().density * 2;
+            mTextAndBoltPaint.setTextSize(textSize);
+            mWarningTextPaint.setTextSize(textSize);
+
+            int pLeft = getPaddingLeft();
+            Rect iconBounds = new Rect(pLeft, 0, pLeft + mWidth, mHeight);
+            mBatteryDrawable.setBounds(iconBounds);
 
-            if (mRectLeft == null) {
-                initSizeBasedStuff();
+            // calculate text position
+            Rect bounds = new Rect();
+            mTextAndBoltPaint.getTextBounds("99", 0, "99".length(), bounds);
+            boolean isRtl = isLayoutRtl();
+
+            // compute mTextX based on text gravity
+            if ((mTextGravity & Gravity.START) == Gravity.START) {
+                mTextX = isRtl ? mWidth : 0;
+            } else if ((mTextGravity & Gravity.END) == Gravity.END) {
+                mTextX = isRtl ? 0 : mWidth;
+            } else if ((mTextGravity & Gravity.LEFT) == Gravity.LEFT) {
+                mTextX = 0;
+            }else if ((mTextGravity & Gravity.RIGHT) == Gravity.RIGHT) {
+                mTextX = mWidth;
+            } else {
+                mTextX = widthDiv2 + pLeft;
             }
 
-            drawCircle(c, tracker, mTextX, mRectLeft);
-            if (mAnimationsEnabled) {
-                updateChargeAnim(tracker);
+            // compute mTextY based on text gravity
+            if ((mTextGravity & Gravity.TOP) == Gravity.TOP) {
+                mTextY = bounds.height();
+            } else if ((mTextGravity & Gravity.BOTTOM) == Gravity.BOTTOM) {
+                mTextY = mHeight;
+            } else {
+                mTextY = widthDiv2 + bounds.height() / 2.0f;
             }
-        }
 
-        @Override
-        public void onDispose() {
-            mDisposed = true;
+            updateBoltDrawableLayer(mBatteryDrawable, mBoltDrawable);
+
+            mInitialized = true;
         }
 
-        @Override
-        public void setDarkIntensity(int backgroundColor, int fillColor) {
-            mIconTint = fillColor;
-            mBoltPaint.setColor(fillColor);
-            mChargeColor = fillColor;
-            invalidate();
+        private int getBatteryDrawableResourceForMode(BatteryMeterMode mode) {
+            switch (mode) {
+                case BATTERY_METER_ICON_LANDSCAPE:
+                    return R.drawable.ic_battery_landscape;
+                case BATTERY_METER_CIRCLE:
+                    return R.drawable.ic_battery_circle;
+                case BATTERY_METER_ICON_PORTRAIT:
+                    return R.drawable.ic_battery_portrait;
+                default:
+                    return 0;
+            }
         }
 
-        @Override
-        public void onSizeChanged(int w, int h, int oldw, int oldh) {
-            initSizeBasedStuff();
+        private int getBatteryDrawableStyleResourceForMode(BatteryMeterMode mode) {
+            switch (mode) {
+                case BATTERY_METER_ICON_LANDSCAPE:
+                    return R.style.BatteryMeterViewDrawable_Landscape;
+                case BATTERY_METER_CIRCLE:
+                    return R.style.BatteryMeterViewDrawable_Circle;
+                case BATTERY_METER_ICON_PORTRAIT:
+                    return R.style.BatteryMeterViewDrawable_Portrait;
+                default:
+                    return R.style.BatteryMeterViewDrawable;
+            }
         }
 
-        private float[] loadBoltPoints(Resources res) {
-            final int[] pts = res.getIntArray(getBoltPointsArrayResource());
-            int maxX = 0, maxY = 0;
-            for (int i = 0; i < pts.length; i += 2) {
-                maxX = Math.max(maxX, pts[i]);
-                maxY = Math.max(maxY, pts[i + 1]);
+        private Paint.Align getPaintAlignmentFromGravity(int gravity) {
+            boolean isRtl = isLayoutRtl();
+            if ((gravity & Gravity.START) == Gravity.START) {
+                return isRtl ? Paint.Align.RIGHT : Paint.Align.LEFT;
             }
-            final float[] ptsF = new float[pts.length];
-            for (int i = 0; i < pts.length; i += 2) {
-                ptsF[i] = (float)pts[i] / maxX;
-                ptsF[i + 1] = (float)pts[i + 1] / maxY;
+            if ((gravity & Gravity.END) == Gravity.END) {
+                return isRtl ? Paint.Align.LEFT : Paint.Align.RIGHT;
             }
-            return ptsF;
-        }
+            if ((gravity & Gravity.LEFT) == Gravity.LEFT) return Paint.Align.LEFT;
+            if ((gravity & Gravity.RIGHT) == Gravity.RIGHT) return Paint.Align.RIGHT;
 
-        protected int getBoltPointsArrayResource() {
-            return R.array.batterymeter_bolt_points;
+            // default to center
+            return Paint.Align.CENTER;
         }
 
-        private void drawCircle(Canvas canvas, BatteryTracker tracker,
-                                float textX, RectF drawRect) {
-            boolean unknownStatus = tracker.status == BatteryManager.BATTERY_STATUS_UNKNOWN;
-            int level = tracker.level;
-            Paint paint;
-
-            if (unknownStatus) {
-                paint = mBackPaint;
-                level = 100; // Draw all the circle;
+        // Creates a BitmapDrawable of the bolt so we can make use of the XOR xfer mode with vector
+        // based drawables
+        private void updateBoltDrawableLayer(LayerDrawable batteryDrawable, Drawable boltDrawable) {
+            BitmapDrawable newBoltDrawable;
+            if (boltDrawable instanceof BitmapDrawable) {
+                newBoltDrawable = (BitmapDrawable) boltDrawable.mutate();
             } else {
-                paint = mFrontPaint;
-                paint.setColor(getColorForLevel(level));
-                if (tracker.status == BatteryManager.BATTERY_STATUS_FULL) {
-                    level = 100;
+                Bitmap boltBitmap = createBoltBitmap(boltDrawable);
+                if (boltBitmap == null) {
+                    // not much to do with a null bitmap so keep original bolt for now
+                    return;
                 }
+                Rect bounds = boltDrawable.getBounds();
+                newBoltDrawable = new BitmapDrawable(getResources(), boltBitmap);
+                newBoltDrawable.setBounds(bounds);
             }
-
-            // draw thin gray ring first
-            canvas.drawArc(drawRect, 270, 360, false, mBackPaint);
-            if (level != 0) {
-                // draw colored arc representing charge level
-                canvas.drawArc(drawRect, 270 + mAnimOffset, 3.6f * level, false, paint);
-            }
-            // if chosen by options, draw percentage text in the middle
-            // always skip percentage when 100, so layout doesnt break
-            if (unknownStatus) {
-                mTextPaint.setColor(paint.getColor());
-                canvas.drawText("?", textX, mTextY, mTextPaint);
-
-            } else if (tracker.plugged) {
-                canvas.drawPath(mBoltPath, mBoltPaint);
-            } else {
-                if (level > mCriticalLevel
-                        && (mShowPercent && !(tracker.level == 100 && !SHOW_100_PERCENT))) {
-                    // draw the percentage text
-                    String pctText = String.valueOf(SINGLE_DIGIT_PERCENT ? (level/10) : level);
-                    mTextPaint.setColor(paint.getColor());
-                    canvas.drawText(pctText, textX, mTextY, mTextPaint);
-                } else if (level <= mCriticalLevel) {
-                    // draw the warning text
-                    canvas.drawText(mWarningString, textX, mTextY, mWarningTextPaint);
+            newBoltDrawable.getPaint().set(mTextAndBoltPaint);
+            batteryDrawable.setDrawableByLayerId(R.id.battery_charge_indicator, newBoltDrawable);
+        }
+
+        private Bitmap createBoltBitmap(Drawable boltDrawable) {
+            // not much we can do with zero width or height, we'll get another pass later
+            if (mWidth <= 0 || mHeight <= 0) return null;
+
+            Bitmap bolt;
+            if (!(boltDrawable instanceof BitmapDrawable)) {
+                int pLeft = getPaddingLeft();
+                Rect iconBounds = new Rect(pLeft, 0, pLeft + mWidth, mHeight);
+                bolt = Bitmap.createBitmap(iconBounds.width(), iconBounds.height(),
+                        Bitmap.Config.ARGB_8888);
+                if (bolt != null) {
+                    Canvas c = new Canvas(bolt);
+                    c.drawColor(-1, PorterDuff.Mode.CLEAR);
+                    boltDrawable.draw(c);
                 }
-            }
-        }
-
-        /**
-         * updates the animation counter
-         * cares for timed callbacks to continue animation cycles
-         * uses mInvalidate for delayed invalidate() callbacks
-         */
-        private void updateChargeAnim(BatteryTracker tracker) {
-            // Stop animation when battery is full or after the meter
-            // rotated back to 0 after unplugging.
-            if (!tracker.shouldIndicateCharging()
-                    || tracker.status == BatteryManager.BATTERY_STATUS_FULL
-                    || tracker.level == 0) {
-                mIsAnimating = false;
             } else {
-                mIsAnimating = true;
-            }
-
-            if (mAnimOffset > 360) {
-                mAnimOffset = 0;
-            }
-
-            boolean continueAnimation = mIsAnimating || mAnimOffset != 0;
-
-            if (continueAnimation) {
-                mAnimOffset += 3;
+                bolt = ((BitmapDrawable) boltDrawable).getBitmap();
             }
 
-            if (continueAnimation) {
-                postInvalidateDelayed(50);
-            }
+            return bolt;
         }
 
-        /**
-         * initializes all size dependent variables
-         * sets stroke width and text size of all involved paints
-         * YES! i think the method name is appropriate
-         */
-        private void initSizeBasedStuff() {
-            mCircleSize = Math.min(getMeasuredWidth(), getMeasuredHeight());
-            mTextPaint.setTextSize(mCircleSize / 2f);
-            mWarningTextPaint.setTextSize(mCircleSize / 2f);
-
-            float strokeWidth = mCircleSize / STROKE_WITH;
-            mFrontPaint.setStrokeWidth(strokeWidth);
-            mBackPaint.setStrokeWidth(strokeWidth);
-
-            // calculate rectangle for drawArc calls
-            int pLeft = getPaddingLeft();
-            mRectLeft = new RectF(pLeft + strokeWidth / 2.0f, 0 + strokeWidth / 2.0f, mCircleSize
-                    - strokeWidth / 2.0f + pLeft, mCircleSize - strokeWidth / 2.0f);
+        private class BatteryMeterDrawableException extends RuntimeException {
+            public BatteryMeterDrawableException(String detailMessage) {
+                super(detailMessage);
+            }
 
-            // calculate Y position for text
-            Rect bounds = new Rect();
-            mTextPaint.getTextBounds("99", 0, "99".length(), bounds);
-            mTextX = mCircleSize / 2.0f + getPaddingLeft();
-            // the +1dp at end of formula balances out rounding issues.works out on all resolutions
-            mTextY = mCircleSize / 2.0f + (bounds.bottom - bounds.top) / 2.0f
-                    - strokeWidth / 2.0f + getResources().getDisplayMetrics().density;
-
-            // draw the bolt
-            final float bl = (int) (mRectLeft.left + mRectLeft.width() / 3.2f);
-            final float bt = (int) (mRectLeft.top + mRectLeft.height() / 4f);
-            final float br = (int) (mRectLeft.right - mRectLeft.width() / 5.2f);
-            final float bb = (int) (mRectLeft.bottom - mRectLeft.height() / 8f);
-            if (mBoltFrame.left != bl || mBoltFrame.top != bt
-                    || mBoltFrame.right != br || mBoltFrame.bottom != bb) {
-                mBoltFrame.set(bl, bt, br, bb);
-                mBoltPath.reset();
-                mBoltPath.moveTo(
-                        mBoltFrame.left + mBoltPoints[0] * mBoltFrame.width(),
-                        mBoltFrame.top + mBoltPoints[1] * mBoltFrame.height());
-                for (int i = 2; i < mBoltPoints.length; i += 2) {
-                    mBoltPath.lineTo(
-                            mBoltFrame.left + mBoltPoints[i] * mBoltFrame.width(),
-                            mBoltFrame.top + mBoltPoints[i + 1] * mBoltFrame.height());
-                }
-                mBoltPath.lineTo(
-                        mBoltFrame.left + mBoltPoints[0] * mBoltFrame.width(),
-                        mBoltFrame.top + mBoltPoints[1] * mBoltFrame.height());
+            public BatteryMeterDrawableException(String detailMessage, Throwable throwable) {
+                super(detailMessage, throwable);
             }
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/DockBatteryMeterView.java b/packages/SystemUI/src/com/android/systemui/DockBatteryMeterView.java
index b80e6d0..a29b16c 100755
--- a/packages/SystemUI/src/com/android/systemui/DockBatteryMeterView.java
+++ b/packages/SystemUI/src/com/android/systemui/DockBatteryMeterView.java
@@ -18,7 +18,6 @@ package com.android.systemui;
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.os.BatteryManager;
 import android.util.AttributeSet;
 import android.view.View;
@@ -148,45 +147,4 @@ public class DockBatteryMeterView extends BatteryMeterView {
             setVisibility(View.GONE);
         }
     }
-
-    @Override
-    protected BatteryMeterDrawable createBatteryMeterDrawable(BatteryMeterMode mode) {
-        Resources res = mContext.getResources();
-        switch (mode) {
-            case BATTERY_METER_CIRCLE:
-                return new DockCircleBatteryMeterDrawable(res);
-            case BATTERY_METER_ICON_LANDSCAPE:
-                return new DockNormalBatteryMeterDrawable(res, true);
-            case BATTERY_METER_TEXT:
-            case BATTERY_METER_GONE:
-                return null;
-            default:
-                return new DockNormalBatteryMeterDrawable(res, false);
-        }
-    }
-
-    protected class DockNormalBatteryMeterDrawable extends NormalBatteryMeterDrawable {
-
-        public DockNormalBatteryMeterDrawable(Resources res, boolean horizontal) {
-            super(res, horizontal);
-        }
-
-        @Override
-        protected int getBoltPointsArrayResource() {
-            return mHorizontal
-                    ? R.array.dockbatterymeter_inverted_bolt_points
-                    : R.array.dockbatterymeter_bolt_points;
-        }
-    }
-
-    protected class DockCircleBatteryMeterDrawable extends CircleBatteryMeterDrawable {
-        public DockCircleBatteryMeterDrawable(Resources res) {
-            super(res);
-        }
-
-        @Override
-        protected int getBoltPointsArrayResource() {
-            return R.array.dockbatterymeter_bolt_points;
-        }
-    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags b/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags
index a584cf6..a08d4b7 100644
--- a/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags
+++ b/packages/SystemUI/src/com/android/systemui/EventLogTags.logtags
@@ -51,3 +51,28 @@ option java_package com.android.systemui;
 # SearchPanelView.java
 # ---------------------------
 36050 sysui_searchpanel_touch (type|1),(x|1),(y|1)
+
+# ---------------------------
+# LiveLockScreenController.java
+# ---------------------------
+# sysui_lls_keyguard_showing
+## screenOn: 0:screen turned off
+##           1:screen turned on
+36060 sysui_lls_keyguard_showing (screenOn|1)
+# sysui_lls_keyguard_dismissed: Logged when user unlocks the device
+## onLls: 0:dismissed while showing notifications
+##        1:dismissed while user interacting with LLS
+36061 sysui_lls_keyguard_dismissed (onLls|1)
+# sysui_lls_notification_panel_shown: Logged when the notification panel is swiped in and out
+## shown: 0:panel is hidden
+##        1:panel is visible
+36062 sysui_lls_notification_panel_shown (shown|1)
+
+# ---------------------------
+# RecentsView.java
+# ---------------------------
+36070 sysui_recents_event (what|1)
+## what: 1: OPEN
+##       2: CLOSE
+##       3: CHOSE_TASK
+##       4: CLOSE_ALL_TASKS
diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
index 1dca149..5911916 100644
--- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java
@@ -36,6 +36,7 @@ import android.view.ViewConfiguration;
 import com.android.systemui.statusbar.ExpandableNotificationRow;
 import com.android.systemui.statusbar.ExpandableView;
 import com.android.systemui.statusbar.FlingAnimationUtils;
+import com.android.systemui.statusbar.MediaExpandableNotificationRow;
 import com.android.systemui.statusbar.policy.ScrollAdapter;
 
 public class ExpandHelper implements Gefingerpoken {
@@ -96,7 +97,7 @@ public class ExpandHelper implements Gefingerpoken {
     private float mCurrentHeight;
 
     private int mSmallSize;
-    private int mLargeSize;
+    private int mLargeSize, mInitialLargeSize;
     private float mMaximumStretch;
     private boolean mOnlyMovements;
 
@@ -161,6 +162,7 @@ public class ExpandHelper implements Gefingerpoken {
         mSmallSize = small;
         mMaximumStretch = mSmallSize * STRETCH_INTERVAL;
         mLargeSize = large;
+        mInitialLargeSize = large;
         mContext = context;
         mCallback = callback;
         mScaler = new ViewScaler();
@@ -511,7 +513,14 @@ public class ExpandHelper implements Gefingerpoken {
         mCurrentHeight = mOldHeight;
         if (mCallback.canChildBeExpanded(v)) {
             if (DEBUG) Log.d(TAG, "working on an expandable child");
-            mNaturalHeight = mScaler.getNaturalHeight(mLargeSize);
+            if (v instanceof MediaExpandableNotificationRow) {
+                final int maxHeight = ((MediaExpandableNotificationRow) v).getMaxContentHeight();
+                mLargeSize = maxHeight;
+                mNaturalHeight = maxHeight;
+            } else {
+                mLargeSize = mInitialLargeSize;
+                mNaturalHeight = mScaler.getNaturalHeight(mLargeSize);
+            }
         } else {
             if (DEBUG) Log.d(TAG, "working on a non-expandable child");
             mNaturalHeight = mOldHeight;
diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
index 33f6564..c3e5043 100644
--- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java
@@ -45,9 +45,15 @@ public class SwipeHelper implements Gefingerpoken {
 
     public static final int X = 0;
     public static final int Y = 1;
+    public static final int SWIPE_ZONE_LEFT = 0x1;
+    public static final int SWIPE_ZONE_RIGHT = 0x2;
+    public static final int SWIPE_ZONE_TOP = 0x4;
+    public static final int SWIPE_ZONE_BOTTOM = 0x8;
 
     private static LinearInterpolator sLinearInterpolator = new LinearInterpolator();
     private final Interpolator mFastOutLinearInInterpolator;
+    private final int mTouchSlop;
+    private int mSwipeZone;
 
     private float SWIPE_ESCAPE_VELOCITY = 100f; // dp/sec
     private int DEFAULT_ESCAPE_ANIMATION_DURATION = 200; // ms
@@ -69,6 +75,7 @@ public class SwipeHelper implements Gefingerpoken {
     private VelocityTracker mVelocityTracker;
 
     private float mInitialTouchPos;
+    private float mPerpendicularInitialTouchPos;
     private boolean mDragging;
     private View mCurrView;
     private View mCurrAnimView;
@@ -84,6 +91,8 @@ public class SwipeHelper implements Gefingerpoken {
     private int mFalsingThreshold;
     private boolean mTouchAboveFalsingThreshold;
 
+    private float mSwipeProgressFadeEnd;
+
     public SwipeHelper(int swipeDirection, Callback callback, Context context) {
         mCallback = callback;
         mHandler = new Handler();
@@ -91,12 +100,28 @@ public class SwipeHelper implements Gefingerpoken {
         mVelocityTracker = VelocityTracker.obtain();
         mDensityScale =  context.getResources().getDisplayMetrics().density;
         mPagingTouchSlop = ViewConfiguration.get(context).getScaledPagingTouchSlop();
+        mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
 
         mLongPressTimeout = (long) (ViewConfiguration.getLongPressTimeout() * 1.5f); // extra long-press!
         mFastOutLinearInInterpolator = AnimationUtils.loadInterpolator(context,
                 android.R.interpolator.fast_out_linear_in);
         mFalsingThreshold = context.getResources().getDimensionPixelSize(
                 R.dimen.swipe_helper_falsing_threshold);
+        if (swipeDirection == X) {
+            mSwipeZone = SWIPE_ZONE_LEFT | SWIPE_ZONE_RIGHT;
+        } else {
+            mSwipeZone = SWIPE_ZONE_TOP | SWIPE_ZONE_BOTTOM;
+        }
+        mSwipeProgressFadeEnd = SWIPE_PROGRESS_FADE_END;
+    }
+
+    public SwipeHelper(int swipeDirection, int swipeZone, Callback callback, Context context) {
+        this(swipeDirection, callback, context);
+        mSwipeZone = swipeZone;
+    }
+
+    public boolean isDragging() {
+        return mDragging;
     }
 
     public void setLongPressListener(LongPressListener listener) {
@@ -115,6 +140,10 @@ public class SwipeHelper implements Gefingerpoken {
         return mSwipeDirection == X ? ev.getX() : ev.getY();
     }
 
+    private float getPerpendicularPos(MotionEvent ev) {
+        return mSwipeDirection == X ? ev.getY() : ev.getX();
+    }
+
     private float getTranslation(View v) {
         return mSwipeDirection == X ? v.getTranslationX() : v.getTranslationY();
     }
@@ -158,7 +187,7 @@ public class SwipeHelper implements Gefingerpoken {
 
     private float getSwipeProgressForOffset(View view) {
         float viewSize = getSize(view);
-        final float fadeSize = SWIPE_PROGRESS_FADE_END * viewSize;
+        final float fadeSize = mSwipeProgressFadeEnd * viewSize;
         float result = 1.0f;
         float pos = getTranslation(view);
         if (pos >= viewSize * SWIPE_PROGRESS_FADE_START) {
@@ -236,6 +265,7 @@ public class SwipeHelper implements Gefingerpoken {
                     mCanCurrViewBeDimissed = mCallback.canChildBeDismissed(mCurrView);
                     mVelocityTracker.addMovement(ev);
                     mInitialTouchPos = getPos(ev);
+                    mPerpendicularInitialTouchPos = getPerpendicularPos(ev);
 
                     if (mLongPressListener != null) {
                         if (mWatchLongPress == null) {
@@ -413,11 +443,30 @@ public class SwipeHelper implements Gefingerpoken {
             case MotionEvent.ACTION_OUTSIDE:
             case MotionEvent.ACTION_MOVE:
                 if (mCurrView != null) {
+                    float pos = getPos(ev);
+                    float altPos = getPerpendicularPos(ev);
                     float delta = getPos(ev) - mInitialTouchPos;
                     float absDelta = Math.abs(delta);
                     if (absDelta >= getFalsingThreshold()) {
                         mTouchAboveFalsingThreshold = true;
                     }
+
+                    boolean touchBeyondZoneLimit = true;
+                    if (mSwipeDirection == X) {
+                        if ((mSwipeZone & SWIPE_ZONE_RIGHT) == 0 && pos > mInitialTouchPos) {
+                            touchBeyondZoneLimit = false;
+                        } else if ((mSwipeZone & SWIPE_ZONE_LEFT) == 0 && pos < mInitialTouchPos) {
+                            touchBeyondZoneLimit = false;
+                        }
+                    } else {
+                        if ((mSwipeZone & SWIPE_ZONE_TOP) == 0 && altPos < mPerpendicularInitialTouchPos) {
+                            touchBeyondZoneLimit = false;
+                        } else if ((mSwipeZone & SWIPE_ZONE_BOTTOM) == 0 && pos > mInitialTouchPos) {
+                            touchBeyondZoneLimit = false;
+                        }
+                    }
+                    if (!touchBeyondZoneLimit) return false;
+
                     // don't let items that can't be dismissed be dragged more than
                     // maxScrollDistance
                     if (CONSTRAIN_SWIPE && !mCallback.canChildBeDismissed(mCurrView)) {
@@ -470,6 +519,10 @@ public class SwipeHelper implements Gefingerpoken {
         return true;
     }
 
+    public void setSwipeProgressFadeEnd(float end) {
+        mSwipeProgressFadeEnd = end;
+    }
+
     private int getFalsingThreshold() {
         float factor = mCallback.getFalsingThresholdFactor();
         return (int) (mFalsingThreshold * factor);
@@ -505,6 +558,49 @@ public class SwipeHelper implements Gefingerpoken {
         float getFalsingThresholdFactor();
     }
 
+    public static abstract class SimpleCallback implements Callback {
+        public abstract View getChildAtPosition(MotionEvent ev);
+        public abstract View getChildContentView(View v);
+
+        @Override
+        public boolean canChildBeDismissed(View v) {
+            return false;
+        }
+
+        @Override
+        public boolean isAntiFalsingNeeded() {
+            return false;
+        }
+
+        @Override
+        public void onBeginDrag(View v) {
+        }
+
+        @Override
+        public void onChildDismissed(View v) {
+        }
+
+        @Override
+        public void onDragCancelled(View v) {
+        }
+
+        @Override
+        public void onChildSnappedBack(View animView) {
+        }
+
+        @Override
+        public boolean updateSwipeProgress(View animView,
+                boolean dismissable,
+                float swipeProgress) {
+            return false;
+        }
+
+        @Override
+        public float getFalsingThresholdFactor() {
+            return 0;
+        }
+    }
+
     /**
      * Equivalent to View.OnLongClickListener with coordinates
      */
diff --git a/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java b/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java
index d8cfa5e..3cd86fe 100644
--- a/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsActivity.java
@@ -1,5 +1,6 @@
 package com.android.systemui.cm;
 
+import com.android.internal.app.AssistUtils;
 import com.android.settingslib.cm.ShortcutPickHelper;
 import com.android.systemui.R;
 import com.android.systemui.cm.LockscreenShortcutsHelper.Shortcuts;
@@ -34,6 +35,7 @@ public class LockscreenShortcutsActivity extends Activity implements View.OnClic
     private View mSelectedView;
     private ColorMatrixColorFilter mFilter;
     private ColorStateList mDefaultTintList;
+    private AssistUtils mAssistUtils;
 
     @Override
     public void shortcutPicked(String uri, String friendlyName, boolean isApplication) {
@@ -107,6 +109,7 @@ public class LockscreenShortcutsActivity extends Activity implements View.OnClic
         mFilter = new ColorMatrixColorFilter(cm);
         ImageView unlockButton = (ImageView) findViewById(R.id.middle_button);
         mDefaultTintList = unlockButton.getImageTintList();
+        mAssistUtils = new AssistUtils(this);
         createActionList();
         initiateViews();
         updateDrawables();
@@ -146,19 +149,40 @@ public class LockscreenShortcutsActivity extends Activity implements View.OnClic
             if (mShortcutHelper.isTargetEmpty(shortcut)) {
                 drawable = getResources().getDrawable(R.drawable.ic_lockscreen_shortcuts_blank);
             } else {
-                drawable = mShortcutHelper.getDrawableForTarget(shortcut);
-                if (drawable == null) {
-                    drawable = getResources().getDrawable(shortcut == Shortcuts.LEFT_SHORTCUT
-                            ? R.drawable.ic_phone_24dp : R.drawable.ic_camera_alt_24dp);
+                if (shortcut == Shortcuts.LEFT_SHORTCUT &&
+                        !mShortcutHelper.isTargetCustom(shortcut)) {
+                    drawable = getLeftAffordanceDrawable();
                     v.setImageTintList(mDefaultTintList);
                 } else {
-                    v.setColorFilter(mFilter);
+                    drawable = mShortcutHelper.getDrawableForTarget(shortcut);
+                    if (drawable == null) {
+                        drawable = (shortcut == Shortcuts.LEFT_SHORTCUT) ?
+                                getLeftAffordanceDrawable()
+                                : getResources().getDrawable(R.drawable.ic_camera_alt_24dp);
+                        v.setImageTintList(mDefaultTintList);
+                    } else {
+                        v.setColorFilter(mFilter);
+                    }
                 }
             }
             v.setImageDrawable(drawable);
         }
     }
 
+    private Drawable getLeftAffordanceDrawable() {
+        Drawable drawable;
+        if (canLaunchVoiceAssist()) {
+            drawable = getResources().getDrawable(R.drawable.ic_mic_26dp);
+        } else {
+            drawable = getResources().getDrawable(R.drawable.ic_phone_24dp);
+        }
+        return drawable;
+    }
+
+    private boolean canLaunchVoiceAssist() {
+        return mAssistUtils.activeServiceSupportsLaunchFromKeyguard();
+    }
+
     private void createActionList() {
         mActions = new ActionHolder();
         mActions.addAction(LockscreenShortcutsHelper.NONE, R.string.lockscreen_none_target);
@@ -211,13 +235,15 @@ public class LockscreenShortcutsActivity extends Activity implements View.OnClic
 
     private void onTargetChange(String uri) {
         if (uri == null) {
-            final GlowBackground background = (GlowBackground) mSelectedView.getBackground();
-            background.hideGlow();
+            if (mSelectedView != null) {
+                final GlowBackground background = (GlowBackground) mSelectedView.getBackground();
+                background.hideGlow();
+            }
             return;
         }
 
         if (uri.equals(ACTION_APP)) {
-            mPicker.pickShortcut(null, null, 0);
+            mPicker.pickShortcut(null, null, 0, false);
         } else {
             mSelectedView.setTag(uri);
             saveCustomActions();
diff --git a/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsHelper.java b/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsHelper.java
index 12b9810..b47b69f 100644
--- a/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/cm/LockscreenShortcutsHelper.java
@@ -53,9 +53,15 @@ public class LockscreenShortcutsHelper {
         if (listener != null) {
             mListener = listener;
             mHandler = new Handler(Looper.getMainLooper());
-            mContext.getContentResolver().registerContentObserver(
-                    CMSettings.Secure.getUriFor(CMSettings.Secure.LOCKSCREEN_TARGETS), false, mObserver);
+            registerAndFetchTargets();
+        } else {
+            fetchTargets();
         }
+    }
+
+    public void registerAndFetchTargets() {
+        mContext.getContentResolver().registerContentObserver(
+                CMSettings.Secure.getUriFor(CMSettings.Secure.LOCKSCREEN_TARGETS), false, mObserver);
         fetchTargets();
     }
 
@@ -76,7 +82,6 @@ public class LockscreenShortcutsHelper {
 
     public void cleanup() {
         mContext.getContentResolver().unregisterContentObserver(mObserver);
-        mListener = null;
     }
 
     public static class TargetInfo {
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
index d2c60ef..a6ca6a0 100644
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardService.java
@@ -90,6 +90,12 @@ public class KeyguardService extends Service {
             mKeyguardViewMediator.setOccluded(isOccluded);
         }
 
+        @Override
+        public void showKeyguard() {
+            checkPermission();
+            mKeyguardViewMediator.showKeyguard();
+        }
+
         @Override // Binder interface
         public void dismiss() {
             checkPermission();
diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
index 06ce8cc..2833759 100755
--- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
+++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
@@ -53,6 +53,7 @@ import android.util.EventLog;
 import android.util.Log;
 import android.util.Slog;
 import android.view.IWindowManager;
+import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManagerGlobal;
 import android.view.WindowManagerPolicy;
@@ -61,6 +62,7 @@ import android.view.animation.AnimationUtils;
 
 import com.android.systemui.cm.UserContentObserver;
 import com.android.systemui.qs.tiles.LockscreenToggleTile;
+import com.android.systemui.statusbar.StatusBarState;
 import cyanogenmod.app.Profile;
 import cyanogenmod.app.ProfileManager;
 
@@ -173,6 +175,7 @@ public class KeyguardViewMediator extends SystemUI {
     private static final int NOTIFY_SCREEN_TURNED_ON = 22;
     private static final int NOTIFY_SCREEN_TURNED_OFF = 23;
     private static final int NOTIFY_STARTED_GOING_TO_SLEEP = 24;
+    private static final int NOTIFY_KEYGUARD_PANEL_FOCUS_CHANGED = 25;
 
     /**
      * The default amount of time we stay awake (used for all key input)
@@ -254,6 +257,8 @@ public class KeyguardViewMediator extends SystemUI {
     // true if the keyguard is hidden by another window
     private boolean mOccluded = false;
 
+    private boolean mKeyguardPanelFocused = false;
+
     /**
      * Helps remember whether the screen has turned on since the last time
      * it turned off due to timeout. see {@link #onScreenTurnedOff(int)}
@@ -351,6 +356,8 @@ public class KeyguardViewMediator extends SystemUI {
     private IKeyguardDrawnCallback mDrawnCallback;
 
     private LockscreenEnabledSettingsObserver mSettingsObserver;
+    private PhoneStatusBar mStatusBar;
+
     public static class LockscreenEnabledSettingsObserver extends UserContentObserver {
 
         private static final String KEY_ENABLED = "lockscreen_enabled";
@@ -480,21 +487,20 @@ public class KeyguardViewMediator extends SystemUI {
                     // only force lock screen in case of missing sim if user hasn't
                     // gone through setup wizard
                     synchronized (this) {
-                        if (shouldWaitForProvisioning()) {
-                            if (!mShowing) {
-                                if (DEBUG_SIM_STATES) Log.d(TAG, "ICC_ABSENT isn't showing,"
-                                        + " we need to show the keyguard since the "
-                                        + "device isn't provisioned yet.");
-                                doKeyguardLocked(null);
-                            } else {
-                                resetStateLocked();
-                            }
+                        if (shouldWaitForProvisioning() && !mShowing) {
+                            if (DEBUG_SIM_STATES) Log.d(TAG, "ICC_ABSENT isn't showing,"
+                                    + " we need to show the keyguard since the "
+                                    + "device isn't provisioned yet.");
+                            doKeyguardLocked(null);
+                        } else {
+                            resetStateLocked();
                         }
                     }
                     break;
                 case PIN_REQUIRED:
                 case PUK_REQUIRED:
                     synchronized (this) {
+                        mStatusBar.hideHeadsUp();
                         if (!mShowing) {
                             if (DEBUG_SIM_STATES) Log.d(TAG,
                                     "INTENT_VALUE_ICC_LOCKED and keygaurd isn't "
@@ -1291,6 +1297,36 @@ public class KeyguardViewMediator extends SystemUI {
         mHandler.sendEmptyMessage(DISMISS);
     }
 
+    public void showKeyguard() {
+        // This is to prevent left edge from interfering
+        // with affordances.
+        if (mStatusBar.isAffordanceSwipeInProgress()
+                || mStatusBar.getBarState() == StatusBarState.KEYGUARD) {
+            return;
+        }
+
+        // Disable edge detector once we're back on lockscreen
+        try {
+            WindowManagerGlobal.getWindowManagerService()
+                    .setLiveLockscreenEdgeDetector(false);
+        } catch (RemoteException e){
+            Log.e(TAG, e.getMessage());
+        }
+
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                // Hide status bar window to avoid flicker,
+                // slideNotificationPanelIn will make it visible later.
+                mStatusBar.getStatusBarWindow().setVisibility(View.INVISIBLE);
+                // Get the keyguard into the correct state by calling mStatusBar.showKeyguard()
+                mStatusBar.showKeyguard();
+                // Now have the notification panel slid back into view
+                mStatusBar.slideNotificationPanelIn();
+            }
+        });
+    }
+
     /**
      * Send message to keyguard telling it to reset its state.
      * @see #handleReset
@@ -1485,6 +1521,9 @@ public class KeyguardViewMediator extends SystemUI {
                 case ON_ACTIVITY_DRAWN:
                     handleOnActivityDrawn();
                     break;
+                case NOTIFY_KEYGUARD_PANEL_FOCUS_CHANGED:
+                    notifyKeyguardPanelFocusChanged(msg.arg1 != 0);
+                    break;
             }
         }
     };
@@ -1865,6 +1904,7 @@ public class KeyguardViewMediator extends SystemUI {
             FingerprintUnlockController fingerprintUnlockController) {
         mStatusBarKeyguardViewManager.registerStatusBar(phoneStatusBar, container,
                 statusBarWindowManager, scrimController, fingerprintUnlockController);
+        mStatusBar = phoneStatusBar;
         return mStatusBarKeyguardViewManager;
     }
 
@@ -1935,6 +1975,31 @@ public class KeyguardViewMediator extends SystemUI {
         }
     }
 
+    public void setKeyguardPanelFocused(boolean focused) {
+        if (DEBUG) Log.d(TAG, "setSlideOffset " + focused);
+        mHandler.removeMessages(NOTIFY_KEYGUARD_PANEL_FOCUS_CHANGED);
+        Message msg = mHandler.obtainMessage(NOTIFY_KEYGUARD_PANEL_FOCUS_CHANGED,
+                focused ? 1 : 0, 0);
+        mHandler.sendMessage(msg);
+    }
+
+    public void notifyKeyguardPanelFocusChanged(boolean focused) {
+        if (focused != mKeyguardPanelFocused) {
+            mKeyguardPanelFocused = focused;
+            int size = mKeyguardStateCallbacks.size();
+            for (int i = size - 1; i >= 0; i--) {
+                try {
+                    mKeyguardStateCallbacks.get(i).onKeyguardPanelFocusChanged(focused);
+                } catch (RemoteException e) {
+                    Slog.w(TAG, "Failed to call onShowingStateChanged", e);
+                    if (e instanceof DeadObjectException) {
+                        mKeyguardStateCallbacks.remove(i);
+                    }
+                }
+            }
+        }
+    }
+
     public void addStateMonitorCallback(IKeyguardStateCallback callback) {
         synchronized (this) {
             mKeyguardStateCallbacks.add(callback);
@@ -1942,6 +2007,7 @@ public class KeyguardViewMediator extends SystemUI {
                 callback.onSimSecureStateChanged(mUpdateMonitor.isSimPinSecure());
                 callback.onShowingStateChanged(mShowing);
                 callback.onInputRestrictedStateChanged(mInputRestricted);
+                callback.onKeyguardPanelFocusChanged(mKeyguardPanelFocused);
             } catch (RemoteException e) {
                 Slog.w(TAG, "Failed to call onShowingStateChanged or onSimSecureStateChanged or onInputRestrictedStateChanged", e);
             }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItemsList.java b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItemsList.java
index 578a983..3e0ab8b 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDetailItemsList.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDetailItemsList.java
@@ -27,6 +27,7 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
+import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListAdapter;
@@ -42,7 +43,7 @@ import java.util.List;
 /**
  * Quick settings common detail list view with line items.
  */
-public class QSDetailItemsList extends LinearLayout {
+public class QSDetailItemsList extends FrameLayout {
     private static final String TAG = "QSDetailItemsList";
 
     private ListView mListView;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
index 86fc49e..13f552c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSDragPanel.java
@@ -19,10 +19,8 @@ package com.android.systemui.qs;
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.app.ActivityManager;
-import android.app.AlertDialog;
 import android.content.ContentResolver;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
@@ -32,12 +30,10 @@ import android.graphics.Color;
 import android.graphics.Point;
 import android.graphics.PointF;
 import android.graphics.PorterDuff;
-import android.graphics.drawable.Animatable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.UserHandle;
-import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.util.ArrayMap;
@@ -49,7 +45,6 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseExpandableListAdapter;
-import android.widget.EditText;
 import android.widget.ExpandableListView;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -58,12 +53,12 @@ import com.android.internal.logging.MetricsLogger;
 import com.android.systemui.FontSizeUtils;
 import com.android.systemui.R;
 import com.android.systemui.cm.UserContentObserver;
+import com.android.systemui.qs.tiles.CustomQSTile;
 import com.android.systemui.qs.tiles.EditTile;
-import com.android.systemui.qs.tiles.IntentTile;
 import com.android.systemui.settings.BrightnessController;
 import com.android.systemui.settings.ToggleSlider;
+import com.android.systemui.statusbar.phone.NotificationPanelView;
 import com.android.systemui.statusbar.phone.QSTileHost;
-import com.android.systemui.statusbar.phone.SystemUIDialog;
 import com.android.systemui.statusbar.policy.BrightnessMirrorController;
 import com.android.systemui.tuner.QsTuner;
 import com.viewpagerindicator.CirclePageIndicator;
@@ -80,6 +75,8 @@ import java.util.List;
 import java.util.ListIterator;
 import java.util.Map;
 
+import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
+
 public class QSDragPanel extends QSPanel implements View.OnDragListener, View.OnLongClickListener {
 
     private static final String TAG = "QSDragPanel";
@@ -94,6 +91,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
     protected final ArrayList<QSPage> mPages = new ArrayList<>();
 
+    private NotificationPanelView mPanelView;
     protected QSViewPager mViewPager;
     protected PagerAdapter mPagerAdapter;
     QSPanelTopView mQsPanelTop;
@@ -102,6 +100,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
     private TextView mDetailRemoveButton;
     private DragTileRecord mDraggingRecord, mLastDragRecord;
+    private ViewGroup mDetailButtons;
     private boolean mEditing;
     private boolean mDragging;
     private float mLastTouchLocationX, mLastTouchLocationY;
@@ -119,15 +118,13 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
     List<TileRecord> mCurrentlyAnimating
             = Collections.synchronizedList(new ArrayList<TileRecord>());
 
-    private Point mDisplaySize;
-    private int[] mTmpLoc;
-
     private Runnable mResetPage = new Runnable() {
         @Override
         public void run() {
-            if (!mListening) {
+            if (!mExpanded) {
                 // only reset when the user isn't interacting at all
                 mViewPager.setCurrentItem(0);
+                mPagerAdapter.notifyDataSetChanged();
             }
         }
     };
@@ -145,6 +142,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         updateResources();
 
         mDetail = LayoutInflater.from(mContext).inflate(R.layout.qs_detail, this, false);
+        mDetailButtons = (ViewGroup) mDetail.findViewById(R.id.buttons);
         mDetailContent = (ViewGroup) mDetail.findViewById(android.R.id.content);
         mDetailRemoveButton = (TextView) mDetail.findViewById(android.R.id.button3);
         mDetailSettingsButton = (TextView) mDetail.findViewById(android.R.id.button2);
@@ -355,7 +353,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
     @Override
     public boolean hasOverlappingRendering() {
-        return mClipper.isAnimating() || mEditing;
+        return mClipper.isAnimating() || mEditing || !mCurrentlyAnimating.isEmpty();
     }
 
     @Override
@@ -370,7 +368,14 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
     protected void drawTile(TileRecord r, QSTile.State state) {
         if (mEditing) {
-            state.visible = true;
+            if ((r.tile instanceof CustomQSTile)
+                    && (((CustomQSTile) r.tile).isUserRemoved()
+                    || ((CustomQSTile) r.tile).getTile() == null)) {
+                // don't modify visibility state if removed, or not yet published
+            } else {
+                state.visible = true;
+                state.enabled = true;
+            }
         }
         final int visibility = state.visible ? VISIBLE : GONE;
         setTileVisibility(r.tileView, visibility);
@@ -382,12 +387,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
     public void setListening(boolean listening) {
         if (mListening == listening) return;
         mListening = listening;
-        // reset the page when inactive for a while
-        if (listening) {
-            removeCallbacks(mResetPage);
-        } else {
-            postDelayed(mResetPage, PAGE_RESET_DELAY);
-        }
         for (TileRecord r : mRecords) {
             r.tile.setListening(mListening);
         }
@@ -465,7 +464,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         mLastRightShift = -1;
 
         mQsPanelTop.onStopDrag();
-        requestLayout();
     }
 
     protected View getDropTarget() {
@@ -501,14 +499,16 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
     }
 
     public void setTiles(final Collection<QSTile<?>> tilesCollection) {
-        final List<QSTile<?>> tiles = new ArrayList<>(tilesCollection);
+        // we try to be as efficient as possible here because this can happen while the user
+        // is in edit mode, or maybe even while tiles are animating
+        // step 1: stop all animations
+        // step 2: remove tiles no longer to be used, cache ones that are still valid
+        // step 3: remove empty viewpager pages
+        // step 4: generate new tiles, re-add cached ones
+
         if (DEBUG_TILES) {
-            Log.i(TAG, "setTiles() called with " + "tiles = ["
-                    + tiles + "]");
+            Log.i(TAG, "setTiles() called with tiles = [" + tilesCollection + "]");
         }
-
-        int currentViewPagerPage = mViewPager.getCurrentItem();
-
         if (mLastDragRecord != null && mRecords.indexOf(mLastDragRecord) == -1) {
             // the last removed record might be stored in mLastDragRecord if we just shifted
             // re-add it to the list so we'll clean it up below
@@ -516,25 +516,41 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
             mLastDragRecord = null;
         }
 
-        Map<QSTile<?>, DragTileRecord> recordMap = new ArrayMap<>();
+        // step kinda-1
+        if (mDraggingRecord != null) {
+            // dragging record might be animating back, force it to finished position
+            mDraggingRecord.tileView.animate().cancel();
+        }
+
+        int currentViewPagerPage = mViewPager.getCurrentItem();
+        int removedPages = 0;
+
+        Map<QSTile<?>, DragTileRecord> cachedRecords = new ArrayMap<>();
         ListIterator<TileRecord> iterator = mRecords.listIterator(mRecords.size());
 
         int recordsRemoved = 0;
         // cleanup current records
-        while (iterator.hasPrevious()) {
+        while (iterator.hasPrevious()) { // mRecords
             DragTileRecord dr = (DragTileRecord) iterator.previous();
 
-            if (dr.page >= 0) {
-                // clean up view
-                mPages.get(dr.page).removeView(dr.tileView);
-            }
+            // step 1
+            dr.tileView.animate().cancel();
 
-            if (tiles.contains(dr.tile)) {
+            // step 2
+            if (tilesCollection.contains(dr.tile)) {
                 if (DEBUG_TILES) {
                     Log.i(TAG, "caching tile: " + dr.tile);
                 }
-                recordMap.put(dr.tile, dr);
+                cachedRecords.put(dr.tile, dr);
             } else {
+                if (dr.page >= 0) {
+                    if (DEBUG_TILES) {
+                        Log.w(TAG, "removed dr.tileView: " + dr.tileView + " from page: "
+                                + dr.page + " (dest page: " + dr.destinationPage + ")");
+                    }
+
+                    removeTileView(dr.tileView);
+                }
                 if (DEBUG_TILES) {
                     Log.i(TAG, "removing tile: " + dr.tile);
                 }
@@ -543,74 +559,99 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                 iterator.remove();
                 recordsRemoved++;
 
-                if (dr.page >= getCurrentMaxPageCount() - 1) {
-                    final int childCount = mPages.get(dr.page).getChildCount();
-
-                    if (childCount == 0) {
-                        final int currentIndex = mViewPager.getCurrentItem();
-                        if (currentIndex > 0 && currentViewPagerPage == currentIndex) {
-                            // if we are about to remove the page we are currently on, move back
-                            currentViewPagerPage--;
-                        }
-                        final int pageIndex = dr.page + (mEditing ? 1 : 0);
-                        mPagerAdapter.startUpdate(mViewPager);
-                        mPagerAdapter.destroyItem(mViewPager, pageIndex, mPages.get(dr.page));
-                        mPagerAdapter.finishUpdate(mViewPager);
-                        mPagerAdapter.notifyDataSetChanged();
-                    }
-                }
+                dr.page = -1;
+                dr.destinationPage = -1;
             }
-            dr.page = -1;
-            dr.destinationPage = -1;
         }
 
-        // at this point recordMap should have all retained tiles, no new or old tiles
-        int delta = tiles.size() - recordMap.size() - recordsRemoved;
+        // at this point cachedRecords should have all retained tiles, no new or old tiles
+        int delta = tilesCollection.size() - cachedRecords.size() - recordsRemoved;
         if (DEBUG_TILES) {
             Log.i(TAG, "record map delta: " + delta);
         }
-        mRecords.ensureCapacity(tiles.size());
 
-        mPagerAdapter.notifyDataSetChanged();
+        // step 3
+        final Iterator<QSPage> pageIterator = mPages.iterator();
+        while (pageIterator.hasNext()) {
+            final QSPage page = pageIterator.next();
+            final int viewpagerIndex = page.getPageIndex() + (mEditing ? 1 : 0);
+            final int childCount = page.getChildCount();
 
-        // even though we explicitly destroy old pages, without this call,
-        // the viewpager doesn't seem to want to pick up the fact that we have less pages
-        // and allows "empty" scrolls to the right where there is no page.
-        mViewPager.setAdapter(mPagerAdapter);
+            if (DEBUG_TILES) {
+                Log.d(TAG, "page " + viewpagerIndex + " has " + childCount);
+            }
+            if (page.getPageIndex() >= getCurrentMaxPageCount() - 1) {
+                if (DEBUG_TILES) {
+                    Log.d(TAG, "page : " + page + " has " + childCount + " children");
+                }
+                if (childCount == 0) {
+                    removedPages++;
+
+                    page.removeAllViews();
+                    mPagerAdapter.startUpdate(mViewPager);
+                    mPagerAdapter.destroyItem(mViewPager, viewpagerIndex, page);
+                    mPagerAdapter.finishUpdate(mViewPager);
+                    mPagerAdapter.notifyDataSetChanged();
+                }
+            }
+        }
+
+        if (removedPages > 0) {
+            // even though we explicitly destroy old pages, without this call,
+            // the viewpager doesn't seem to want to pick up the fact that we have less pages
+            // and allows "empty" scrolls to the right where there is no page.
+            if (DEBUG_TILES) {
+                Log.d(TAG, "re-setting adapter, page: " + currentViewPagerPage);
+            }
+            mViewPager.setAdapter(mPagerAdapter);
+            mViewPager.setCurrentItem(Math.min(currentViewPagerPage, mPagerAdapter.getCount()),
+                    false);
+            mPagerAdapter.notifyDataSetChanged();
+        }
+
+        // step 4
+        mRecords.ensureCapacity(tilesCollection.size());
+        int runningCount = 0;
 
-        // add new tiles
-        for (int i = 0; i < tiles.size(); i++) {
-            QSTile<?> tile = tiles.get(i);
-            final int tileDestPage = getPagesForCount(i + 1) - 1;
+        final Iterator<QSTile<?>> newTileIterator = tilesCollection.iterator();
+        while (newTileIterator.hasNext()) {
+            QSTile<?> tile = newTileIterator.next();
+            if (tile instanceof CustomQSTile) {
+                if (((CustomQSTile) tile).isUserRemoved()
+                        || ((CustomQSTile) tile).getTile() == null) {
+                    // tile not published yet
+                    continue;
+                }
+            }
+            final int tileDestPage = getPagesForCount(runningCount + 1) - 1;
 
             if (DEBUG_TILES) {
-                Log.d(TAG, "tile at : " + i + ": " + tile + " to dest page: " + tileDestPage);
+                Log.d(TAG, "tile at : " + runningCount + ": " + tile
+                        + " to dest page: " + tileDestPage);
             }
             DragTileRecord record;
-            if (!recordMap.containsKey(tile)) {
+            if (!cachedRecords.containsKey(tile)) {
                 if (DEBUG_TILES) {
-                    Log.d(TAG, "tile at: " + i + " not cached, adding it to records");
+                    Log.d(TAG, "tile at: " + runningCount + " not cached, adding it to records");
                 }
                 record = makeRecord(tile);
                 record.destinationPage = tileDestPage;
-                recordMap.put(tile, record);
-                mRecords.add(i, record);
+                mRecords.add(runningCount, record);
                 mPagerAdapter.notifyDataSetChanged();
             } else {
-                record = recordMap.get(tile);
+                record = cachedRecords.get(tile);
                 if (DEBUG_TILES) {
-                    Log.d(TAG, "tile at : " + i + ": cached, restoring: " + record);
+                    Log.d(TAG, "tile at : " + runningCount + ": cached, restoring: " + record);
                 }
-                int indexOf = mRecords.indexOf(record);
-                if (indexOf != i) {
-                    if (DEBUG_TILES) {
-                        Log.w(TAG, "moving index of " + record + " from "
-                                + indexOf + " to " + i);
-                    }
-                    Collections.swap(mRecords, indexOf, i);
 
-                }
+                mPages.get(record.page).removeView(record.tileView);
+
+                record.page = -1;
                 record.destinationPage = tileDestPage;
+
+                mRecords.remove(record);
+                mRecords.add(runningCount, record);
+                mPagerAdapter.notifyDataSetChanged();
             }
             if (record.page == -1) {
                 // add the view
@@ -620,11 +661,9 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     Log.d(TAG, "added view " + record);
                 }
             }
+            runningCount++;
         }
 
-        // restore the visible page
-        mViewPager.setCurrentItem(currentViewPagerPage, false);
-
         if (isShowingDetail()) {
             mDetail.bringToFront();
         }
@@ -718,10 +757,18 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         return r;
     }
 
+    private void removeTileView(QSTileView v) {
+        for (QSPage page : mPages) {
+            page.removeView(v);
+            page.removeTransientView(v);
+        }
+
+    }
+
     private void removeDraggingRecord() {
         // what spec is this tile?
         String spec = mHost.getSpec(mDraggingRecord.tile);
-        if (DEBUG_DRAG) {
+        if (DEBUG_TILES) {
             Log.w(TAG, "removing tile: " + mDraggingRecord + " with spec: " + spec);
         }
         onStopDrag();
@@ -736,13 +783,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
     }
 
     @Override
-    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
-        super.onSizeChanged(w, h, oldw, oldh);
-        mTmpLoc = null;
-        mDisplaySize = null;
-    }
-
-    @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         final int width = MeasureSpec.getSize(widthMeasureSpec);
 
@@ -756,37 +796,18 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         if (mFooter.hasFooter()) {
             h += mFooter.getView().getMeasuredHeight();
         }
+        mGridHeight = h;
+
         mDetail.measure(exactly(width), MeasureSpec.UNSPECIFIED);
+
         if (mDetail.getMeasuredHeight() < h) {
             mDetail.measure(exactly(width), exactly(h));
         }
-
-        // Check if the detail view would be overflowing below the physical height of the device
-        // and cutting the content off. If it is, reduce the detail height to fit.
-        if (isShowingDetail()) {
-            if (mDisplaySize == null) {
-                mDisplaySize = new Point();
-                getDisplay().getSize(mDisplaySize);
-            }
-            if (mTmpLoc == null) {
-                mTmpLoc = new int[2];
-                mDetail.getLocationOnScreen(mTmpLoc);
-            }
-
-            final int containerTop = mTmpLoc[1];
-            final int detailBottom = containerTop + mDetail.getMeasuredHeight();
-            if (detailBottom >= mDisplaySize.y) {
-                // panel is hanging below the screen
-                final int detailMinHeight = mDisplaySize.y - containerTop;
-                mDetail.measure(exactly(width), exactly(detailMinHeight));
-            }
-            setMeasuredDimension(width, mDetail.getMeasuredHeight());
-            mGridHeight = mDetail.getMeasuredHeight();
-        } else {
-            setMeasuredDimension(width, h);
-            mGridHeight = h;
+        if (isShowingDetail() && !isClosingDetail() && mExpanded) {
+            h = mDetail.getMeasuredHeight();
         }
 
+        setMeasuredDimension(width, h);
         for (TileRecord record : mRecords) {
             setupRecord(record);
         }
@@ -816,11 +837,13 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
             }
             r.tile.setDetailListening(show);
             int x = (int) ((DragTileRecord) r).destination.x + r.tileView.getWidth() / 2;
-            int y = mViewPager.getTop() + (int) ((DragTileRecord) r).destination.y + r.tileView.getHeight() / 2;
+            int y = mViewPager.getTop()
+                    + (int) ((DragTileRecord) r).destination.y + r.tileView.getHeight() / 2;
             handleShowDetailImpl(r, show, x, y);
         } else {
             super.handleShowDetailTile(r, show);
         }
+        mPageIndicator.setVisibility(!show ? View.VISIBLE : View.INVISIBLE);
     }
 
     @Override
@@ -833,9 +856,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         // view pager laid out from top of brightness view to bottom to page through settings
         mViewPager.layout(0, 0, w, viewPagerBottom);
 
-        // layout page indicator inside viewpager inset
-        mPageIndicator.layout(0, b - mPageIndicatorHeight, w, b);
-
         mDetail.layout(0, 0, w, mDetail.getMeasuredHeight());
 
         if (mFooter.hasFooter()) {
@@ -846,7 +866,10 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
 
         if (!isShowingDetail() && !isClosingDetail()) {
             mQsPanelTop.bringToFront();
+
         }
+        // layout page indicator inside viewpager inset
+        mPageIndicator.layout(0, b - mPageIndicatorHeight, w, b);
     }
 
     protected int getRowTop(int row) {
@@ -1014,7 +1037,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                 }
                 if (originatingTileEvent && !event.getResult()) {
                     // view pager probably ate the event
-                    restoreDraggingTilePosition(v);
+                    restoreDraggingTilePosition(v, null);
                 }
 
                 break;
@@ -1032,15 +1055,38 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                         Log.d(TAG, "dropping on delete target!!");
                     }
                     if (mDraggingRecord.tile instanceof EditTile) {
+                        final QSTileView editTileView = mDraggingRecord.tileView;
+
                         mQsPanelTop.toast(R.string.quick_settings_cannot_delete_edit_tile);
-                        restoreDraggingTilePosition(v);
+                        restoreDraggingTilePosition(v, new Runnable() {
+                            @Override
+                            public void run() {
+                                // move edit tile to the back
+                                final TileRecord editTile = getRecord(editTileView);
+                                if (mRecords.remove(editTile)) {
+                                    // we depend on mHost.setTiles() placing it on the end
+                                    persistRecords();
+                                }
+                            }
+                        });
                         break;
+                    } else if (mDraggingRecord.tile instanceof CustomQSTile) {
+                        ((CustomQSTile) mDraggingRecord.tile).setUserRemoved(true);
+                        final String spec = mHost.getSpec(mDraggingRecord.tile);
+                        restoreDraggingTilePosition(v, new Runnable() {
+                            @Override
+                            public void run() {
+                                // it might get added back later by the app, but that's ok,
+                                // we just want to reset its position after it has been removed.
+                                mHost.remove(spec);
+                            }
+                        });
                     } else {
                         mRestored = true;
                         removeDraggingRecord();
                     }
                 } else {
-                    restoreDraggingTilePosition(v);
+                    restoreDraggingTilePosition(v, null);
                 }
                 break;
 
@@ -1171,7 +1217,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         return false;
     }
 
-    private void restoreDraggingTilePosition(View v) {
+    private void restoreDraggingTilePosition(View v, final Runnable onAnimationFinishedRunnable) {
         if (mRestored) {
             return;
         }
@@ -1251,6 +1297,20 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     }
 
                     @Override
+                    public void onAnimationCancel(Animator animation) {
+                        mViewPager.requestDisallowInterceptTouchEvent(false);
+                        removeTransientView(mDraggingRecord.tileView);
+                        mCurrentlyAnimating.remove(mDraggingRecord);
+                        mRestoring = false;
+                        mPagerAdapter.notifyDataSetChanged();
+                        onStopDrag();
+
+                        if (onAnimationFinishedRunnable != null) {
+                            postOnAnimation(onAnimationFinishedRunnable);
+                        }
+                    }
+
+                    @Override
                     public void onAnimationEnd(Animator animation) {
                         mViewPager.requestDisallowInterceptTouchEvent(false);
 
@@ -1265,8 +1325,8 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                                 Log.i(TAG, "drag record was attached");
                             }
                         }
-                        mDraggingRecord.page = mDraggingRecord.destinationPage;
                         targetP.addView(mDraggingRecord.tileView);
+                        mDraggingRecord.page = mDraggingRecord.destinationPage;
 
                         mDraggingRecord.tileView.setX(mDraggingRecord.destination.x);
                         // reset this to be in the coords of the page, not viewpager anymore
@@ -1281,6 +1341,12 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                             mPagerAdapter.notifyDataSetChanged();
                         }
                         onStopDrag();
+
+                        if (onAnimationFinishedRunnable != null) {
+                            postOnAnimation(onAnimationFinishedRunnable);
+                        } else {
+                            requestLayout();
+                        }
                     }
                 });
     }
@@ -1497,10 +1563,16 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                         .y(ti.destination.y)
                         .setListener(new AnimatorListenerAdapter() {
                             @Override
+                            public void onAnimationCancel(Animator animation) {
+                                tilePageSource.removeTransientView(ti.tileView);
+                                mCurrentlyAnimating.remove(ti);
+                            }
+
+                            @Override
                             public void onAnimationEnd(Animator animation) {
                                 tilePageSource.removeTransientView(ti.tileView);
-                                ti.page = tilePageTarget.getPageIndex();
                                 tilePageTarget.addView(ti.tileView);
+                                ti.page = tilePageTarget.getPageIndex();
                                 ti.tileView.setX(ti.destination.x);
                                 ti.tileView.setY(ti.destination.y);
 
@@ -1516,6 +1588,11 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                         .y(ti.destination.y)
                         .setListener(new AnimatorListenerAdapter() {
                             @Override
+                            public void onAnimationCancel(Animator animation) {
+                                mCurrentlyAnimating.remove(ti);
+                            }
+
+                            @Override
                             public void onAnimationEnd(Animator animation) {
                                 mCurrentlyAnimating.remove(ti);
                                 final boolean dual = getPage(ti.destinationPage).dualRecord(ti);
@@ -1551,10 +1628,16 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     .y(last.destination.y)
                     .setListener(new AnimatorListenerAdapter() {
                         @Override
+                        public void onAnimationCancel(Animator animation) {
+                            tilePageSource.removeTransientView(last.tileView);
+                            mCurrentlyAnimating.remove(last);
+                        }
+
+                        @Override
                         public void onAnimationEnd(Animator animation) {
                             tilePageSource.removeTransientView(last.tileView);
-                            last.page = tilePageTarget.getPageIndex();
                             tilePageTarget.addView(last.tileView);
+                            last.page = tilePageTarget.getPageIndex();
                             last.tileView.setX(last.destination.x);
                             last.tileView.setY(last.destination.y);
 
@@ -1573,6 +1656,11 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                     .y(last.destination.y)
                     .setListener(new AnimatorListenerAdapter() {
                         @Override
+                        public void onAnimationCancel(Animator animation) {
+                            mCurrentlyAnimating.remove(last);
+                        }
+
+                        @Override
                         public void onAnimationEnd(Animator animation) {
                             if (DEBUG_DRAG) {
                                 Log.i(TAG, "shift finished: " + last);
@@ -1654,10 +1742,16 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                             }
 
                             @Override
+                            public void onAnimationCancel(Animator animation) {
+                                page.removeTransientView(ti.tileView);
+                                mCurrentlyAnimating.remove(ti);
+                            }
+
+                            @Override
                             public void onAnimationEnd(Animator animation) {
                                 page.removeTransientView(ti.tileView);
-                                ti.page = page.getPageIndex();
                                 page.addView(ti.tileView);
+                                ti.page = page.getPageIndex();
 
                                 mCurrentlyAnimating.remove(ti);
                                 requestLayout();
@@ -1710,17 +1804,27 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                 }
             });
         }
+        mPanelView.setDetailRequestedScrollLock(mExpanded && show
+                && getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE);
     }
 
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         FontSizeUtils.updateFontSize(mDetailRemoveButton, R.dimen.qs_detail_button_text_size);
+        mPanelView.setDetailRequestedScrollLock(mExpanded && isShowingDetail()
+                && getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE);
     }
 
     @Override
     public void setExpanded(boolean expanded) {
         super.setExpanded(expanded);
+        // reset the page when inactive for a while
+        if (expanded) {
+            removeCallbacks(mResetPage);
+        } else {
+            postDelayed(mResetPage, PAGE_RESET_DELAY);
+        }
         if (!expanded) {
             if (mEditing) {
                 mHost.setEditing(false);
@@ -1747,10 +1851,11 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
             for (TileRecord r : mRecords) {
                 r.tile.clearState();
             }
+            updateDetailText();
+            mQsPanelTop.updateResources();
             if (mListening) {
                 refreshAllTiles();
             }
-            updateDetailText();
         }
     }
 
@@ -1764,6 +1869,10 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
         }
     }
 
+    public void setPanelView(NotificationPanelView panelView) {
+        this.mPanelView = panelView;
+    }
+
     public static class TilesListAdapter extends BaseExpandableListAdapter
             implements QSTile.DetailAdapter {
 
@@ -1790,7 +1899,8 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
             final Iterator<String> i = tiles.iterator();
             while (i.hasNext()) {
                 final String spec = i.next();
-                if (QSUtils.isStaticQsTile(spec) || QSUtils.isDynamicQsTile(spec)) {
+                if (QSUtils.isStaticQsTile(spec)
+                        || QSUtils.isDynamicQsTile(extractTileTagFromSpec(spec))) {
                     List<String> packageList = mPackageTileMap.get(PACKAGE_ANDROID);
                     packageList.add(spec);
                 } else {
@@ -1803,13 +1913,122 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                 }
             }
 
+            final Map<String, ?> stringMap = CustomQSTile.getCustomQSTilePrefs(mContext).getAll();
+            for (Map.Entry<String, ?> entry : stringMap.entrySet()) {
+                if (entry.getValue() instanceof Boolean) {
+                    if ((Boolean)entry.getValue()) {
+                        final String key = entry.getKey();
+                        if (QSUtils.isDynamicQsTile(extractTileTagFromSpec(key))) {
+                            mPackageTileMap.get(PACKAGE_ANDROID).add(key);
+                        } else {
+                            final String customTilePackage = getCustomTilePackage(key);
+                            List<String> packageList = mPackageTileMap.get(customTilePackage);
+                            if (packageList == null) {
+                                mPackageTileMap.put(customTilePackage,
+                                        packageList = new ArrayList<>());
+                            }
+                            packageList.add(key);
+
+                        }
+                    }
+                }
+            };
+
             final List<String> systemTiles = mPackageTileMap.get(PACKAGE_ANDROID);
             Collections.sort(systemTiles);
         }
 
         private String getCustomTilePackage(String spec) {
-            StatusBarPanelCustomTile sbc = mHost.getCustomTileData().get(spec).sbc;
-            return sbc.getPackage();
+            if (mHost.getCustomTileData().get(spec) != null) {
+                StatusBarPanelCustomTile sbc = mHost.getCustomTileData().get(spec).sbc;
+                return sbc.getPackage();
+            } else {
+                return extractPackageFromCustomTileSpec(spec);
+            }
+        }
+
+        private static String extractPackageFromCustomTileSpec(String spec) {
+            if (spec != null && !spec.isEmpty()) {
+                final String[] split = spec.split("\\|");
+                if (split != null && split.length > 2) {
+                    return split[1];
+                }
+                return spec;
+            }
+            return null;
+        }
+
+        private static String extractTileTagFromSpec(String spec) {
+            if (spec != null && !spec.isEmpty()) {
+                final String[] split = spec.split("\\|");
+                if (split != null && split.length == 5) {
+                    /** for {@link cyanogenmod.app.StatusBarPanelCustomTile#key() **/
+                    return split[3];
+                } else if (split != null && split.length == 3) {
+                    /** for {@link cyanogenmod.app.StatusBarPanelCustomTile#persistableKey()} **/
+                    return split[2];
+                }
+                return spec;
+            }
+            return null;
+        }
+
+        private Drawable getQSTileIcon(String spec) {
+            if (QSUtils.isDynamicQsTile(extractTileTagFromSpec(spec))) {
+                return QSTile.ResourceIcon.get(QSUtils.getDynamicQSTileResIconId(mContext,
+                        UserHandle.myUserId(), extractTileTagFromSpec(spec))).getDrawable(mContext);
+            } else if (QSUtils.isStaticQsTile(spec)) {
+                final int res = QSTileHost.getIconResource(spec);
+                if (res != 0) {
+                    return QSTile.ResourceIcon.get(res).getDrawable(mContext);
+                } else {
+                    return mContext.getPackageManager().getDefaultActivityIcon();
+                }
+            } else {
+                QSTile<?> tile = mHost.getTile(spec);
+                if (tile != null) {
+                    QSTile.State state = tile.getState();
+                    if (state != null && state.icon != null) {
+                        return state.icon.getDrawable(mContext);
+                    }
+                }
+                return getPackageDrawable(getCustomTilePackage(spec));
+            }
+        }
+
+        private String getPackageLabel(String packageName) {
+            try {
+                return mContext.getPackageManager().getApplicationLabel(
+                        mContext.getPackageManager().getApplicationInfo(packageName, 0)).toString();
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+
+        private Drawable getPackageDrawable(String packageName) {
+            try {
+                return mContext.getPackageManager().getApplicationIcon(packageName);
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+            }
+            return null;
+        }
+
+        private String getQSTileLabel(String spec) {
+            if (QSUtils.isStaticQsTile(spec)) {
+                int resource = QSTileHost.getLabelResource(spec);
+                if (resource != 0) {
+                    return mContext.getText(resource).toString();
+                } else {
+                    return spec;
+                }
+            } else if (QSUtils.isDynamicQsTile(extractTileTagFromSpec(spec))) {
+                return QSUtils.getDynamicQSTileLabel(mContext,
+                        UserHandle.myUserId(), extractTileTagFromSpec(spec));
+            } else {
+                return getPackageLabel(getCustomTilePackage(spec));
+            }
         }
 
         @Override
@@ -1872,6 +2091,7 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                 // special icon
                 systemOrAppIcon.setImageResource(R.drawable.ic_qs_tile_category_system);
             } else {
+                group = getPackageLabel(group);
                 systemOrAppIcon.setImageResource(R.drawable.ic_qs_tile_category_other);
             }
             title.setText(group);
@@ -1910,57 +2130,6 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
             return child;
         }
 
-        private String getQSTileLabel(String spec) {
-            if (QSUtils.isStaticQsTile(spec)) {
-                int resource = QSTileHost.getLabelResource(spec);
-                return mContext.getText(resource).toString();
-            } else if (QSUtils.isDynamicQsTile(spec)) {
-                return QSUtils.getDynamicQSTileLabel(mContext,
-                        UserHandle.myUserId(), spec);
-            } else {
-                return getPackageLabel(getCustomTilePackage(spec));
-            }
-        }
-
-        private Drawable getQSTileIcon(String spec) {
-            if (QSUtils.isDynamicQsTile(spec)) {
-                return QSTile.ResourceIcon.get(
-                        QSUtils.getDynamicQSTileResIconId(mContext, UserHandle.myUserId(), spec))
-                        .getDrawable(mContext);
-            } else if (QSUtils.isStaticQsTile(spec)) {
-                return QSTile.ResourceIcon.get(QSTileHost.getIconResource(spec))
-                        .getDrawable(mContext);
-            } else {
-                QSTile<?> tile = mHost.getTile(spec);
-                if (tile != null) {
-                    QSTile.State state = tile.getState();
-                    if (state != null && state.icon != null) {
-                        return state.icon.getDrawable(mContext);
-                    }
-                }
-                return getPackageDrawable(getCustomTilePackage(spec));
-            }
-        }
-
-        private String getPackageLabel(String packageName) {
-            try {
-                return mContext.getPackageManager().getApplicationLabel(
-                        mContext.getPackageManager().getApplicationInfo(packageName, 0)).toString();
-            } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-
-        private Drawable getPackageDrawable(String packageName) {
-            try {
-                return mContext.getPackageManager().getApplicationIcon(packageName);
-            } catch (PackageManager.NameNotFoundException e) {
-                e.printStackTrace();
-            }
-            return null;
-        }
-
         @Override
         public boolean isChildSelectable(int groupPosition, int childPosition) {
             return true;
@@ -2001,7 +2170,21 @@ public class QSDragPanel extends QSPanel implements View.OnDragListener, View.On
                 public boolean onChildClick(ExpandableListView parent, View v,
                                             int groupPosition, int childPosition, long id) {
                     String spec = getChild(groupPosition, childPosition);
-                    mPanel.add(spec);
+
+                    final QSTile<?> tile = mHost.getTile(spec);
+                    if (tile != null && tile instanceof CustomQSTile) {
+                        // already present
+                        ((CustomQSTile) tile).setUserRemoved(false);
+                        mPanel.refreshAllTiles();
+                    } else {
+                        // reset its state just in case it's not published
+                        CustomQSTile.getCustomQSTilePrefs(mContext)
+                                .edit()
+                                .remove(spec)
+                                .apply();
+                        mPanel.add(spec);
+                        // TODO notify user the app isn't publishing the tile, but it now can be!
+                    }
                     mPanel.closeDetail();
                     return true;
                 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
index 60dc787..77ede93 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanel.java
@@ -72,7 +72,7 @@ public class QSPanel extends ViewGroup {
     protected int mDualTileUnderlap;
     protected int mBrightnessPaddingTop;
     protected int mGridHeight;
-    private boolean mExpanded;
+    protected boolean mExpanded;
     protected boolean mListening;
     private boolean mClosingDetail;
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java b/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
index 5f57be1..b00483c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSPanelTopView.java
@@ -53,6 +53,7 @@ public class QSPanelTopView extends FrameLayout {
     protected View mBrightnessView;
     protected TextView mToastView;
     protected View mAddTarget;
+    protected TextView mEditInstructionText;
 
     private boolean mEditing = false;
     private boolean mDisplayingInstructions = false;
@@ -112,6 +113,14 @@ public class QSPanelTopView extends FrameLayout {
         mBrightnessView = findViewById(R.id.brightness_container);
         mToastView = (TextView) findViewById(R.id.qs_toast);
         mAddTarget = findViewById(R.id.add_target);
+        mEditInstructionText = (TextView) findViewById(R.id.edit_text_instruction);
+        updateResources();
+    }
+
+    public void updateResources() {
+        if (mEditInstructionText != null) {
+            mEditInstructionText.setText(R.string.qs_tile_edit_header_instruction);
+        }
     }
 
     @Override
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
index 2d62724..01a170f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSTile.java
@@ -34,6 +34,7 @@ import android.view.ViewGroup;
 
 import android.widget.RemoteViews;
 import com.android.systemui.qs.QSTile.State;
+import com.android.systemui.statusbar.policy.BatteryController;
 import com.android.systemui.statusbar.policy.BluetoothController;
 import com.android.systemui.statusbar.policy.CastController;
 import com.android.systemui.statusbar.policy.FlashlightController;
@@ -344,6 +345,7 @@ public abstract class QSTile<TState extends State> implements Listenable {
         CastController getCastController();
         FlashlightController getFlashlightController();
         KeyguardMonitor getKeyguardMonitor();
+        BatteryController getBatteryController();
         boolean isEditing();
         void setEditing(boolean editing);
         void resetTiles();
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java
index 283d617..b970a4c 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/AdbOverNetworkTile.java
@@ -91,7 +91,7 @@ public class AdbOverNetworkTile extends QSTile<QSTile.BooleanState> {
     }
 
     private boolean isAdbEnabled() {
-        return Settings.Secure.getInt(mContext.getContentResolver(),
+        return Settings.Global.getInt(mContext.getContentResolver(),
                 Settings.Global.ADB_ENABLED, 0) > 0;
     }
 
@@ -120,7 +120,7 @@ public class AdbOverNetworkTile extends QSTile<QSTile.BooleanState> {
                         CMSettings.Secure.getUriFor(CMSettings.Secure.ADB_PORT),
                         false, mObserver);
                 mContext.getContentResolver().registerContentObserver(
-                        Settings.Secure.getUriFor(Settings.Global.ADB_ENABLED),
+                        Settings.Global.getUriFor(Settings.Global.ADB_ENABLED),
                         false, mObserver);
             } else {
                 mContext.getContentResolver().unregisterContentObserver(mObserver);
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java
index 37d8d73..1a60fa9 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BatterySaverTile.java
@@ -25,6 +25,8 @@ import android.provider.Settings;
 
 import com.android.systemui.qs.QSTile;
 import com.android.systemui.R;
+import com.android.systemui.statusbar.policy.BatteryController;
+import com.android.systemui.statusbar.policy.BatteryStateRegistar;
 
 import cyanogenmod.power.PerformanceManager;
 
@@ -36,13 +38,15 @@ public class BatterySaverTile extends QSTile<QSTile.BooleanState> {
     private static final Intent BATTERY_SETTINGS = new Intent(Intent.ACTION_POWER_USAGE_SUMMARY);
 
     private final PowerManager mPm;
-    private final PerformanceManager mPerformanceManager;
+    private final boolean mHasPowerProfiles;
+
     private boolean mListening;
+    private boolean mPluggedIn;
 
     public BatterySaverTile(Host host) {
         super(host);
         mPm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
-        mPerformanceManager = PerformanceManager.getInstance(mContext);
+        mHasPowerProfiles = PerformanceManager.getInstance(mContext).getNumberOfProfiles() > 0;
     }
 
     @Override
@@ -53,7 +57,7 @@ public class BatterySaverTile extends QSTile<QSTile.BooleanState> {
     @Override
     public void handleClick() {
         mPm.setPowerSaveMode(!mState.value);
-        refreshState();
+        refreshState(!mState.value);
     }
 
     @Override
@@ -63,8 +67,8 @@ public class BatterySaverTile extends QSTile<QSTile.BooleanState> {
 
     @Override
     protected void handleUpdateState(BooleanState state, Object arg) {
-        state.value = mPm.isPowerSaveMode();
-        state.visible = mPerformanceManager.getNumberOfProfiles() == 0;
+        state.value = arg instanceof Boolean ? (boolean) arg : mPm.isPowerSaveMode();
+        state.visible =  !mHasPowerProfiles;
         state.label = mContext.getString(R.string.quick_settings_battery_saver_label);
         if (state.value) {
             state.icon = ResourceIcon.get(R.drawable.ic_qs_battery_saver_on);
@@ -75,6 +79,11 @@ public class BatterySaverTile extends QSTile<QSTile.BooleanState> {
             state.contentDescription =  mContext.getString(
                     R.string.accessibility_quick_settings_battery_saver_off);
         }
+
+        state.enabled = !mPluggedIn;
+        if (mPluggedIn) {
+            state.label = mContext.getString(R.string.quick_settings_battery_saver_label_charging);
+        }
     }
 
     @Override
@@ -93,11 +102,24 @@ public class BatterySaverTile extends QSTile<QSTile.BooleanState> {
         return CMMetricsLogger.TILE_BATTERY_SAVER;
     }
 
-    private ContentObserver mObserver = new ContentObserver(mHandler) {
+    private BatteryStateRegistar.BatteryStateChangeCallback mBatteryState
+            = new BatteryStateRegistar.BatteryStateChangeCallback() {
+        @Override
+        public void onBatteryLevelChanged(boolean present, int level, boolean pluggedIn,
+                boolean charging) {
+            mPluggedIn = pluggedIn || charging;
+            refreshState();
+        }
+
         @Override
-        public void onChange(boolean selfChange, Uri uri) {
+        public void onPowerSaveChanged() {
             refreshState();
         }
+
+        @Override
+        public void onBatteryStyleChanged(int style, int percentMode) {
+            // ignore
+        }
     };
 
     @Override
@@ -106,11 +128,9 @@ public class BatterySaverTile extends QSTile<QSTile.BooleanState> {
         mListening = listening;
 
         if (listening) {
-            mContext.getContentResolver().registerContentObserver(
-                    Settings.Global.getUriFor(Settings.Global.LOW_POWER_MODE),
-                    false, mObserver);
+            getHost().getBatteryController().addStateChangedCallback(mBatteryState);
         } else {
-            mContext.getContentResolver().unregisterContentObserver(mObserver);
+            getHost().getBatteryController().removeStateChangedCallback(mBatteryState);
         }
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
index a798e4e..cdedc26 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/BluetoothTile.java
@@ -225,6 +225,7 @@ public class BluetoothTile extends QSTile<QSTile.BooleanState>  {
             listView.setOnItemClickListener(this);
             listView.setAdapter(mAdapter =
                     new QSDetailItemsList.QSDetailListAdapter(context, mBluetoothItems));
+            mAdapter.setCallback(this);
             mItemsList.setEmptyState(R.drawable.ic_qs_bluetooth_detail_empty,
                     R.string.quick_settings_bluetooth_detail_empty_text);
 
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
index 04cc5dc..f49d97e 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/ColorInversionTile.java
@@ -39,7 +39,6 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> {
     private final AnimationIcon mDisable
             = new AnimationIcon(R.drawable.ic_invert_colors_disable_animation);
     private final SecureSetting mSetting;
-    private final UsageTracker mUsageTracker;
 
     private boolean mListening;
 
@@ -50,29 +49,11 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> {
                 Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED) {
             @Override
             protected void handleValueChanged(int value, boolean observedChange) {
-                if (value != 0 || observedChange) {
-                    mUsageTracker.trackUsage();
-                }
                 if (mListening) {
                     handleRefreshState(value);
                 }
             }
         };
-        mUsageTracker = new UsageTracker(host.getContext(),
-                Prefs.Key.COLOR_INVERSION_TILE_LAST_USED, ColorInversionTile.class,
-                R.integer.days_to_show_color_inversion_tile);
-        if (mSetting.getValue() != 0 && !mUsageTracker.isRecentlyUsed()) {
-            mUsageTracker.trackUsage();
-        }
-        mUsageTracker.setListening(true);
-        mSetting.setListening(true);
-    }
-
-    @Override
-    protected void handleDestroy() {
-        super.handleDestroy();
-        mUsageTracker.setListening(false);
-        mSetting.setListening(false);
     }
 
     @Override
@@ -82,7 +63,11 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> {
 
     @Override
     public void setListening(boolean listening) {
+        if (mListening == listening) {
+            return;
+        }
         mListening = listening;
+        mSetting.setListening(mListening);
     }
 
     @Override
@@ -101,25 +86,14 @@ public class ColorInversionTile extends QSTile<QSTile.BooleanState> {
 
     @Override
     protected void handleLongClick() {
-        if (mState.value) {
-            mHost.startActivityDismissingKeyguard(ACCESSIBILITY_SETTINGS);
-        } else {
-            final String title = mContext.getString(
-                    R.string.quick_settings_reset_confirmation_title, mState.label);
-            mUsageTracker.showResetConfirmation(title, new Runnable() {
-                @Override
-                public void run() {
-                    refreshState();
-                }
-            });
-        }
+        mHost.startActivityDismissingKeyguard(ACCESSIBILITY_SETTINGS);
     }
 
     @Override
     protected void handleUpdateState(BooleanState state, Object arg) {
         final int value = arg instanceof Integer ? (Integer) arg : mSetting.getValue();
         final boolean enabled = value != 0;
-        state.visible = enabled || mUsageTracker.isRecentlyUsed();
+        state.visible = true;
         state.value = enabled;
         state.label = mContext.getString(R.string.quick_settings_inversion_label);
         state.icon = enabled ? mEnable : mDisable;
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CompassTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CompassTile.java
index f19e466..85790d1 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CompassTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CompassTile.java
@@ -32,6 +32,7 @@ public class CompassTile extends QSTile<QSTile.BooleanState> implements SensorEv
     private final static float ALPHA = 0.97f;
 
     private boolean mActive = false;
+    private boolean mListening = false;
 
     private SensorManager mSensorManager;
     private Sensor mAccelerationSensor;
@@ -95,7 +96,7 @@ public class CompassTile extends QSTile<QSTile.BooleanState> implements SensorEv
         Float degrees = arg == null ? 0 :(float) arg;
 
         state.visible = true;
-        state.value = mActive;
+        state.value = mActive && mListening;
 
         if (state.value) {
             state.icon = ResourceIcon.get(R.drawable.ic_qs_compass_on);
@@ -126,10 +127,10 @@ public class CompassTile extends QSTile<QSTile.BooleanState> implements SensorEv
 
     @Override
     public void setListening(boolean listening) {
-        if (!listening) {
-            setListeningSensors(false);
-            mActive = false;
-        }
+        // setListening might get called multiple times with the same value, we check for it
+        // in setListeningSensors
+        mListening = listening;
+        setListeningSensors(mListening && mActive);
     }
 
     private String formatValueWithCardinalDirection(float degree) {
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomQSTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomQSTile.java
index d09ca92..40c7184 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomQSTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/CustomQSTile.java
@@ -19,6 +19,7 @@ package com.android.systemui.qs.tiles;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.ThemeConfig;
 import android.net.Uri;
@@ -31,15 +32,12 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RemoteViews;
 import android.widget.TextView;
 
-import com.android.internal.logging.MetricsLogger;
-
 import com.android.systemui.qs.QSDetailItemsGrid;
 import com.android.systemui.qs.QSDetailItemsList;
 import cyanogenmod.app.CustomTile;
@@ -53,6 +51,8 @@ import java.util.Arrays;
 
 public class CustomQSTile extends QSTile<QSTile.State> {
 
+    private static final String HIDDEN_TILES_PREF_NAME = "user_hidden_qs_tiles";
+
     private CustomTile.ExpandedStyle mExpandedStyle;
     private PendingIntent mOnClick;
     private PendingIntent mOnLongClick;
@@ -61,10 +61,51 @@ public class CustomQSTile extends QSTile<QSTile.State> {
     private StatusBarPanelCustomTile mTile;
     private CustomQSDetailAdapter mDetailAdapter;
     private boolean mCollapsePanel;
+    private boolean mUserRemoved;
+    private String mPersistedPlaceHolderKey;
+
+    public CustomQSTile(Host host, String persistedSpec) {
+        super(host);
+        mTile = null;
+        mPersistedPlaceHolderKey = persistedSpec;
+    }
 
     public CustomQSTile(Host host, StatusBarPanelCustomTile tile) {
         super(host);
         mTile = tile;
+        mUserRemoved = getIsUserRemovedPersisted();
+    }
+
+    private String getPersistableKey() {
+        if (mPersistedPlaceHolderKey != null) {
+            return mPersistedPlaceHolderKey;
+        } else {
+            return getTile().persistableKey();
+        }
+    }
+
+    private boolean getIsUserRemovedPersisted() {
+        return getCustomQSTilePrefs(mContext).getBoolean(getPersistableKey(), false);
+    }
+
+    public boolean isUserRemoved() {
+        return mUserRemoved;
+    }
+
+    public void setUserRemoved(boolean removed) {
+        if (mUserRemoved != removed) {
+            if (removed) {
+                getCustomQSTilePrefs(mContext).edit().putBoolean(getPersistableKey(), true).apply();
+            } else {
+                getCustomQSTilePrefs(mContext).edit().remove(getPersistableKey()).apply();
+            }
+            mUserRemoved = removed;
+            refreshState();
+        }
+    }
+
+    public static SharedPreferences getCustomQSTilePrefs(Context context) {
+        return context.getSharedPreferences(HIDDEN_TILES_PREF_NAME, Context.MODE_PRIVATE);
     }
 
     @Override
@@ -138,11 +179,18 @@ public class CustomQSTile extends QSTile<QSTile.State> {
     protected void handleUpdateState(State state, Object arg) {
         if (arg instanceof StatusBarPanelCustomTile) {
             mTile = (StatusBarPanelCustomTile) arg;
+            mPersistedPlaceHolderKey = null;
+            mUserRemoved = getIsUserRemovedPersisted();
+        }
+        if (mTile == null) {
+            state.visible = false;
+            // nothing to show, it's a place holder for now
+            return;
         }
         final CustomTile customTile = mTile.getCustomTile();
         state.contentDescription = customTile.contentDescription;
         state.label = customTile.label;
-        state.visible = true;
+        state.visible = !mUserRemoved;
         final int iconId = customTile.icon;
         if (iconId != 0 && (customTile.remoteIcon == null)) {
             final String iconPackage = mTile.getResPkg();
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 25a7fb7..6080358 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/HotspotTile.java
@@ -48,7 +48,6 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
             new AnimationIcon(R.drawable.ic_hotspot_disable_animation);
     private final HotspotController mController;
     private final Callback mCallback = new Callback();
-    private final UsageTracker mUsageTracker;
     private final ConnectivityManager mConnectivityManager;
     private boolean mListening;
     private int mNumConnectedClients = 0;
@@ -56,18 +55,10 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
     public HotspotTile(Host host) {
         super(host);
         mController = host.getHotspotController();
-        mUsageTracker = newUsageTracker(host.getContext());
-        mUsageTracker.setListening(true);
         mConnectivityManager = host.getContext().getSystemService(ConnectivityManager.class);
     }
 
     @Override
-    protected void handleDestroy() {
-        super.handleDestroy();
-        mUsageTracker.setListening(false);
-    }
-
-    @Override
     protected BooleanState newTileState() {
         return new BooleanState();
     }
@@ -108,23 +99,12 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
 
     @Override
     protected void handleLongClick() {
-        if (mState.value) {
-            mHost.startActivityDismissingKeyguard(TETHER_SETTINGS);
-        } else {
-            final String title = mContext.getString(
-                    R.string.quick_settings_reset_confirmation_title, mState.label);
-            mUsageTracker.showResetConfirmation(title, new Runnable() {
-                @Override
-                public void run() {
-                    refreshState();
-                }
-            });
-        }
+        mHost.startActivityDismissingKeyguard(TETHER_SETTINGS);
     }
 
     @Override
     protected void handleUpdateState(BooleanState state, Object arg) {
-        state.visible = mController.isHotspotSupported() && mUsageTracker.isRecentlyUsed();
+        state.visible = mController.isHotspotSupported();
 
         if (arg instanceof Boolean) {
             state.value = (boolean) arg;
@@ -155,11 +135,6 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
         }
     }
 
-    private static UsageTracker newUsageTracker(Context context) {
-        return new UsageTracker(context, Prefs.Key.HOTSPOT_TILE_LAST_USED, HotspotTile.class,
-                R.integer.days_to_show_hotspot_tile);
-    }
-
     private BroadcastReceiver mTetherConnectStateChangedReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -175,20 +150,4 @@ public class HotspotTile extends QSTile<QSTile.BooleanState> {
             refreshState(enabled);
         }
     };
-
-    /**
-     * This will catch broadcasts for changes in hotspot state so we can show
-     * the hotspot tile for a number of days after use.
-     */
-    public static class APChangedReceiver extends BroadcastReceiver {
-        private UsageTracker mUsageTracker;
-
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            if (mUsageTracker == null) {
-                mUsageTracker = newUsageTracker(context);
-            }
-            mUsageTracker.trackUsage();
-        }
-    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/LiveDisplayTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/LiveDisplayTile.java
deleted file mode 100644
index f59c876..0000000
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/LiveDisplayTile.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod 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.tiles;
-
-import android.content.Intent;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.database.ContentObserver;
-import android.os.Handler;
-import android.os.UserHandle;
-
-import com.android.internal.util.ArrayUtils;
-import com.android.systemui.R;
-import com.android.systemui.qs.QSTile;
-
-import cyanogenmod.hardware.CMHardwareManager;
-import cyanogenmod.providers.CMSettings;
-import org.cyanogenmod.internal.logging.CMMetricsLogger;
-
-/** Quick settings tile: LiveDisplay mode switcher **/
-public class LiveDisplayTile extends QSTile<LiveDisplayTile.LiveDisplayState> {
-
-    private static final Intent LIVEDISPLAY_SETTINGS =
-            new Intent("android.settings.LIVEDISPLAY_SETTINGS");
-
-    private final LiveDisplayObserver mObserver;
-    private String[] mEntries;
-    private String[] mDescriptionEntries;
-    private String[] mAnnouncementEntries;
-    private String[] mValues;
-    private final int[] mEntryIconRes;
-
-    private boolean mListening;
-
-    private static final int MODE_OUTDOOR = 3;
-    private static final int MODE_DAY = 4;
-
-    private static final int OFF_TEMPERATURE = 6500;
-
-    private int mDayTemperature;
-
-    private final boolean mOutdoorModeAvailable;
-    private final int mDefaultDayTemperature;
-
-    public LiveDisplayTile(Host host) {
-        super(host);
-
-        Resources res = mContext.getResources();
-        TypedArray typedArray = res.obtainTypedArray(R.array.live_display_drawables);
-        mEntryIconRes = new int[typedArray.length()];
-        for (int i = 0; i < mEntryIconRes.length; i++) {
-            mEntryIconRes[i] = typedArray.getResourceId(i, 0);
-        }
-        typedArray.recycle();
-
-        updateEntries();
-
-        mOutdoorModeAvailable =
-                CMHardwareManager.getInstance(mContext)
-                    .isSupported(CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT);
-
-        mDefaultDayTemperature = mContext.getResources().getInteger(
-                com.android.internal.R.integer.config_dayColorTemperature);
-        loadDayTemperature();
-
-        mObserver = new LiveDisplayObserver(mHandler);
-        mObserver.startObserving();
-    }
-
-    private void updateEntries() {
-        Resources res = mContext.getResources();
-        mEntries = res.getStringArray(com.android.internal.R.array.live_display_entries);
-        mDescriptionEntries = res.getStringArray(R.array.live_display_description);
-        mAnnouncementEntries = res.getStringArray(R.array.live_display_announcement);
-        mValues = res.getStringArray(com.android.internal.R.array.live_display_values);
-    }
-
-    @Override
-    protected LiveDisplayState newTileState() {
-        return new LiveDisplayState();
-    }
-
-    @Override
-    public void setListening(boolean listening) {
-        if (mListening == listening)
-            return;
-        mListening = listening;
-        if (listening) {
-            mObserver.startObserving();
-        } else {
-            mObserver.endObserving();
-        }
-    }
-
-    @Override
-    protected void handleClick() {
-        changeToNextMode();
-    }
-
-    @Override
-    protected void handleLongClick() {
-        mHost.startActivityDismissingKeyguard(LIVEDISPLAY_SETTINGS);
-    }
-
-    @Override
-    protected void handleUpdateState(LiveDisplayState state, Object arg) {
-        updateEntries();
-        state.visible = true;
-        state.mode = arg == null ? getCurrentModeIndex() : (Integer) arg;
-        state.label = mEntries[state.mode];
-        state.icon = ResourceIcon.get(mEntryIconRes[state.mode]);
-        state.contentDescription = mDescriptionEntries[state.mode];
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return CMMetricsLogger.TILE_LIVE_DISPLAY;
-    }
-
-    @Override
-    protected String composeChangeAnnouncement() {
-        return mAnnouncementEntries[getCurrentModeIndex()];
-    }
-
-    private int getCurrentModeIndex() {
-        return ArrayUtils.indexOf(mValues,
-                String.valueOf(CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                        CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                        0, UserHandle.USER_CURRENT)));
-    }
-
-    private void changeToNextMode() {
-        int next = getCurrentModeIndex() + 1;
-
-        if (next >= mValues.length) {
-            next = 0;
-        }
-
-        while (true) {
-            // Skip outdoor mode if it's unsupported, and skip the day setting
-            // if it's the same as the off setting
-            if ((!mOutdoorModeAvailable &&
-                    Integer.valueOf(mValues[next]) == MODE_OUTDOOR) ||
-                    (mDayTemperature == OFF_TEMPERATURE &&
-                    Integer.valueOf(mValues[next]) == MODE_DAY)) {
-                next++;
-                if (next >= mValues.length) {
-                    next = 0;
-                }
-            } else {
-                break;
-            }
-        }
-
-        CMSettings.System.putIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                Integer.valueOf(mValues[next]), UserHandle.USER_CURRENT);
-    }
-
-    private void loadDayTemperature() {
-        mDayTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_DAY,
-                mDefaultDayTemperature,
-                UserHandle.USER_CURRENT);
-    }
-
-    private class LiveDisplayObserver extends ContentObserver {
-        public LiveDisplayObserver(Handler handler) {
-            super(handler);
-        }
-
-        @Override
-        public void onChange(boolean selfChange) {
-            loadDayTemperature();
-            refreshState(getCurrentModeIndex());
-        }
-
-        public void startObserving() {
-            mContext.getContentResolver().registerContentObserver(
-                    CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_MODE),
-                    false, this, UserHandle.USER_ALL);
-            mContext.getContentResolver().registerContentObserver(
-                    CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_DAY),
-                    false, this, UserHandle.USER_ALL);
-        }
-
-        public void endObserving() {
-            mContext.getContentResolver().unregisterContentObserver(this);
-        }
-    }
-
-    public static class LiveDisplayState extends QSTile.State {
-        public int mode;
-
-        @Override
-        public boolean copyTo(State other) {
-            final LiveDisplayState o = (LiveDisplayState) other;
-            final boolean changed = mode != o.mode;
-            return super.copyTo(other) || changed;
-        }
-
-        @Override
-        protected StringBuilder toStringBuilder() {
-            final StringBuilder rt = super.toStringBuilder();
-            rt.insert(rt.length() - 1, ",mode=" + mode);
-            return rt;
-        }
-    }
-}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java
index 1bfbb8f..a5ffd23 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/NfcTile.java
@@ -22,12 +22,14 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.nfc.NfcAdapter;
 
+import android.util.Log;
 import com.android.systemui.R;
 import com.android.systemui.qs.QSTile;
 import org.cyanogenmod.internal.logging.CMMetricsLogger;
+import org.cyanogenmod.internal.util.QSUtils;
 
 public class NfcTile extends QSTile<QSTile.BooleanState> {
-    private NfcAdapter mNfcAdapter;
+
     private boolean mListening;
 
     private BroadcastReceiver mReceiver = new BroadcastReceiver() {
@@ -36,10 +38,11 @@ public class NfcTile extends QSTile<QSTile.BooleanState> {
             refreshState();
         }
     };
+    private final boolean mSupportsNfc;
 
     public NfcTile(Host host) {
         super(host);
-        mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
+        mSupportsNfc = QSUtils.deviceSupportsNfc(mContext);
     }
 
     @Override
@@ -49,7 +52,9 @@ public class NfcTile extends QSTile<QSTile.BooleanState> {
 
     @Override
     protected void handleClick() {
-        toggleState();
+        boolean newState = !getState().value;
+        setState(newState);
+        refreshState();
     }
 
     @Override
@@ -57,23 +62,45 @@ public class NfcTile extends QSTile<QSTile.BooleanState> {
         mHost.startActivityDismissingKeyguard(new Intent("android.settings.NFC_SETTINGS"));
     }
 
-    protected void toggleState() {
-        int state = getNfcState();
-        switch (state) {
-            case NfcAdapter.STATE_TURNING_ON:
-            case NfcAdapter.STATE_ON:
-                mNfcAdapter.disable();
-                break;
-            case NfcAdapter.STATE_TURNING_OFF:
-            case NfcAdapter.STATE_OFF:
-                mNfcAdapter.enable();
-                break;
+    private void setState(boolean on) {
+        try {
+            NfcAdapter nfcAdapter = NfcAdapter.getNfcAdapter(mContext);
+            if (nfcAdapter == null) {
+                Log.e(TAG, "tried to set NFC state, but no NFC adapter was found");
+                return;
+            }
+            if (on) {
+                nfcAdapter.enable();
+            } else {
+                nfcAdapter.disable();
+            }
+        } catch (UnsupportedOperationException e) {
+            // ignore
+        }
+    }
+
+    private int getNfcAdapterState() {
+        try {
+            NfcAdapter nfcAdapter = NfcAdapter.getNfcAdapter(mContext);
+            if (nfcAdapter == null) {
+                Log.e(TAG, "tried to get NFC state, but no NFC adapter was found");
+                return NfcAdapter.STATE_OFF;
+            }
+            return nfcAdapter.getAdapterState();
+        } catch (UnsupportedOperationException e) {
+            // ignore
+            return NfcAdapter.STATE_OFF;
         }
     }
 
-    private boolean isEnabled() {
-        int state = getNfcState();
-        switch (state) {
+    /**
+     * Helper method to encapsulate intermediate states (turning off/on) to help determine whether
+     * the adapter will be on or off.
+     * @param nfcState The current NFC adapter state.
+     * @return boolean representing what state the adapter is/will be in
+     */
+    private static boolean isEnabled(int nfcState) {
+        switch (nfcState) {
             case NfcAdapter.STATE_TURNING_ON:
             case NfcAdapter.STATE_ON:
                 return true;
@@ -84,17 +111,28 @@ public class NfcTile extends QSTile<QSTile.BooleanState> {
         }
     }
 
-    private int getNfcState() {
-        return mNfcAdapter.getAdapterState();
+    /**
+     * Helper method to determine intermediate states
+     * @param nfcState The current NFC adapter state.
+     * @return boolean representing if the adapter is in an intermediate state
+     */
+    private static boolean isEnablingDisabling(int nfcState) {
+        switch (nfcState) {
+            case NfcAdapter.STATE_TURNING_OFF:
+            case NfcAdapter.STATE_TURNING_ON:
+                return true;
+            default:
+                return false;
+        }
     }
 
     @Override
     protected void handleUpdateState(BooleanState state, Object arg) {
-        if (mNfcAdapter == null) {
-            mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
-        }
-        state.visible = mNfcAdapter != null;
-        state.value = mNfcAdapter != null && isEnabled();
+        state.visible = mSupportsNfc;
+        final int nfcState = getNfcAdapterState();
+        state.value = mSupportsNfc && isEnabled(nfcState);
+        state.enabled = mSupportsNfc && !isEnablingDisabling(nfcState);
+
         state.icon = ResourceIcon.get(state.value ?
                 R.drawable.ic_qs_nfc_on : R.drawable.ic_qs_nfc_off);
         state.label = mContext.getString(R.string.quick_settings_nfc_label);
@@ -110,12 +148,9 @@ public class NfcTile extends QSTile<QSTile.BooleanState> {
         if (mListening == listening) return;
         mListening = listening;
         if (listening) {
-            if (mNfcAdapter == null) {
-                mNfcAdapter = NfcAdapter.getDefaultAdapter(mContext);
-                refreshState();
-            }
             mContext.registerReceiver(mReceiver,
                     new IntentFilter(NfcAdapter.ACTION_ADAPTER_STATE_CHANGED));
+            refreshState();
         } else {
             mContext.unregisterReceiver(mReceiver);
         }
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/PerfProfileTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/PerfProfileTile.java
index e6e6bb4..4863683 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/PerfProfileTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/PerfProfileTile.java
@@ -48,6 +48,7 @@ public class PerfProfileTile extends QSTile<PerfProfileTile.ProfileState> {
     private final String[] mDescriptionEntries;
     private final String[] mAnnouncementEntries;
     private final int[] mPerfProfileValues;
+    private final int mNumPerfProfiles;
     private final Icon mIcon;
 
     private final PowerManager mPm;
@@ -61,16 +62,36 @@ public class PerfProfileTile extends QSTile<PerfProfileTile.ProfileState> {
         mObserver = new PerformanceProfileObserver(mHandler);
         mPm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
         mPerformanceManager = PerformanceManager.getInstance(mContext);
+        mNumPerfProfiles = mPerformanceManager.getNumberOfProfiles();
 
-        Resources res = mContext.getResources();
-
-        mPerfProfileValues = res.getIntArray(org.cyanogenmod.platform.internal.R.array.perf_profile_values);
-
-        mEntries = res.getStringArray(org.cyanogenmod.platform.internal.R.array.perf_profile_entries);
-        mDescriptionEntries = res.getStringArray(R.array.perf_profile_description);
-        mAnnouncementEntries = res.getStringArray(R.array.perf_profile_announcement);
+        mPerfProfileValues = new int[mNumPerfProfiles];
+        mEntries = new String[mNumPerfProfiles];
+        mDescriptionEntries = new String[mNumPerfProfiles];
+        mAnnouncementEntries = new String[mNumPerfProfiles];
 
         mIcon = ResourceIcon.get(R.drawable.ic_qs_perf_profile);
+
+        // Filter out unsupported profiles
+        Resources res = mContext.getResources();
+        final int[] perfProfileValues = res.getIntArray(
+                org.cyanogenmod.platform.internal.R.array.perf_profile_values);
+        final String[] entries = res.getStringArray(
+                org.cyanogenmod.platform.internal.R.array.perf_profile_entries);
+        final String[] descriptionEntries = res.getStringArray(
+                R.array.perf_profile_description);
+        final String[] announcementEntries = res.getStringArray(
+                R.array.perf_profile_announcement);
+        int i = 0;
+
+        for (int j = 0; j < perfProfileValues.length; j++) {
+            if (perfProfileValues[j] < mNumPerfProfiles) {
+                mPerfProfileValues[i] = perfProfileValues[j];
+                mEntries[i] = entries[j];
+                mDescriptionEntries[i] = descriptionEntries[j];
+                mAnnouncementEntries[i] = announcementEntries[j];
+                i++;
+            }
+        }
     }
 
     @Override
@@ -135,7 +156,7 @@ public class PerfProfileTile extends QSTile<PerfProfileTile.ProfileState> {
 
         public void startObserving() {
             mContext.getContentResolver().registerContentObserver(
-                    Settings.Secure.getUriFor(CMSettings.Secure.PERFORMANCE_PROFILE),
+                    CMSettings.Secure.getUriFor(CMSettings.Secure.PERFORMANCE_PROFILE),
                     false, this);
         }
 
diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
index f4fe677..9e08599 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java
@@ -85,6 +85,8 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
     // Runnable to be executed after we paused ourselves
     Runnable mAfterPauseRunnable;
 
+    private ReferenceCountedTrigger mExitTrigger;
+
     /**
      * A common Runnable to finish Recents either by calling finish() (with a custom animation) or
      * launching Home with some ActivityOptions.  Generally we always launch home when we exit
@@ -95,6 +97,7 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
     class FinishRecentsRunnable implements Runnable {
         Intent mLaunchIntent;
         ActivityOptions mLaunchOpts;
+        boolean mAbort = false;
 
         /**
          * Creates a finish runnable that starts the specified intent, using the given
@@ -105,8 +108,15 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
             mLaunchOpts = opts;
         }
 
+        public void setAbort(boolean run) {
+            this.mAbort = run;
+        }
+
         @Override
         public void run() {
+            if (mAbort) {
+                return;
+            }
             // Finish Recents
             if (mLaunchIntent != null) {
                 try {
@@ -317,13 +327,26 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
         return false;
     }
 
+    @Override
+    public void onWindowFocusChanged(boolean hasFocus) {
+        super.onWindowFocusChanged(hasFocus);
+        if (!hasFocus && mExitTrigger != null && mExitTrigger.getCount() > 0) {
+            // we are animating recents out and the window has lost focus during the
+            // animation. we need to stop everything we're doing now and get out
+            // without any animations (since we were already animating)
+            mFinishLaunchHomeRunnable.setAbort(true);
+            finish();
+            overridePendingTransition(0, 0);
+        }
+    }
+
     /** Dismisses Recents directly to Home. */
     void dismissRecentsToHomeRaw(boolean animated) {
         if (animated) {
-            ReferenceCountedTrigger exitTrigger = new ReferenceCountedTrigger(this,
+            mExitTrigger = new ReferenceCountedTrigger(this,
                     null, mFinishLaunchHomeRunnable, null);
             mRecentsView.startExitToHomeAnimation(
-                    new ViewAnimation.TaskViewExitContext(exitTrigger));
+                    new ViewAnimation.TaskViewExitContext(mExitTrigger));
         } else {
             mFinishLaunchHomeRunnable.run();
         }
@@ -458,6 +481,9 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
     @Override
     protected void onStop() {
         super.onStop();
+
+        mExitTrigger = null;
+
         MetricsLogger.hidden(this, MetricsLogger.OVERVIEW_ACTIVITY);
         RecentsTaskLoader loader = RecentsTaskLoader.getInstance();
         SystemServicesProxy ssp = loader.getSystemServicesProxy();
diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
index 64622620..2f11c56 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java
@@ -31,6 +31,7 @@ import android.os.UserHandle;
 import android.provider.Settings;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.EventLog;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowInsets;
@@ -48,6 +49,8 @@ import com.android.systemui.recents.model.RecentsTaskLoader;
 import com.android.systemui.recents.model.Task;
 import com.android.systemui.recents.model.TaskStack;
 
+import com.android.systemui.EventLogTags;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -267,6 +270,8 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
             stackView.startEnterRecentsAnimation(ctx);
         }
         ctx.postAnimationTrigger.decrement();
+
+        EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_EVENT, 1 /* opened */);
     }
 
     /** Requests all task stacks to start their exit-recents animation */
@@ -620,6 +625,8 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
                 launchRunnable.run();
             }
         }
+
+        EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_EVENT, 3 /* chose task */);
     }
 
     @Override
@@ -659,6 +666,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
 
         // Keep track of all-deletions
         MetricsLogger.count(getContext(), "overview_task_all_dismissed", 1);
+        EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_EVENT, 4 /* closed all */);
     }
 
     /** Final callback after Recents is finally hidden. */
@@ -670,6 +678,7 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
             TaskStackView stackView = stackViews.get(i);
             stackView.onRecentsHidden();
         }
+        EventLog.writeEvent(EventLogTags.SYSUI_RECENTS_EVENT, 2 /* closed */);
     }
 
     @Override
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 43b9a3e..454222c 100644
--- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
+++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java
@@ -1018,8 +1018,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal
                 t.setClipViewInStack(false);
                 t.startLaunchTaskAnimation(r, true, true, lockToTask);
             } else {
-                boolean occludesLaunchTarget = launchTargetTask.group.isTaskAboveTask(t.getTask(),
-                        launchTargetTask);
+                boolean occludesLaunchTarget = launchTargetTask != null &&
+                        launchTargetTask.group != null &&
+                        launchTargetTask.group.isTaskAboveTask(t.getTask(), launchTargetTask);
                 t.startLaunchTaskAnimation(null, false, occludesLaunchTarget, lockToTask);
             }
         }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
index 7b608bb..e958ee1 100755
--- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
@@ -45,6 +45,7 @@ import android.database.ContentObserver;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.Icon;
+import android.media.session.MediaController;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
@@ -117,6 +118,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
 
+import cyanogenmod.providers.CMSettings;
+
 import static com.android.keyguard.KeyguardHostView.OnDismissAction;
 
 public abstract class BaseStatusBar extends SystemUI implements
@@ -154,6 +157,8 @@ public abstract class BaseStatusBar extends SystemUI implements
     private static final String BANNER_ACTION_SETUP =
             "com.android.systemui.statusbar.banner_action_setup";
 
+    protected static final int SYSTEM_UI_VISIBILITY_MASK = 0xffffffff;
+
     private static final Uri SPAM_MESSAGE_URI = new Uri.Builder()
            .scheme(ContentResolver.SCHEME_CONTENT)
             .authority(SpamMessageProvider.AUTHORITY)
@@ -221,6 +226,8 @@ public abstract class BaseStatusBar extends SystemUI implements
     protected WindowManager mWindowManager;
     protected IWindowManager mWindowManagerService;
 
+    private NotificationManager mNoMan;
+
     protected abstract void refreshLayout(int layoutDirection);
 
     protected Display mDisplay;
@@ -263,8 +270,8 @@ public abstract class BaseStatusBar extends SystemUI implements
     protected final ContentObserver mSettingsObserver = new ContentObserver(mHandler) {
         @Override
         public void onChange(boolean selfChange) {
-            final boolean provisioned = 0 != Settings.Global.getInt(
-                    mContext.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 0);
+            final boolean provisioned = 0 != CMSettings.Secure.getInt(
+                    mContext.getContentResolver(), CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED, 0);
             if (provisioned != mDeviceProvisioned) {
                 mDeviceProvisioned = provisioned;
                 updateNotifications();
@@ -427,9 +434,7 @@ public abstract class BaseStatusBar extends SystemUI implements
                     }
                 }
             } else if (BANNER_ACTION_CANCEL.equals(action) || BANNER_ACTION_SETUP.equals(action)) {
-                NotificationManager noMan = (NotificationManager)
-                        mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-                noMan.cancel(R.id.notification_hidden);
+                mNoMan.cancel(R.id.notification_hidden);
 
                 Settings.Secure.putInt(mContext.getContentResolver(),
                         Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0);
@@ -558,6 +563,9 @@ public abstract class BaseStatusBar extends SystemUI implements
     public void start() {
         mWindowManager = (WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE);
         mWindowManagerService = WindowManagerGlobal.getWindowManagerService();
+
+        mNoMan = (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
+
         mDisplay = mWindowManager.getDefaultDisplay();
         mDevicePolicyManager = (DevicePolicyManager)mContext.getSystemService(
                 Context.DEVICE_POLICY_SERVICE);
@@ -574,8 +582,8 @@ public abstract class BaseStatusBar extends SystemUI implements
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
 
         mContext.getContentResolver().registerContentObserver(
-                Settings.Global.getUriFor(Settings.Global.DEVICE_PROVISIONED), true,
-                mSettingsObserver);
+                CMSettings.Secure.getUriFor(CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED), false,
+                mSettingsObserver, UserHandle.USER_ALL);
         mContext.getContentResolver().registerContentObserver(
                 Settings.Global.getUriFor(Settings.Global.ZEN_MODE), false,
                 mSettingsObserver);
@@ -624,7 +632,7 @@ public abstract class BaseStatusBar extends SystemUI implements
 
         mSettingsObserver.onChange(false); // set up
         disable(switches[0], switches[6], false /* animate */);
-        setSystemUiVisibility(switches[1], 0xffffffff);
+        setSystemUiVisibility(switches[1], SYSTEM_UI_VISIBILITY_MASK);
         topAppWindowChanged(switches[2] != 0);
         // StatusBarManagerService has a back up of IME token and it's restored here.
         setImeWindowStatus(binders.get(0), switches[3], switches[4], switches[5] != 0);
@@ -723,9 +731,7 @@ public abstract class BaseStatusBar extends SystemUI implements
                             mContext.getString(R.string.hidden_notifications_setup),
                             setupIntent);
 
-            NotificationManager noMan =
-                    (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-            noMan.notify(R.id.notification_hidden, note.build());
+            mNoMan.notify(R.id.notification_hidden, note.build());
         }
     }
 
@@ -769,6 +775,10 @@ public abstract class BaseStatusBar extends SystemUI implements
         return null;
     }
 
+    protected MediaController getCurrentMediaController() {
+        return null;
+    }
+
     @Override
     public NotificationGroupManager getGroupManager() {
         return mGroupManager;
@@ -947,7 +957,9 @@ public abstract class BaseStatusBar extends SystemUI implements
                 }
             });
 
-            filterButton.setVisibility(View.VISIBLE);
+            Notification notification = sbn.getNotification();
+            filterButton.setVisibility(SpamFilter.hasFilterableContent(notification)
+                    ? View.VISIBLE : View.GONE);
             filterButton.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
                     AsyncTask.execute(new Runnable() {
@@ -1014,6 +1026,10 @@ public abstract class BaseStatusBar extends SystemUI implements
                 }
 
                 ExpandableNotificationRow row = (ExpandableNotificationRow) v;
+                if (v instanceof MediaExpandableNotificationRow
+                        && !((MediaExpandableNotificationRow) v).inflateGuts()) {
+                    return false;
+                }
                 bindGuts(row);
 
                 // Assume we are a status_bar_notification_row
@@ -1280,6 +1296,20 @@ public abstract class BaseStatusBar extends SystemUI implements
     }
 
     protected boolean inflateViews(Entry entry, ViewGroup parent) {
+        final StatusBarNotification sbn = entry.notification;
+        String themePackageName = mCurrentTheme != null
+                ? mCurrentTheme.getOverlayPkgNameForApp(sbn.getPackageName()) : null;
+        boolean inflated = inflateViews(entry, parent, true);
+        if (!inflated && themePackageName != null
+                && !ThemeConfig.SYSTEM_DEFAULT.equals(themePackageName)) {
+            Log.w(TAG, "Couldn't expand themed RemoteViews, trying unthemed for: " + sbn);
+            inflated = inflateViews(entry, mStackScroller, false);
+        }
+
+        return inflated;
+    }
+
+    protected boolean inflateViews(Entry entry, ViewGroup parent, boolean isThemeable) {
         PackageManager pmUser = getPackageManagerForUser(
                 entry.notification.getUser().getIdentifier());
 
@@ -1320,8 +1350,19 @@ public abstract class BaseStatusBar extends SystemUI implements
             // create the row view
             LayoutInflater inflater = (LayoutInflater) mContext.getSystemService(
                     Context.LAYOUT_INFLATER_SERVICE);
-            row = (ExpandableNotificationRow) inflater.inflate(R.layout.status_bar_notification_row,
-                    parent, false);
+
+            // cannot use isMediaNotification()
+            if (sbn.getNotification().category != null
+                    && sbn.getNotification().category.equals(Notification.CATEGORY_TRANSPORT)) {
+                row = (MediaExpandableNotificationRow) inflater.inflate(
+                        R.layout.status_bar_notification_row_media, parent, false);
+                ((MediaExpandableNotificationRow)row).setMediaController(
+                        getCurrentMediaController());
+            } else {
+                row = (ExpandableNotificationRow) inflater.inflate(
+                        R.layout.status_bar_notification_row,
+                        parent, false);
+            }
             row.setExpansionLogger(this, entry.notification.getKey());
             row.setGroupManager(mGroupManager);
         }
@@ -1345,10 +1386,12 @@ public abstract class BaseStatusBar extends SystemUI implements
         View contentViewLocal = null;
         View bigContentViewLocal = null;
         View headsUpContentViewLocal = null;
-        String themePackageName = mCurrentTheme != null
-                ? mCurrentTheme.getOverlayPkgNameForApp(sbn.getPackageName()) : null;
-        String statusBarThemePackageName = mCurrentTheme != null
-                ? mCurrentTheme.getOverlayForStatusBar() : null;
+        String themePackageName = (isThemeable && mCurrentTheme != null)
+                ? mCurrentTheme.getOverlayPkgNameForApp(sbn.getPackageName())
+                : ThemeConfig.SYSTEM_DEFAULT;
+        String statusBarThemePackageName = (isThemeable && mCurrentTheme != null)
+                ? mCurrentTheme.getOverlayForStatusBar()
+                : ThemeConfig.SYSTEM_DEFAULT;
 
         try {
             contentViewLocal = contentView.apply(
@@ -1439,8 +1482,10 @@ public abstract class BaseStatusBar extends SystemUI implements
         }
 
         if (publicViewLocal == null) {
+            final Context layoutContext = isThemeable ? mContext
+                    : maybeGetThemedContext(mContext, ThemeConfig.SYSTEM_DEFAULT);
             // Add a basic notification template
-            publicViewLocal = LayoutInflater.from(mContext).inflate(
+            publicViewLocal = LayoutInflater.from(layoutContext).inflate(
                     R.layout.notification_public_default,
                     contentContainerPublic, false);
             publicViewLocal.setIsRootNamespace(true);
@@ -1875,7 +1920,18 @@ public abstract class BaseStatusBar extends SystemUI implements
     }
 
     private boolean shouldShowOnKeyguard(StatusBarNotification sbn) {
-        return mShowLockscreenNotifications && !mNotificationData.isAmbient(sbn.getKey());
+        if (!mShowLockscreenNotifications || mNotificationData.isAmbient(sbn.getKey())) {
+            return false;
+        }
+        final int showOnKeyguard = mNoMan.getShowNotificationForPackageOnKeyguard(
+                sbn.getPackageName(), sbn.getUid());
+        boolean isKeyguardAllowedForApp =
+                (showOnKeyguard & Notification.SHOW_ALL_NOTI_ON_KEYGUARD) != 0;
+        if (isKeyguardAllowedForApp && sbn.isOngoing()) {
+            isKeyguardAllowedForApp =
+                    (showOnKeyguard & Notification.SHOW_NO_ONGOING_NOTI_ON_KEYGUARD) == 0;
+        }
+        return isKeyguardAllowedForApp;
     }
 
     protected void setZenMode(int mode) {
@@ -2286,4 +2342,24 @@ public abstract class BaseStatusBar extends SystemUI implements
             mAssistManager.startAssist(args);
         }
     }
+
+    /**
+     * Returns a context with the given theme applied or the original context if we fail to get a
+     * themed context.
+     */
+    private Context maybeGetThemedContext(Context context, String themePkg) {
+        Context themedContext;
+        try {
+            ApplicationInfo ai = context.getPackageManager().getApplicationInfo(
+                    context.getPackageName(), 0);
+            themedContext = context.createApplicationContext(ai, themePkg,
+                    0);
+        } catch (PackageManager.NameNotFoundException e) {
+            themedContext = null;
+        }
+        if (themedContext == null) {
+            themedContext = context;
+        }
+        return themedContext;
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/CustomTileData.java b/packages/SystemUI/src/com/android/systemui/statusbar/CustomTileData.java
index 4be7292..42974ba 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/CustomTileData.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/CustomTileData.java
@@ -29,7 +29,7 @@ public class CustomTileData {
         public final StatusBarPanelCustomTile sbc;
 
         public Entry(StatusBarPanelCustomTile sbc) {
-            this.key = sbc.getKey();
+            this.key = sbc.persistableKey();
             this.sbc = sbc;
         }
     }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
index c964ca7..be51e57 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java
@@ -64,7 +64,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
     private boolean mShowingPublic;
     private boolean mSensitive;
     private boolean mShowingPublicInitialized;
-    private boolean mHideSensitiveForIntrinsicHeight;
+    protected boolean mHideSensitiveForIntrinsicHeight;
 
     /**
      * Is this notification expanded by the system. The expansion state can be overridden by the
@@ -77,10 +77,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
      */
     private boolean mExpansionDisabled;
 
-    private NotificationContentView mPublicLayout;
-    private NotificationContentView mPrivateLayout;
-    private int mMaxExpandHeight;
-    private int mHeadsUpHeight;
+    protected NotificationContentView mPublicLayout;
+    protected NotificationContentView mPrivateLayout;
+    protected int mMaxExpandHeight;
+    protected int mHeadsUpHeight;
     private View mVetoButton;
     private boolean mClearable;
     private ExpansionLogger mLogger;
@@ -101,7 +101,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
     private ValueAnimator mChildExpandAnimator;
     private float mChildrenExpandProgress;
     private float mExpandButtonStart;
-    private ViewStub mGutsStub;
+    protected ViewStub mGutsStub;
     private boolean mHasExpandAction;
     private boolean mIsSystemChildExpanded;
     private boolean mIsPinned;
@@ -443,10 +443,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
         mVetoButton = findViewById(R.id.veto);
     }
 
-    public void inflateGuts() {
+    public boolean inflateGuts() {
         if (mGuts == null) {
             mGutsStub.inflate();
         }
+        return false;
     }
 
     private void updateChildrenVisibility(boolean animated) {
@@ -645,7 +646,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
         } else if (mChildrenExpanded) {
             maxContentHeight = mChildrenContainer.getIntrinsicHeight();
         } else {
-            maxContentHeight = getMaxExpandHeight();
+            maxContentHeight = mMaxExpandHeight;
         }
         return maxContentHeight + getBottomDecorHeight();
     }
@@ -669,7 +670,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
      *
      * @return whether the view state is currently expanded.
      */
-    private boolean isExpanded() {
+    protected boolean isExpanded() {
         return !mExpansionDisabled
                 && (!hasUserChangedExpansion() && (isSystemExpanded() || isSystemChildExpanded())
                 || isUserExpanded());
@@ -703,7 +704,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
         return super.isChildInvisible(child) || isInvisibleChildContainer;
     }
 
-    private void updateMaxHeights() {
+    protected void updateMaxHeights() {
         int intrinsicBefore = getIntrinsicHeight();
         View expandedChild = mPrivateLayout.getExpandedChild();
         if (expandedChild == null) {
@@ -902,10 +903,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
         }
     }
 
-    public int getMaxExpandHeight() {
-        return mMaxExpandHeight;
-    }
-
     @Override
     public boolean isContentExpandable() {
         NotificationContentView showingLayout = getShowingLayout();
@@ -961,7 +958,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView {
         return mMaxExpandHeight != 0;
     }
 
-    private NotificationContentView getShowingLayout() {
+    protected NotificationContentView getShowingLayout() {
         return mShowingPublic ? mPublicLayout : mPrivateLayout;
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
index 71baf57..76858ab 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableView.java
@@ -42,7 +42,7 @@ public abstract class ExpandableView extends FrameLayout {
     private boolean mDark;
     private ArrayList<View> mMatchParentViews = new ArrayList<View>();
     private int mClipTopOptimization;
-    private static Rect mClipRect = new Rect();
+    private Rect mClipRect = new Rect();
     private boolean mWillBeGone;
     private int mMinClipTopAmount = 0;
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
index 26b9c8e..1f7e687 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
@@ -187,7 +187,7 @@ public class KeyguardAffordanceView extends ImageView implements Palette.Palette
         if (mPreviewView != null) {
             mPreviewView.setVisibility(mLaunchingAffordance
                     ? oldPreviewView.getVisibility() : INVISIBLE);
-            mPreviewView.setVisibility(INVISIBLE);
+            mPreviewView.setVisibility(GONE);
             addOverlay();
         }
     }
@@ -283,7 +283,7 @@ public class KeyguardAffordanceView extends ImageView implements Palette.Palette
         });
         animatorToRadius.start();
         setImageAlpha(0, true);
-        if (mPreviewView != null) {
+        if (mPreviewView != null && mPreviewView.getVisibility() == View.VISIBLE) {
             mPreviewView.setVisibility(View.VISIBLE);
             mPreviewClipper = ViewAnimationUtils.createCircularReveal(
                     mPreviewView, getLeft() + mCenterX, getTop() + mCenterY, mCircleRadius,
@@ -386,7 +386,7 @@ public class KeyguardAffordanceView extends ImageView implements Palette.Palette
                 invalidate();
                 if (nowHidden) {
                     if (mPreviewView != null) {
-                        mPreviewView.setVisibility(View.INVISIBLE);
+                        mPreviewView.setVisibility(View.GONE);
                     }
                 }
             } else if (!mCircleWillBeHidden) {
@@ -425,7 +425,7 @@ public class KeyguardAffordanceView extends ImageView implements Palette.Palette
                 mPreviewClipper.addListener(new AnimatorListenerAdapter() {
                     @Override
                     public void onAnimationEnd(Animator animation) {
-                        mPreviewView.setVisibility(View.INVISIBLE);
+                        mPreviewView.setVisibility(View.GONE);
                     }
                 });
                 mPreviewClipper.start();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 318ef5e..e4a0196 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -20,6 +20,7 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
+import android.content.res.ColorStateList;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.hardware.fingerprint.FingerprintManager;
@@ -74,16 +75,20 @@ public class KeyguardIndicationController {
     private int mChargingSpeed;
     private int mChargingCurrent;
     private String mMessageToShowOnScreenOn;
+    private IndicationDirection mIndicationDirection;
+    private boolean mScreenOnHintsEnabled;
 
     public KeyguardIndicationController(Context context, KeyguardIndicationTextView textView,
                                         LockIcon lockIcon) {
         mContext = context;
         mTextView = textView;
         mLockIcon = lockIcon;
+        mIndicationDirection = IndicationDirection.NONE;
 
         Resources res = context.getResources();
         mSlowThreshold = res.getInteger(R.integer.config_chargingSlowlyThreshold);
         mFastThreshold = res.getInteger(R.integer.config_chargingFastThreshold);
+        mScreenOnHintsEnabled = res.getBoolean(R.bool.config_showScreenOnLockScreenHints);
 
 
         mBatteryInfo = IBatteryStats.Stub.asInterface(
@@ -121,6 +126,20 @@ public class KeyguardIndicationController {
     /**
      * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}.
      */
+    public void showTransientIndication(int transientIndication, IndicationDirection direction) {
+        showTransientIndication(mContext.getResources().getString(transientIndication), direction);
+    }
+
+    /**
+     * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}.
+     */
+    public void showTransientIndication(String transientIndication, IndicationDirection direction) {
+        showTransientIndication(transientIndication, Color.WHITE, direction);
+    }
+
+    /**
+     * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}.
+     */
     public void showTransientIndication(int transientIndication) {
         showTransientIndication(mContext.getResources().getString(transientIndication));
     }
@@ -129,15 +148,24 @@ public class KeyguardIndicationController {
      * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}.
      */
     public void showTransientIndication(String transientIndication) {
-        showTransientIndication(transientIndication, Color.WHITE);
+        showTransientIndication(transientIndication, Color.WHITE, IndicationDirection.NONE);
     }
 
     /**
      * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}.
      */
     public void showTransientIndication(String transientIndication, int textColor) {
+        showTransientIndication(transientIndication, textColor, IndicationDirection.NONE);
+    }
+
+    /**
+     * Shows {@param transientIndication} until it is hidden by {@link #hideTransientIndication}.
+     */
+    public void showTransientIndication(String transientIndication, int textColor,
+            IndicationDirection direction) {
         mTransientIndication = transientIndication;
         mTransientTextColor = textColor;
+        mIndicationDirection = direction;
         mHandler.removeMessages(MSG_HIDE_TRANSIENT);
         updateIndication();
     }
@@ -160,8 +188,31 @@ public class KeyguardIndicationController {
 
     private void updateIndication() {
         if (mVisible) {
+            final int color = computeColor();
             mTextView.switchIndication(computeIndication());
-            mTextView.setTextColor(computeColor());
+            mTextView.setTextColor(color);
+            int top = 0, left = 0, right = 0;
+            // pad the bottom using ic_empty_space to keep text vertically aligned if needed
+            int bottom = mScreenOnHintsEnabled ? R.drawable.ic_empty_space : 0;
+            switch (mIndicationDirection) {
+                case UP:
+                    top = R.drawable.ic_keyboard_arrow_up;
+                    break;
+                case DOWN:
+                    bottom = R.drawable.ic_keyboard_arrow_down;
+                    break;
+                case LEFT:
+                    left = R.drawable.ic_keyboard_arrow_left;
+                    break;
+                case RIGHT:
+                    right = R.drawable.ic_keyboard_arrow_right;
+                    break;
+                case NONE:
+                default:
+                    break;
+            }
+            mTextView.setCompoundDrawablesWithIntrinsicBounds(left, top, right, bottom);
+            mTextView.setCompoundDrawableTintList(ColorStateList.valueOf(color));
         }
     }
 
@@ -176,6 +227,7 @@ public class KeyguardIndicationController {
         if (!TextUtils.isEmpty(mTransientIndication)) {
             return mTransientIndication;
         }
+        mIndicationDirection = IndicationDirection.NONE;
         if (mPowerPluggedIn) {
             String indication = computePowerIndication();
             if (DEBUG_CHARGING_CURRENT) {
@@ -326,4 +378,12 @@ public class KeyguardIndicationController {
             StatusBarKeyguardViewManager statusBarKeyguardViewManager) {
         mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;
     }
+
+    public enum IndicationDirection {
+        NONE,
+        UP,
+        DOWN,
+        LEFT,
+        RIGHT
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/MediaExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/MediaExpandableNotificationRow.java
new file mode 100644
index 0000000..c25f146
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/MediaExpandableNotificationRow.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod 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.statusbar;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.media.session.MediaController;
+import android.os.Build;
+import android.os.Handler;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.android.systemui.R;
+import com.android.systemui.cm.UserContentObserver;
+
+import cyanogenmod.providers.CMSettings;
+
+public class MediaExpandableNotificationRow extends ExpandableNotificationRow {
+
+    private static final String TAG = MediaExpandableNotificationRow.class.getSimpleName();
+    public static final boolean DEBUG = false;
+
+    public static final int MAX_QUEUE_ENTRIES = 3;
+
+    private QueueView mQueue;
+
+    private int mMaxQueueHeight;
+    private int mRowHeight;
+    private int mShadowHeight;
+    private int mDisplayedRows;
+
+    private SettingsObserver mSettingsObserver;
+    private boolean mQueueEnabled;
+
+    public MediaExpandableNotificationRow(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mSettingsObserver = new SettingsObserver(new Handler());
+        mQueueEnabled = isQueueEnabled(context);
+
+        Resources res = mContext.getResources();
+
+        // 3 * queue_row_height + shadow height
+        mRowHeight = res.getDimensionPixelSize(R.dimen.queue_row_height);
+        mShadowHeight = res.getDimensionPixelSize(R.dimen.queue_top_shadow);
+    }
+
+    public boolean inflateGuts() {
+        if (getGuts() == null) {
+            mGutsStub.inflate();
+        }
+        if (!mQueueEnabled) {
+            return true;
+        }
+        return !mQueue.isUserSelectingRow();
+    }
+
+    @Override
+    protected void updateMaxHeights() {
+        // update queue height based on number of rows
+        int rows = mQueue != null ? mQueue.getCurrentQueueRowCount() : 0;
+        if (rows != mDisplayedRows) {
+            mMaxQueueHeight = rows * mRowHeight;
+            if (mMaxQueueHeight > 0) {
+                mMaxQueueHeight += mShadowHeight;
+            }
+            mDisplayedRows = rows;
+        }
+
+        int intrinsicBefore = getIntrinsicHeight();
+        View expandedChild = mPrivateLayout.getExpandedChild();
+        if (expandedChild == null) {
+            expandedChild = mPrivateLayout.getContractedChild();
+        }
+        mMaxExpandHeight = expandedChild.getHeight() + mMaxQueueHeight;
+
+        View headsUpChild = mPrivateLayout.getHeadsUpChild();
+        if (headsUpChild == null) {
+            headsUpChild = mPrivateLayout.getContractedChild();
+        }
+        mHeadsUpHeight = headsUpChild.getHeight();
+        if (intrinsicBefore != getIntrinsicHeight()) {
+            notifyHeightChanged(false /* needsAnimation */);
+        }
+        invalidateOutline();
+    }
+
+    @Override
+    public int getIntrinsicHeight() {
+        if (getGuts() != null && getGuts().isShown()) {
+            return getGuts().getActualHeight();
+        }
+        if (!mQueueEnabled) {
+            return super.getIntrinsicHeight();
+        }
+        if (mHideSensitiveForIntrinsicHeight) {
+            return getMinHeight();
+        }
+        if (isUserLocked()) {
+            return getActualHeight();
+        }
+        boolean inExpansionState = isExpanded();
+        if (!inExpansionState) {
+            // not expanded, so we return the collapsed size
+            return getMinHeight();
+        }
+        return getMaxContentHeight();
+    }
+
+    @Override
+    public int getMaxContentHeight() {
+        /**
+         * calls into NotificationContentView.getMaxHeight()
+         */
+        return getShowingLayout().getMaxHeight() + mMaxQueueHeight;
+    }
+
+    @Override
+    public void setHeightRange(int rowMinHeight, int rowMaxHeight) {
+        super.setHeightRange(rowMinHeight, rowMaxHeight);
+        mMaxViewHeight = Math.max(rowMaxHeight, getMaxContentHeight());
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mQueue = (QueueView) findViewById(R.id.queue_view);
+        mQueue.setQueueEnabled(mQueueEnabled);
+        mQueue.setVisibility(mQueueEnabled ? View.VISIBLE : View.GONE);
+    }
+
+    public void setMediaController(MediaController mediaController) {
+        if (DEBUG) Log.d(TAG, "setMediaController() called with "
+                + "mediaController = [" + mediaController + "]");
+        if (mQueue.setController(mediaController) && mQueueEnabled) {
+            notifyHeightChanged(true);
+        }
+    }
+
+    @Override
+    public boolean dispatchGenericMotionEvent(MotionEvent ev) {
+        if (filterMotionEvent(ev)) {
+            return super.dispatchGenericMotionEvent(ev);
+        }
+        return false;
+    }
+
+    @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        if (filterMotionEvent(ev)) {
+            return super.dispatchTouchEvent(ev);
+        }
+        return false;
+    }
+
+    @Override
+    protected boolean filterMotionEvent(MotionEvent event) {
+        if (!mQueueEnabled) {
+            return super.filterMotionEvent(event);
+        }
+        if (isExpanded() && mQueue.isUserSelectingRow()
+                && event.getActionMasked() != MotionEvent.ACTION_DOWN
+                && event.getActionMasked() != MotionEvent.ACTION_UP
+                && event.getActionMasked() != MotionEvent.ACTION_CANCEL) {
+            // this is for hotspot propogation?
+            return false;
+        }
+        return super.filterMotionEvent(event);
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        mSettingsObserver.observe();
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mSettingsObserver.unobserve();
+    }
+
+    private class SettingsObserver extends UserContentObserver {
+
+        public SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        @Override
+        protected void observe() {
+            super.observe();
+            mContext.getContentResolver().registerContentObserver(
+                    CMSettings.System.getUriFor(CMSettings.System.NOTIFICATION_PLAY_QUEUE),
+                    true, this);
+        }
+
+        @Override
+        protected void unobserve() {
+            super.unobserve();
+            mContext.getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        protected void update() {
+            mQueueEnabled = isQueueEnabled(mContext);
+            mQueue.setQueueEnabled(mQueueEnabled);
+            mQueue.setVisibility(mQueueEnabled ? View.VISIBLE : View.GONE);
+            requestLayout();
+        }
+    }
+
+    public static boolean isQueueEnabled(Context context) {
+        return CMSettings.System.getInt(context.getContentResolver(),
+                CMSettings.System.NOTIFICATION_PLAY_QUEUE, 1) == 1;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/MediaNotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/MediaNotificationGuts.java
new file mode 100644
index 0000000..14ce8e1
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/MediaNotificationGuts.java
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod 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.statusbar;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CompoundButton;
+import android.widget.Switch;
+import android.widget.TextView;
+import com.android.systemui.R;
+import cyanogenmod.providers.CMSettings;
+
+/**
+ * The guts of a media notification revealed when performing a long press.
+ */
+public class MediaNotificationGuts extends NotificationGuts {
+
+    private static final String TAG = MediaNotificationGuts.class.getSimpleName();
+
+    private ViewGroup mQueueGroup;
+    private TextView mText;
+    private Switch mSwitch;
+
+    public MediaNotificationGuts(Context context, AttributeSet attrs) {
+        super(context, attrs);
+
+        setWillNotDraw(true);
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        // do nothing!
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mQueueGroup = (ViewGroup) findViewById(R.id.queue_group);
+        mSwitch = (Switch) findViewById(R.id.queue_switch);
+        mSwitch.setChecked(MediaExpandableNotificationRow.isQueueEnabled(getContext()));
+        mText = (TextView) findViewById(R.id.switch_label);
+        mText.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mSwitch.toggle();
+            }
+        });
+        mSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                buttonView.setChecked(isChecked);
+                CMSettings.System.putInt(getContext().getContentResolver(),
+                        CMSettings.System.NOTIFICATION_PLAY_QUEUE,
+                        isChecked ? 1 : 0);
+            }
+        });
+    }
+
+
+    @Override
+    public void setActualHeight(int actualHeight) {
+        super.setActualHeight(actualHeight);
+    }
+
+    @Override
+    public int getActualHeight() {
+        return getHeight();
+    }
+
+    @Override
+    public boolean hasOverlappingRendering() {
+
+        // Prevents this view from creating a layer when alpha is animating.
+        return false;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
index 46e0bf8..23912c4 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationGuts.java
@@ -28,9 +28,9 @@ import com.android.systemui.R;
  */
 public class NotificationGuts extends FrameLayout {
 
-    private Drawable mBackground;
-    private int mClipTopAmount;
-    private int mActualHeight;
+    protected Drawable mBackground;
+    protected int mClipTopAmount;
+    protected int mActualHeight;
 
     public NotificationGuts(Context context, AttributeSet attrs) {
         super(context, attrs);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/QueueView.java b/packages/SystemUI/src/com/android/systemui/statusbar/QueueView.java
new file mode 100644
index 0000000..1da2e5e
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/QueueView.java
@@ -0,0 +1,254 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod 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.statusbar;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+import android.content.Context;
+import android.media.MediaDescription;
+import android.media.MediaMetadata;
+import android.media.session.MediaController;
+import android.media.session.MediaSession;
+import android.media.session.PlaybackState;
+import android.os.Handler;
+import android.provider.Settings;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.ListView;
+import com.android.systemui.R;
+import com.android.systemui.cm.UserContentObserver;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class QueueView extends LinearLayout implements
+        QueueViewRow.UserRowInteractionListener, AdapterView.OnItemClickListener,
+        AdapterView.OnItemLongClickListener {
+
+    private static final String TAG = QueueView.class.getSimpleName();
+    private static final boolean DEBUG = MediaExpandableNotificationRow.DEBUG;
+
+    private MediaController mController;
+
+    private List<MediaSession.QueueItem> mQueue = new ArrayList<>(getMaxQueueRowCount());
+
+    private QueueItemAdapter mAdapter;
+    private ListView mList;
+    private boolean mQueueEnabled;
+
+    long mLastUserInteraction = -1;
+
+    private MediaController.Callback mCallback = new MediaController.Callback() {
+        @Override
+        public void onPlaybackStateChanged(@NonNull PlaybackState state) {
+            super.onPlaybackStateChanged(state);
+
+            if (getParent() != null && updateQueue(mController.getQueue())) {
+                getParent().requestLayout();
+            }
+        }
+
+        @Override
+        public void onSessionDestroyed() {
+            if (DEBUG) Log.d(TAG, "onSessionDestroyed() called with " + "");
+            super.onSessionDestroyed();
+            setController(null);
+        }
+    };
+
+    public QueueView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        mAdapter = new QueueItemAdapter(context);
+        setClipToOutline(false);
+        setClipToPadding(false);
+    }
+
+    public void setQueueEnabled(boolean enabled) {
+        mQueueEnabled = enabled;
+        mAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mList = (ListView) findViewById(R.id.queue_list);
+        mList.setItemsCanFocus(true);
+        mList.setDrawSelectorOnTop(true);
+        mList.setChoiceMode(ListView.CHOICE_MODE_SINGLE);
+        mList.setAdapter(mAdapter);
+        mList.setOnItemLongClickListener(this);
+        mList.setOnItemClickListener(this);
+        mList.setVerticalScrollBarEnabled(false);
+    }
+
+    private class QueueItemAdapter extends ArrayAdapter<MediaSession.QueueItem> {
+
+        public QueueItemAdapter(Context context) {
+            super(context, R.layout.queue_adapter_row, mQueue);
+        }
+
+        @Override
+        public boolean hasStableIds() {
+            return true;
+        }
+
+        @Override
+        public long getItemId(int position) {
+            if (position > getCount() - 1) {
+                return -1;
+            }
+            return getItem(position).getQueueId();
+        }
+
+        @Override
+        public View getView(int position, View convertView, ViewGroup parent) {
+            final MediaSession.QueueItem queueItem = getItem(position);
+
+            if (convertView == null) {
+                convertView = LayoutInflater.from(parent.getContext())
+                        .inflate(R.layout.queue_adapter_row, parent, false);
+            }
+
+            QueueViewRow row = (QueueViewRow) convertView;
+            row.setHotSpotChangeListener(QueueView.this);
+
+            row.setQueueItem(queueItem);
+
+            return convertView;
+        }
+
+        @Override
+        public int getCount() {
+            if (!mQueueEnabled) {
+                return 0;
+            }
+            return super.getCount();
+        }
+    }
+
+    public boolean isUserSelectingRow() {
+        final long delta = System.currentTimeMillis() - mLastUserInteraction;
+        if (DEBUG) Log.i(TAG, "isUserSelectingRow() delta=" + delta);
+
+        if (mLastUserInteraction > 0 && delta < 500) {
+            if (DEBUG) Log.w(TAG, "user selecting row bc of hotspot change.");
+            return true;
+        }
+
+        return false;
+    }
+
+    public int getMaxQueueRowCount() {
+        return MediaExpandableNotificationRow.MAX_QUEUE_ENTRIES;
+    }
+
+    public int getCurrentQueueRowCount() {
+        if (mAdapter == null) {
+            return 0;
+        }
+        return mAdapter.getCount();
+    }
+
+    @Override
+    public void onHotSpotChanged(float x, float y) {
+        mLastUserInteraction = System.currentTimeMillis();
+    }
+
+    @Override
+    public void onDrawableStateChanged() {
+        mLastUserInteraction = System.currentTimeMillis();
+    }
+
+    /**
+     * @param queue
+     * @return whether the queue size has changed
+     */
+    public boolean updateQueue(List<MediaSession.QueueItem> queue) {
+        int queueSizeBefore = mAdapter.getCount();
+
+        mQueue.clear();
+
+        if (queue != null) {
+            // add everything *after* the currently playing item
+            boolean foundNowPlaying = false;
+
+            final PlaybackState playbackState = mController.getPlaybackState();
+
+            long activeQueueId = -1;
+            if (playbackState != null) {
+                activeQueueId = playbackState.getActiveQueueItemId();
+            }
+
+            for (int i = 0; i < queue.size() && mQueue.size() < getMaxQueueRowCount(); i++) {
+                final MediaSession.QueueItem item = queue.get(i);
+                if (!foundNowPlaying
+                        && activeQueueId != -1
+                        && activeQueueId == item.getQueueId()) {
+                    foundNowPlaying = true;
+                    continue;
+                }
+                if (foundNowPlaying) {
+                    mQueue.add(item);
+                }
+            }
+
+            // add everything
+            if (!foundNowPlaying) {
+                for(int i = 0; i < getMaxQueueRowCount() && i < queue.size(); i++) {
+                    mQueue.add(queue.get(i));
+                }
+            }
+        }
+        mAdapter.notifyDataSetChanged();
+
+        return mAdapter.getCount() != queueSizeBefore;
+    }
+
+    public boolean setController(MediaController controller) {
+        if (mController != null) {
+            mController.unregisterCallback(mCallback);
+        }
+        mController = controller;
+        if (mController != null) {
+            mController.registerCallback(mCallback);
+        }
+
+        return updateQueue(mController != null
+                ? mController.getQueue() : null);
+    }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        final MediaSession.QueueItem itemAtPosition = (MediaSession.QueueItem)
+                parent.getItemAtPosition(position);
+        if (itemAtPosition != null && mController != null) {
+            mController.getTransportControls().skipToQueueItem(itemAtPosition.getQueueId());
+        }
+        mAdapter.notifyDataSetChanged();
+    }
+
+    @Override
+    public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+        return true;
+    }
+
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/QueueViewRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/QueueViewRow.java
new file mode 100644
index 0000000..dab89ff
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/QueueViewRow.java
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2015 The CyanogenMod 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.statusbar;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.media.MediaDescription;
+import android.media.session.MediaSession;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+import com.android.systemui.R;
+
+public class QueueViewRow extends RelativeLayout {
+
+    private static final String TAG = QueueViewRow.class.getSimpleName();
+
+    private UserRowInteractionListener mHotSpotChangeListener;
+
+    private ImageView mArt;
+    private TextView mTitle;
+    private TextView mSummary;
+
+    public QueueViewRow(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+        mArt = (ImageView) findViewById(R.id.art);
+        mTitle = (TextView) findViewById(R.id.title);
+        mSummary = (TextView) findViewById(R.id.summary);
+    }
+
+    @Override
+    protected void drawableStateChanged() {
+        super.drawableStateChanged();
+        if (mHotSpotChangeListener != null) {
+            mHotSpotChangeListener.onDrawableStateChanged();
+        }
+    }
+
+    @Override
+    public void dispatchDrawableHotspotChanged(float x, float y) {
+        super.dispatchDrawableHotspotChanged(x, y);
+        if (mHotSpotChangeListener != null) {
+            mHotSpotChangeListener.onHotSpotChanged(x, y);
+        }
+    }
+
+    public void setHotSpotChangeListener(UserRowInteractionListener listener) {
+        mHotSpotChangeListener = listener;
+    }
+
+    public TextView getTitle() {
+        return mTitle;
+    }
+
+    public TextView getSummary() {
+        return mSummary;
+    }
+
+    public void setQueueItem(MediaSession.QueueItem queueItem) {
+        setTag(queueItem);
+
+        MediaDescription metadata = queueItem.getDescription();
+
+        final Bitmap bitmap = metadata.getIconBitmap();
+        mArt.setImageBitmap(bitmap);
+        mArt.setVisibility(bitmap != null ? View.VISIBLE : View.GONE);
+
+        mTitle.setText(metadata.getTitle());
+        mSummary.setText(metadata.getSubtitle());
+    }
+
+    /* package */ interface UserRowInteractionListener {
+        public void onHotSpotChanged(float x, float y);
+        public void onDrawableStateChanged();
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/VisualizerView.java b/packages/SystemUI/src/com/android/systemui/statusbar/VisualizerView.java
index 40e4330..538140c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/VisualizerView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/VisualizerView.java
@@ -32,11 +32,9 @@ import android.util.Log;
 import android.view.View;
 
 import com.android.systemui.cm.UserContentObserver;
-import com.android.systemui.statusbar.policy.KeyguardMonitor;
 import cyanogenmod.providers.CMSettings;
 
-public class VisualizerView extends View implements Palette.PaletteAsyncListener,
-        KeyguardMonitor.Callback {
+public class VisualizerView extends View implements Palette.PaletteAsyncListener {
 
     private static final String TAG = VisualizerView.class.getSimpleName();
     private static final boolean DEBUG = false;
@@ -48,6 +46,7 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
     private ValueAnimator[] mValueAnimators;
     private float[] mFFTPoints;
 
+    private int mStatusBarState;
     private boolean mVisualizerEnabled = false;
     private boolean mVisible = false;
     private boolean mPlaying = false;
@@ -59,7 +58,6 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
     private int mColor;
     private Bitmap mCurrentBitmap;
 
-    private KeyguardMonitor mKeyguardMonitor;
     private SettingsObserver mObserver;
 
     private Visualizer.OnDataCaptureListener mVisualizerListener =
@@ -114,6 +112,13 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
         }
     };
 
+    private final Runnable mAsyncUnlinkVisualizer = new Runnable() {
+        @Override
+        public void run() {
+            AsyncTask.execute(mUnlinkVisualizer);
+        }
+    };
+
     private final Runnable mUnlinkVisualizer = new Runnable() {
         @Override
         public void run() {
@@ -164,23 +169,19 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
         this(context, null, 0);
     }
 
-    @Override
-    public void onKeyguardChanged() {
-        updateViewVisibility();
-    }
-
     private void updateViewVisibility() {
-        setVisibility(mKeyguardMonitor != null && mKeyguardMonitor.isShowing()
-                && mVisualizerEnabled ? View.VISIBLE : View.GONE);
-        checkStateChanged();
+        final int curVis = getVisibility();
+        final int newVis = mStatusBarState != StatusBarState.SHADE
+                && mVisualizerEnabled ? View.VISIBLE : View.GONE;
+        if (curVis != newVis) {
+            setVisibility(newVis);
+            checkStateChanged();
+        }
     }
 
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        if (mKeyguardMonitor != null) {
-            mKeyguardMonitor.addCallback(this);
-        }
         mObserver = new SettingsObserver(new Handler());
         mObserver.observe();
         mObserver.update();
@@ -189,23 +190,12 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
     @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
-        if (mKeyguardMonitor != null) {
-            mKeyguardMonitor.removeCallback(this);
-        }
         mObserver.unobserve();
         mObserver = null;
         mCurrentBitmap = null;
     }
 
     @Override
-    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-
-        final int size = Math.min(getMeasuredWidth(), getMeasuredHeight());
-        setMeasuredDimension(size, size);
-    }
-
-    @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
 
@@ -223,7 +213,7 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
 
     @Override
     public boolean hasOverlappingRendering() {
-        return mVisualizerEnabled && mDisplaying;
+        return false;
     }
 
     @Override
@@ -235,16 +225,6 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
         }
     }
 
-    public void setKeyguardMonitor(KeyguardMonitor kgm) {
-        mKeyguardMonitor = kgm;
-        if (isAttachedToWindow()) {
-            // otherwise we might never register ourselves
-            mKeyguardMonitor.removeCallback(this);
-            mKeyguardMonitor.addCallback(this);
-            updateViewVisibility();
-        }
-    }
-
     public void setVisible(boolean visible) {
         if (mVisible != visible) {
             if (DEBUG) {
@@ -295,6 +275,13 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
         }
     }
 
+    public void setStatusBarState(int statusBarState) {
+        if (mStatusBarState != statusBarState) {
+            mStatusBarState = statusBarState;
+            updateViewVisibility();
+        }
+    }
+
     public void setBitmap(Bitmap bitmap) {
         if (mCurrentBitmap == bitmap) {
             return;
@@ -365,13 +352,12 @@ public class VisualizerView extends View implements Palette.PaletteAsyncListener
                 if (mVisible) {
                     animate()
                             .alpha(0f)
-                            .withEndAction(mUnlinkVisualizer)
+                            .withEndAction(mAsyncUnlinkVisualizer)
                             .setDuration(600);
                 } else {
-                    AsyncTask.execute(mUnlinkVisualizer);
                     animate().
                             alpha(0f)
-                            .withEndAction(null)
+                            .withEndAction(mAsyncUnlinkVisualizer)
                             .setDuration(0);
                 }
             }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java
index 60ebfdf..e1a345f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardAffordanceHelper.java
@@ -49,7 +49,7 @@ public class KeyguardAffordanceHelper {
     private VelocityTracker mVelocityTracker;
     private boolean mSwipingInProgress;
     private float mInitialTouchX;
-    private float mInitialTouchY;
+    private float mInitialTouchYRaw;
     private float mTranslation;
     private float mTranslationOnDown;
     private int mTouchSlop;
@@ -128,7 +128,7 @@ public class KeyguardAffordanceHelper {
         if (mMotionCancelled && action != MotionEvent.ACTION_DOWN) {
             return false;
         }
-        final float y = event.getY();
+        final float y = event.getRawY();
         final float x = event.getX();
 
         boolean isUp = false;
@@ -146,7 +146,7 @@ public class KeyguardAffordanceHelper {
                 }
                 startSwiping(targetView);
                 mInitialTouchX = x;
-                mInitialTouchY = y;
+                mInitialTouchYRaw = y;
                 mTranslationOnDown = mTranslation;
                 initVelocityTracker();
                 trackMovement(event);
@@ -159,7 +159,7 @@ public class KeyguardAffordanceHelper {
             case MotionEvent.ACTION_MOVE:
                 trackMovement(event);
                 float xDist = x - mInitialTouchX;
-                float yDist = y - mInitialTouchY;
+                float yDist = y - mInitialTouchYRaw;
                 float distance = (float) Math.hypot(xDist, yDist);
                 if (!mTouchSlopExeeded && distance > mTouchSlop) {
                     mTouchSlopExeeded = true;
@@ -211,8 +211,9 @@ public class KeyguardAffordanceHelper {
     }
 
     private boolean isOnIcon(View icon, float x, float y) {
+        int[] location = icon.getLocationOnScreen();
         float iconX = icon.getX() + icon.getWidth() / 2.0f;
-        float iconY = icon.getY() + icon.getHeight() / 2.0f;
+        float iconY = location[1] + icon.getHeight() / 2.0f;
         double distance = Math.hypot(x - iconX, y - iconY);
         return distance <= mTouchTargetSize / 2;
     }
@@ -241,6 +242,13 @@ public class KeyguardAffordanceHelper {
         return false;
     }
 
+    public boolean isOnLockIcon(MotionEvent event) {
+        final float x = event.getX();
+        final float y = event.getRawY();
+
+        return isOnIcon(mCenterIcon, x, y);
+    }
+
     public void startHintAnimation(boolean right,
             Runnable onFinishedListener) {
         cancelAnimation();
@@ -488,7 +496,7 @@ public class KeyguardAffordanceHelper {
         float aX = mVelocityTracker.getXVelocity();
         float aY = mVelocityTracker.getYVelocity();
         float bX = lastX - mInitialTouchX;
-        float bY = lastY - mInitialTouchY;
+        float bY = lastY - mInitialTouchYRaw;
         float bLen = (float) Math.hypot(bX, bY);
         // Project the velocity onto the distance vector: a * b / |b|
         float projectedVelocity = (aX * bX + aY * bY) / bLen;
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 d95a46a..b244e26 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -29,14 +29,10 @@ import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
-import android.hardware.fingerprint.FingerprintManager;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
+import android.graphics.PixelFormat;
 import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.hardware.fingerprint.FingerprintManager;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.IBinder;
@@ -50,8 +46,11 @@ import android.telecom.TelecomManager;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.WindowManager;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
@@ -73,6 +72,8 @@ import com.android.systemui.statusbar.policy.AccessibilityController;
 import com.android.systemui.statusbar.policy.FlashlightController;
 import com.android.systemui.statusbar.policy.PreviewInflater;
 
+import java.util.Objects;
+
 import static android.view.accessibility.AccessibilityNodeInfo.ACTION_CLICK;
 import static android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction;
 
@@ -89,6 +90,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
     public static final String CAMERA_LAUNCH_SOURCE_AFFORDANCE = "lockscreen_affordance";
     public static final String CAMERA_LAUNCH_SOURCE_WIGGLE = "wiggle_gesture";
     public static final String CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP = "power_double_tap";
+    public static final String CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE = "screen_gesture";
 
     public static final String EXTRA_CAMERA_LAUNCH_SOURCE
             = "com.android.systemui.camera_launch_source";
@@ -126,6 +128,13 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
     private boolean mUserSetupComplete;
     private boolean mPrewarmBound;
     private Messenger mPrewarmMessenger;
+    private final WindowManager mWindowManager;
+    private boolean mBottomAreaAttached;
+    private final WindowManager.LayoutParams mWindowLayoutParams;
+    private OnInterceptTouchEventListener mInterceptTouchListener;
+    private BroadcastReceiver mDevicePolicyReceiver;
+    private Intent mLastCameraIntent;
+
     private final ServiceConnection mPrewarmConnection = new ServiceConnection() {
 
         @Override
@@ -139,6 +148,48 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
         }
     };
 
+    @Override
+    public void setVisibility(int visibility) {
+        if (visibility == View.VISIBLE) {
+            if (!mBottomAreaAttached) {
+                addKeyguardBottomArea(false);
+            }
+        } else if (mBottomAreaAttached) {
+            removeKeyguardBottomArea();
+        }
+        super.setVisibility(visibility);
+    }
+
+    public void expand(boolean expand) {
+        addKeyguardBottomArea(expand);
+    }
+
+    private void addKeyguardBottomArea(boolean fullyExpand) {
+        mWindowLayoutParams.height = fullyExpand ? WindowManager.LayoutParams.MATCH_PARENT :
+                WindowManager.LayoutParams.WRAP_CONTENT;
+        if (!mBottomAreaAttached) {
+            try {
+                mWindowManager.addView(this, mWindowLayoutParams);
+            } catch (IllegalStateException e) {
+                Log.e(TAG, e.getMessage());
+            }
+            mBottomAreaAttached = true;
+        } else {
+            mWindowManager.updateViewLayout(this, mWindowLayoutParams);
+        }
+    }
+
+    private void removeKeyguardBottomArea() {
+        if (mBottomAreaAttached) {
+            try {
+                mWindowManager.removeView(this);
+            } catch (IllegalArgumentException e) {
+                Log.e(TAG, e.getMessage());
+            }
+            mBottomAreaAttached = false;
+        }
+    }
+
     private AssistManager mAssistManager;
 
     public KeyguardBottomAreaView(Context context) {
@@ -161,6 +212,20 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
         ColorMatrix cm = new ColorMatrix();
         cm.setSaturation(0);
         mGrayScaleFilter = new ColorMatrixColorFilter(cm);
+        mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+
+        mWindowLayoutParams = new WindowManager.LayoutParams();
+        mWindowLayoutParams.type = WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL;
+        mWindowLayoutParams.flags = WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL |
+                WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN |
+                WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+        mWindowLayoutParams.privateFlags =
+                WindowManager.LayoutParams.PRIVATE_FLAG_NO_MOVE_ANIMATION;
+        mWindowLayoutParams.width = WindowManager.LayoutParams.MATCH_PARENT;
+        mWindowLayoutParams.height = WindowManager.LayoutParams.WRAP_CONTENT;
+        mWindowLayoutParams.format = PixelFormat.TRANSPARENT;
+        mWindowLayoutParams.setTitle("KeyguardBottomArea");
+        mWindowLayoutParams.gravity = Gravity.BOTTOM;
     }
 
     private AccessibilityDelegate mAccessibilityDelegate = new AccessibilityDelegate() {
@@ -417,6 +482,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
     private void watchForCameraPolicyChanges() {
         final IntentFilter filter = new IntentFilter();
         filter.addAction(DevicePolicyManager.ACTION_DEVICE_POLICY_MANAGER_STATE_CHANGED);
+        mDevicePolicyReceiver = new DevicePolicyBroadcastReceiver();
         getContext().registerReceiverAsUser(mDevicePolicyReceiver,
                 UserHandle.ALL, filter, null, null);
         KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitorCallback);
@@ -504,7 +570,9 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
 
     public void launchCamera(String source) {
         final Intent intent;
-        if (!mShortcutHelper.isTargetCustom(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT)) {
+        if (source.equals(CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP) ||
+                source.equals(CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE) ||
+                !mShortcutHelper.isTargetCustom(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT)) {
             intent = getCameraIntent();
         } else {
             intent = mShortcutHelper.getIntent(LockscreenShortcutsHelper.Shortcuts.RIGHT_SHORTCUT);
@@ -656,10 +724,19 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
         if (isTargetCustom(Shortcuts.RIGHT_SHORTCUT)) {
             mPreviewContainer.removeView(mCameraPreview);
         } else {
-            mCameraPreview = mPreviewInflater.inflatePreview(getCameraIntent());
+            Intent cameraIntent = getCameraIntent();
+            if (!Objects.equals(cameraIntent, mLastCameraIntent)) {
+                if (mCameraPreview != null) {
+                    mPreviewContainer.removeView(mCameraPreview);
+                }
+                mCameraPreview = mPreviewInflater.inflatePreview(cameraIntent);
+                if (mCameraPreview != null) {
+                    mPreviewContainer.addView(mCameraPreview);
+                }
+            }
+            mLastCameraIntent = cameraIntent;
             if (mCameraPreview != null) {
-                mPreviewContainer.addView(mCameraPreview);
-                mCameraPreview.setVisibility(View.INVISIBLE);
+                mCameraPreview.setVisibility(View.GONE);
             }
         }
     }
@@ -681,7 +758,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
         }
         if (mLeftPreview != null) {
             mPreviewContainer.addView(mLeftPreview);
-            mLeftPreview.setVisibility(View.INVISIBLE);
+            mLeftPreview.setVisibility(View.GONE);
         }
     }
 
@@ -714,7 +791,11 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
                 .setDuration(DOZE_ANIMATION_ELEMENT_DURATION);
     }
 
-    private final BroadcastReceiver mDevicePolicyReceiver = new BroadcastReceiver() {
+    public void cleanup() {
+        removeKeyguardBottomArea();
+    }
+
+    private final class DevicePolicyBroadcastReceiver extends BroadcastReceiver {
         @Override
         public void onReceive(Context context, Intent intent) {
             post(new Runnable() {
@@ -835,11 +916,42 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
     }
 
     @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+        if (mAccessibilityController != null) {
+            mAccessibilityController.addStateChangedCallback(this);
+        }
+        mShortcutHelper.registerAndFetchTargets();
+        updateCustomShortcuts();
+        mUnlockMethodCache.addListener(this);
+        watchForCameraPolicyChanges();
+    }
+
+    @Override
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mAccessibilityController.removeStateChangedCallback(this);
-        mContext.unregisterReceiver(mDevicePolicyReceiver);
+        if (mDevicePolicyReceiver != null) {
+            mContext.unregisterReceiver(mDevicePolicyReceiver);
+            mDevicePolicyReceiver = null;
+        }
         mShortcutHelper.cleanup();
         mUnlockMethodCache.removeListener(this);
     }
+
+    public interface OnInterceptTouchEventListener {
+        boolean onInterceptTouchEvent(MotionEvent e);
+    }
+
+    public void setOnInterceptTouchListener(OnInterceptTouchEventListener listener) {
+        mInterceptTouchListener = listener;
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev) {
+        if (mInterceptTouchListener != null) {
+            return mInterceptTouchListener.onInterceptTouchEvent(ev);
+        }
+        return super.onInterceptTouchEvent(ev);
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
index 65e2096..d992b17 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBouncer.java
@@ -56,6 +56,7 @@ public class KeyguardBouncer {
     private ViewGroup mRoot;
     private boolean mShowingSoon;
     private int mBouncerPromptReason;
+    private PhoneStatusBar mPhoneStatusBar;
     private KeyguardUpdateMonitorCallback mUpdateMonitorCallback =
             new KeyguardUpdateMonitorCallback() {
                 @Override
@@ -66,13 +67,14 @@ public class KeyguardBouncer {
 
     public KeyguardBouncer(Context context, ViewMediatorCallback callback,
             LockPatternUtils lockPatternUtils, StatusBarWindowManager windowManager,
-            ViewGroup container) {
+            ViewGroup container, PhoneStatusBar phoneStatusBar) {
         mContext = context;
         mCallback = callback;
         mLockPatternUtils = lockPatternUtils;
         mContainer = container;
         mWindowManager = windowManager;
         mCmLockPatternUtils = new CmLockPatternUtils(mContext);
+        mPhoneStatusBar = phoneStatusBar;
         KeyguardUpdateMonitor.getInstance(mContext).registerCallback(mUpdateMonitorCallback);
     }
 
@@ -86,7 +88,15 @@ public class KeyguardBouncer {
         if (mRoot.getVisibility() == View.VISIBLE || mShowingSoon) {
             return;
         }
-
+        // ensure external keyguard view does not have focus
+        mPhoneStatusBar.unfocusKeyguardExternalView();
+        mPhoneStatusBar.getScrimController().forceHideScrims(false);
+        // Don't hide bottom area if we are in the middle of a affordance
+        // launch transition, since once the animation is finished, NPV
+        // will take care of setting it invisible.
+        if (!mPhoneStatusBar.mNotificationPanel.isLaunchTransitionRunning()) {
+            mPhoneStatusBar.mKeyguardBottomArea.setVisibility(View.GONE);
+        }
         // Try to dismiss the Keyguard. If no security pattern is set, this will dismiss the whole
         // Keyguard. If we need to authenticate, show the bouncer.
         if (!mKeyguardView.dismiss()) {
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 8e58d14..cf39655 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -61,7 +61,8 @@ public class LockIcon extends KeyguardAffordanceView {
     @Override
     protected void onVisibilityChanged(View changedView, int visibility) {
         super.onVisibilityChanged(changedView, visibility);
-        if (isShown()) {
+        if (isShown() &&
+                KeyguardUpdateMonitor.getInstance(mContext).isDeviceInteractive()) {
             mTrustDrawable.start();
         } else {
             mTrustDrawable.stop();
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavBarInsetLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavBarInsetLayout.java
index e767ca5..2028132 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavBarInsetLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavBarInsetLayout.java
@@ -63,6 +63,7 @@ public class NavBarInsetLayout extends FrameLayout {
 
     public NavBarInsetLayout(Context context, AttributeSet attrs) {
         super(context, attrs);
+        setMotionEventSplittingEnabled(false);
         mTransparentSrcPaint.setColor(0);
         mTransparentSrcPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC));
 
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 aaa7019..e4e02a7 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -18,37 +18,41 @@ package com.android.systemui.statusbar.phone;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
+import android.animation.ArgbEvaluator;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.animation.ValueAnimator;
-import android.content.BroadcastReceiver;
-import android.content.ComponentName;
 import android.content.ContentResolver;
 import android.app.ActivityManager;
 import android.app.StatusBarManager;
 import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.PackageManager;
+import android.content.SharedPreferences;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
+import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.Point;
 import android.graphics.Rect;
 import android.net.Uri;
 import android.os.Handler;
 import android.os.PowerManager;
+import android.os.RemoteException;
+import android.preference.PreferenceManager;
 import android.util.AttributeSet;
 import android.util.MathUtils;
+import android.view.Display;
 import android.view.GestureDetector;
 import android.view.MotionEvent;
 import android.view.VelocityTracker;
 import android.view.View;
-import android.view.ViewGroup;
+import android.view.ViewConfiguration;
 import android.view.ViewTreeObserver;
 import android.view.WindowInsets;
+import android.view.WindowManager;
+import android.view.WindowManagerGlobal;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AnimationUtils;
 import android.view.animation.Interpolator;
@@ -62,6 +66,7 @@ import com.android.systemui.DejankUtils;
 import com.android.systemui.EventLogConstants;
 import com.android.systemui.EventLogTags;
 import com.android.systemui.R;
+import com.android.systemui.SwipeHelper;
 import com.android.systemui.qs.QSContainer;
 import com.android.systemui.qs.QSDragPanel;
 import com.android.systemui.statusbar.ExpandableNotificationRow;
@@ -73,22 +78,22 @@ import com.android.systemui.statusbar.NotificationData;
 import com.android.systemui.statusbar.StatusBarState;
 import com.android.systemui.statusbar.policy.HeadsUpManager;
 import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
+import com.android.systemui.statusbar.policy.LiveLockScreenController;
+import com.android.systemui.statusbar.policy.WeatherController;
+import com.android.systemui.statusbar.policy.WeatherControllerImpl;
 import com.android.systemui.statusbar.stack.NotificationStackScrollLayout;
 import com.android.systemui.statusbar.stack.StackStateAnimator;
 
-import cyanogenmod.externalviews.KeyguardExternalView;
 import cyanogenmod.providers.CMSettings;
+import cyanogenmod.weather.util.WeatherUtils;
 
 import java.util.List;
-import java.util.Objects;
-
-import org.cyanogenmod.internal.util.CmLockPatternUtils;
 
 public class NotificationPanelView extends PanelView implements
         ExpandableView.OnHeightChangedListener, ObservableScrollView.Listener,
         View.OnClickListener, NotificationStackScrollLayout.OnOverscrollTopChangedListener,
         KeyguardAffordanceHelper.Callback, NotificationStackScrollLayout.OnEmptySpaceClickListener,
-        HeadsUpManager.OnHeadsUpChangedListener {
+        HeadsUpManager.OnHeadsUpChangedListener, WeatherController.Callback {
 
     private static final boolean DEBUG = false;
 
@@ -106,13 +111,19 @@ public class NotificationPanelView extends PanelView implements
 
     private static final Rect mDummyDirtyRect = new Rect(0, 0, 1, 1);
 
-    public static final long DOZE_ANIMATION_DURATION = 700;
+    private static final long SLIDE_PANEL_IN_ANIMATION_DURATION = 300;
 
+    private static final String KEY_USER_EXPANDED_NOTIFICATIONS_IN_KEYGUARD =
+            "user_expanded_notifications_in_keyguard";
+    private static final String KEY_USER_INTERACTED_WITH_LLS =
+            "user_interacted_with_lls";
+    private static final String KEY_USER_UNLOCKED =
+            "user_unlocked";
+    private static final String KEY_USER_RETURNED_FROM_LLS =
+            "user_returned_from_lls";
+
+    public static final long DOZE_ANIMATION_DURATION = 700;
 
-    // Layout params for external keyguard view
-    private static final FrameLayout.LayoutParams EXTERNAL_KEYGUARD_VIEW_PARAMS =
-            new LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT);
 
     private KeyguardAffordanceHelper mAfforanceHelper;
     private StatusBarHeaderView mHeader;
@@ -229,11 +240,6 @@ public class NotificationPanelView extends PanelView implements
     private boolean mLaunchingAffordance;
     private String mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_AFFORDANCE;
 
-    private ComponentName mThirdPartyKeyguardViewComponent;
-    private KeyguardExternalView mKeyguardExternalView;
-    private CmLockPatternUtils mLockPatternUtils;
-    private boolean mLiveLockScreenEnabled;
-
     private Runnable mHeadsUpExistenceChangedRunnable = new Runnable() {
         @Override
         public void run() {
@@ -254,6 +260,107 @@ public class NotificationPanelView extends PanelView implements
     private int mStatusBarHeaderHeight;
     private GestureDetector mDoubleTapGesture;
 
+    // Used to identify whether showUnlock() can dismiss the keyguard
+    // or not.
+    // TODO - add a new state to make it easier to identify keyguard vs
+    // LiveLockscreen
+    public boolean mCanDismissKeyguard;
+
+    // Used to track which direction the user is currently
+    // interacting with and ensure they don't alternate back
+    // and forth. Reset every MOTION_UP/MOTION_CANCEL
+    private SwipeLockedDirection mLockedDirection;
+
+    private SwipeHelper mSwipeHelper;
+    private final int mMinimumFlingVelocity;
+    private final int mScreenHeight;
+    private LiveLockScreenController mLiveLockscreenController;
+    private final GestureDetector mGestureDetector;
+    private ViewLinker mViewLinker;
+    private final UnlockMethodCache mUnlockMethodCache;
+    private boolean mDetailScrollLock;
+
+    private boolean mKeyguardWeatherEnabled;
+    private TextView mKeyguardWeatherInfo;
+    private WeatherControllerImpl mWeatherController;
+
+    // Keep track of common user interactions on the lock screen
+    private boolean mUserUnlocked;
+    private boolean mUserExpandedNotifications;
+    private boolean mUserInteractedWithLiveLockScreen;
+    private boolean mUserReturnedFromLiveLockScreen;
+
+    private boolean mScreenOnHintsEnabled;
+
+    private enum SwipeLockedDirection {
+        UNKNOWN,
+        HORIZONTAL,
+        VERTICAL
+    }
+
+    // Handles swiping to the LiveLockscreen from keyguard
+    SwipeHelper.SimpleCallback mSwipeCallback = new SwipeHelper.SimpleCallback() {
+        @Override
+        public View getChildAtPosition(MotionEvent ev) {
+            return mViewLinker.getParent();
+        }
+
+        @Override
+        public View getChildContentView(View v) {
+            return mViewLinker.getParent();
+        }
+
+        @Override
+        public boolean canChildBeDismissed(View v) {
+            return true;
+        }
+
+        @Override
+        public void onChildDismissed(View v) {
+            mCanDismissKeyguard = false;
+            mStatusBar.focusKeyguardExternalView();
+            mLiveLockscreenController.onLiveLockScreenFocusChanged(true /* hasFocus */);
+            if (!mUserInteractedWithLiveLockScreen) {
+                mUserInteractedWithLiveLockScreen = true;
+                saveUserInteractedWithLls(true);
+            }
+            if (!mUserReturnedFromLiveLockScreen) {
+                startShowNotificationsHintAnimation();
+            }
+            resetAlphaTranslation();
+            // Enables the left edge gesture to allow user
+            // to return to keyguard
+            try {
+                WindowManagerGlobal.getWindowManagerService()
+                        .setLiveLockscreenEdgeDetector(true);
+            } catch (RemoteException e){
+                e.printStackTrace();
+            }
+        }
+
+        @Override
+        public boolean updateSwipeProgress(View animView, boolean dismissable, float swipeProgress) {
+            // Let live lockscreen know of swipe progress to allow
+            // them to translate content in.
+            mLiveLockscreenController.getLiveLockScreenView()
+                    .onLockscreenSlideOffsetChanged(swipeProgress);
+
+            // Fade out scrim background
+            float alpha = ScrimController.SCRIM_BEHIND_ALPHA_KEYGUARD - (1f - swipeProgress);
+            alpha = Math.max(0, alpha);
+            mStatusBar.getScrimController().setScrimBehindColor(alpha);
+            return false;
+        }
+
+        private void resetAlphaTranslation() {
+            mNotificationStackScroller.setTranslationX(0);
+            mNotificationStackScroller.setAlpha(1f);
+
+            mKeyguardStatusView.setTranslationX(0);
+            mKeyguardStatusView.setAlpha(1f);
+        }
+    };
+
     public NotificationPanelView(Context context, AttributeSet attrs) {
         super(context, attrs);
         setWillNotDraw(!DEBUG);
@@ -268,12 +375,78 @@ public class NotificationPanelView extends PanelView implements
                 return true;
             }
         });
+
+        Resources res = getContext().getResources();
+        final int gradientStart = res.getColor(R.color.live_lockscreen_gradient_start);
+        final int gradientEnd = res.getColor(R.color.live_lockscreen_gradient_end);
+        mGestureDetector = new GestureDetector(getContext(),
+                new GestureDetector.SimpleOnGestureListener() {
+            private float mDown;
+
+            @Override
+            public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
+                // Ensure we only capture swipes in the up direction
+                if (velocityY > 0 || Math.abs(velocityY) <= mMinimumFlingVelocity) {
+                    return false;
+                }
+                mCanDismissKeyguard = true;
+                mStatusBar.showBouncer();
+                return true;
+            }
+
+            @Override
+            public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
+                float delta = mDown - e2.getRawY();
+                delta = Math.max(0, delta);
+                float screenHeightHalf = (float) mScreenHeight / 2f;
+                int color = (Integer) ArgbEvaluator.getInstance()
+                        .evaluate(delta / screenHeightHalf, gradientStart, gradientEnd);
+                mKeyguardBottomArea.setBackgroundColor(color);
+                return super.onScroll(e1, e2, distanceX, distanceY);
+            }
+
+            @Override
+            public boolean onDown(MotionEvent e) {
+                mDown = e.getRawY();
+                mKeyguardBottomArea.expand(true);
+                return true;
+            }
+        });
+
+        mSwipeHelper = new SwipeHelper(SwipeHelper.X,
+                SwipeHelper.SWIPE_ZONE_LEFT, mSwipeCallback, mContext);
+        mSwipeHelper.setSwipeProgressFadeEnd(1.0f);
+        mMinimumFlingVelocity = ViewConfiguration.get(getContext())
+                .getScaledMinimumFlingVelocity();
+
+        WindowManager windowManager = (WindowManager) mContext
+                .getSystemService(Context.WINDOW_SERVICE);
+        Display display = windowManager.getDefaultDisplay();
+        Point point = new Point();
+        display.getSize(point);
+        mScreenHeight = point.y;
+        mUnlockMethodCache = UnlockMethodCache.getInstance(context);
+
+        mScreenOnHintsEnabled = res.getBoolean(R.bool.config_showScreenOnLockScreenHints);
+        mUserUnlocked = getUserUnlocked();
+        mUserExpandedNotifications = getUserExpandedNotificationsInKeyguard();
+        mUserInteractedWithLiveLockScreen = getUserInteractedWithLls();
+        mUserReturnedFromLiveLockScreen = getUserReturnedFromLls();
     }
 
     public void setStatusBar(PhoneStatusBar bar) {
         mStatusBar = bar;
     }
 
+    public void setLiveController(LiveLockScreenController liveController) {
+        mLiveLockscreenController = liveController;
+    }
+
+    public void setWeatherController(WeatherControllerImpl weatherController) {
+        mWeatherController = weatherController;
+        mWeatherController.addCallback(this);
+    }
+
     @Override
     protected void onFinishInflate() {
         super.onFinishInflate();
@@ -283,6 +456,7 @@ public class NotificationPanelView extends PanelView implements
         mKeyguardStatusView = (KeyguardStatusView) findViewById(R.id.keyguard_status_view);
         mQsContainer = (QSContainer) findViewById(R.id.quick_settings_container);
         mQsPanel = (QSDragPanel) findViewById(R.id.quick_settings_panel);
+        mQsPanel.setPanelView(this);
         mClockView = (TextView) findViewById(R.id.clock_view);
         mScrollView = (ObservableScrollView) findViewById(R.id.scroll_view);
         mScrollView.setFocusable(false);
@@ -301,7 +475,64 @@ public class NotificationPanelView extends PanelView implements
                 android.R.interpolator.fast_out_linear_in);
         mDozeAnimationInterpolator = AnimationUtils.loadInterpolator(getContext(),
                 android.R.interpolator.linear_out_slow_in);
-        mKeyguardBottomArea = (KeyguardBottomAreaView) findViewById(R.id.keyguard_bottom_area);
+
+        mViewLinker = new ViewLinker<NotificationStackScrollLayout>(mNotificationStackScroller,
+                new ViewLinker.LinkInfo(mKeyguardStatusBar, ViewLinker.LINK_ALPHA),
+                new ViewLinker.LinkInfo(mKeyguardStatusView, ViewLinker.LINK_ALPHA
+                        | ViewLinker.LINK_TRANSLATION));
+
+        mKeyguardBottomArea = (KeyguardBottomAreaView) View.inflate(getContext(),
+                R.layout.keyguard_bottom_area, null);
+        /** Keyguard bottom area lives in a separate window, and as such,
+         * we must redirect its touch events through the proper flow
+         */
+        mKeyguardBottomArea.setOnInterceptTouchListener(new KeyguardBottomAreaView.OnInterceptTouchEventListener() {
+            @Override
+            public boolean onInterceptTouchEvent(MotionEvent e) {
+                boolean intercept = false;
+                if (mLiveLockscreenController.getLiveLockScreenHasFocus()) {
+                    // Handles swipe up to fade/dismiss when showing
+                    // live lock screen
+                    intercept = mAfforanceHelper.onInterceptTouchEvent(e);
+                    if (!intercept) {
+                        intercept = mGestureDetector.onTouchEvent(e);
+                    }
+                } else {
+                    intercept = NotificationPanelView.this.onInterceptTouchEvent(e);
+                }
+                return intercept;
+            }
+        });
+        mKeyguardBottomArea.setOnTouchListener(new OnTouchListener() {
+            @Override
+            public boolean onTouch(View v, MotionEvent e) {
+                int action = e.getAction();
+
+                boolean isCancelOrUp = action == MotionEvent.ACTION_UP ||
+                        action == MotionEvent.ACTION_CANCEL;
+                if (isCancelOrUp) {
+                    mKeyguardBottomArea.setBackground(null);
+                }
+
+                boolean intercept = false;
+                if (mLiveLockscreenController.getLiveLockScreenHasFocus()) {
+                    intercept = mAfforanceHelper.onTouchEvent(e);
+                    // If the touch did not originate on the affordance helper,
+                    // we must collapse the panel here since we can't rely on
+                    // the swipe callbacks from being invoked.
+                    if (isCancelOrUp && !isAffordanceSwipeInProgress()) {
+                        mKeyguardBottomArea.expand(false);
+                    }
+                    if (!intercept) {
+                        intercept = mGestureDetector.onTouchEvent(e);
+                    }
+                } else {
+                    intercept = NotificationPanelView.this.onTouchEvent(e);
+                }
+                return intercept;
+            }
+        });
+
         mQsNavbarScrim = findViewById(R.id.qs_navbar_scrim);
         mAfforanceHelper = new KeyguardAffordanceHelper(this, getContext());
         mLastOrientation = getResources().getConfiguration().orientation;
@@ -319,19 +550,17 @@ public class NotificationPanelView extends PanelView implements
             }
         });
 
-        mLockPatternUtils = new CmLockPatternUtils(getContext());
-        if (mLockPatternUtils.isThirdPartyKeyguardEnabled() && mLiveLockScreenEnabled) {
-            mThirdPartyKeyguardViewComponent = mLockPatternUtils.getThirdPartyKeyguardComponent();
-        }
+        mKeyguardWeatherInfo = (TextView) mKeyguardStatusView.findViewById(R.id.weather_info);
+    }
+
+    public boolean isAffordanceSwipeInProgress() {
+        return mAfforanceHelper.isSwipingInProgress();
     }
 
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
         mSettingsObserver.observe();
-        mContext.registerReceiver(mExternalKeyguardViewChangedReceiver,
-                new IntentFilter(CmLockPatternUtils.ACTION_THIRD_PARTY_KEYGUARD_COMPONENT_CHANGED));
-
         mScrollView.setListener(this);
     }
 
@@ -339,7 +568,7 @@ public class NotificationPanelView extends PanelView implements
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
         mSettingsObserver.unobserve();
-        mContext.unregisterReceiver(mExternalKeyguardViewChangedReceiver);
+        mWeatherController.removeCallback(this);
     }
 
     @Override
@@ -619,6 +848,10 @@ public class NotificationPanelView extends PanelView implements
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
+        // Reset locked direction
+        mLockedDirection = SwipeLockedDirection.UNKNOWN;
+        mCanDismissKeyguard = true;
+
         if (mBlockTouches) {
             return false;
         }
@@ -640,7 +873,15 @@ public class NotificationPanelView extends PanelView implements
         if (!isFullyCollapsed() && onQsIntercept(event)) {
             return true;
         }
-        return super.onInterceptTouchEvent(event);
+
+        if (isKeyguardInteractiveAndShowing() || mStatusBar.isKeyguardShowingMedia() ||
+                (mUnlockMethodCache.isTrustManaged() && mAfforanceHelper.isOnLockIcon(event))) {
+            return super.onInterceptTouchEvent(event);
+        }
+
+        // We want both, we really do
+        return mSwipeHelper.onInterceptTouchEvent(event)
+                & super.onInterceptTouchEvent(event);
     }
 
     private boolean onQsIntercept(MotionEvent event) {
@@ -795,6 +1036,12 @@ public class NotificationPanelView extends PanelView implements
         if (mBlockTouches) {
             return false;
         }
+
+        int action = event.getActionMasked();
+        if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL) {
+            mKeyguardBottomArea.setBackground(null);
+        }
+
         if (mDoubleTapToSleepEnabled
                 && mStatusBarState == StatusBarState.KEYGUARD
                 && event.getY() < mStatusBarHeaderHeight) {
@@ -808,7 +1055,8 @@ public class NotificationPanelView extends PanelView implements
         }
         if ((!mIsExpanding || mHintAnimationRunning)
                 && !mQsExpanded
-                && mStatusBar.getBarState() != StatusBarState.SHADE) {
+                && (mStatusBar.getBarState() != StatusBarState.SHADE
+                || mLiveLockscreenController.getLiveLockScreenHasFocus())) {
             mAfforanceHelper.onTouchEvent(event);
         }
         if (mOnlyAffordanceInThisMotion) {
@@ -822,10 +1070,39 @@ public class NotificationPanelView extends PanelView implements
             MetricsLogger.count(mContext, COUNTER_PANEL_OPEN, 1);
             updateVerticalPanelPosition(event.getX());
         }
-        super.onTouchEvent(event);
+
+        if (isKeyguardInteractiveAndShowing() || mStatusBar.isKeyguardShowingMedia() ||
+                (mUnlockMethodCache.isTrustManaged() && mAfforanceHelper.isOnLockIcon(event))) {
+            super.onTouchEvent(event);
+            return true;
+        }
+
+        if ((!mIsExpanding || mHintAnimationRunning)
+                && !mQsExpanded
+                && mLockedDirection != SwipeLockedDirection.VERTICAL
+                && mStatusBar.getBarState() != StatusBarState.SHADE) {
+            mSwipeHelper.onTouchEvent(event);
+            if (mSwipeHelper.isDragging()) {
+                mLockedDirection = SwipeLockedDirection.HORIZONTAL;
+            }
+            if (mLockedDirection == SwipeLockedDirection.HORIZONTAL) {
+                requestDisallowInterceptTouchEvent(true);
+                return true;
+            }
+        }
+
+        if (super.onTouchEvent(event)) {
+            mLockedDirection = SwipeLockedDirection.VERTICAL;
+        }
         return true;
     }
 
+    private boolean isKeyguardInteractiveAndShowing() {
+        return mLiveLockscreenController.getLiveLockScreenHasFocus() ||
+                mStatusBar.getBarState() != StatusBarState.KEYGUARD ||
+                !mLiveLockscreenController.isLiveLockScreenInteractive();
+    }
+
     private boolean handleQsTouch(MotionEvent event) {
         final int action = event.getActionMasked();
         if (action == MotionEvent.ACTION_DOWN && getExpandedFraction() == 1f
@@ -857,7 +1134,8 @@ public class NotificationPanelView extends PanelView implements
             mTwoFingerQsExpandPossible = true;
         }
         if (mTwoFingerQsExpandPossible && isOpenQsEvent(event)
-                && event.getY(event.getActionIndex()) < mStatusBarMinHeight) {
+                && event.getY(event.getActionIndex()) < mStatusBarMinHeight
+                && mExpandedHeight <= mQsPeekHeight) {
             MetricsLogger.count(mContext, COUNTER_PANEL_OPEN_QS, 1);
             mQsExpandImmediate = true;
             requestPanelHeightUpdate();
@@ -915,7 +1193,7 @@ public class NotificationPanelView extends PanelView implements
 
     private void handleQsDown(MotionEvent event) {
         if (event.getActionMasked() == MotionEvent.ACTION_DOWN
-                && shouldQuickSettingsIntercept(event.getX(), event.getY(), -1)) {
+                && shouldQuickSettingsIntercept(event.getX(), event.getRawY(), -1)) {
             mQsTracking = true;
             onQsExpansionStarted();
             mInitialHeightOnTouch = mQsExpansionHeight;
@@ -997,8 +1275,13 @@ public class NotificationPanelView extends PanelView implements
                 mTrackingPointer = -1;
                 trackMovement(event);
                 float fraction = getQsExpansionFraction();
-                if ((fraction != 0f || y >= mInitialTouchY)
-                        && (fraction != 1f || y <= mInitialTouchY)) {
+                final boolean fling = (fraction != 0f || y >= mInitialTouchY)
+                        && (fraction != 1f || y <= mInitialTouchY);
+                final boolean flingExpand = Math.abs(getCurrentVelocity())
+                        > mFlingAnimationUtils.getMinVelocityPxPerSecond();
+                final boolean detailFling = mDetailScrollLock && mQsExpanded
+                        && flingExpand;
+                if ((fling && !mDetailScrollLock) || detailFling) {
                     flingQsWithCurrentVelocity(y,
                             event.getActionMasked() == MotionEvent.ACTION_CANCEL);
                 } else {
@@ -1099,9 +1382,17 @@ public class NotificationPanelView extends PanelView implements
 
         mStatusBarState = statusBarState;
         mKeyguardShowing = keyguardShowing;
+        if (oldState != statusBarState && statusBarState == StatusBarState.KEYGUARD) {
+            mCanDismissKeyguard = true;
+        }
 
-        if (goingToFullShade || (oldState == StatusBarState.KEYGUARD
-                && statusBarState == StatusBarState.SHADE_LOCKED)) {
+        boolean keyguardToShadeLocked = oldState == StatusBarState.KEYGUARD
+                && statusBarState == StatusBarState.SHADE_LOCKED;
+        if (goingToFullShade || keyguardToShadeLocked) {
+            if (keyguardToShadeLocked && !mUserExpandedNotifications) {
+                mUserExpandedNotifications = true;
+                saveUserExpandedNotificationsInKeyguard(true);
+            }
             animateKeyguardStatusBarOut();
             animateHeaderSlidingIn();
         } else if (oldState == StatusBarState.SHADE_LOCKED
@@ -1116,26 +1407,14 @@ public class NotificationPanelView extends PanelView implements
                 mAfforanceHelper.updatePreviews();
             }
         }
+        if (oldState != StatusBarState.SHADE && statusBarState == StatusBarState.SHADE &&
+                !mUserUnlocked) {
+            mUserUnlocked = true;
+            saveUserUnlocked(true);
+        }
         if (statusBarState == StatusBarState.KEYGUARD ||
                 statusBarState == StatusBarState.SHADE_LOCKED) {
             updateDozingVisibilities(false /* animate */);
-            if (mThirdPartyKeyguardViewComponent != null) {
-                if (mKeyguardExternalView == null) {
-                    mKeyguardExternalView =
-                            getExternalKeyguardView(mThirdPartyKeyguardViewComponent);
-                    if (mKeyguardExternalView != null) {
-                        mKeyguardExternalView.registerKeyguardExternalViewCallback(
-                                mExternalKeyguardViewCallbacks);
-                    }
-                }
-                if (mKeyguardExternalView != null && !mKeyguardExternalView.isAttachedToWindow()) {
-                    addView(mKeyguardExternalView, 0, EXTERNAL_KEYGUARD_VIEW_PARAMS);
-                }
-            }
-        } else {
-            if (mKeyguardExternalView != null && mKeyguardExternalView.isAttachedToWindow()) {
-                removeView(mKeyguardExternalView);
-            }
         }
         resetVerticalPanelPosition();
         updateQsState();
@@ -1213,82 +1492,6 @@ public class NotificationPanelView extends PanelView implements
         }
     };
 
-    private KeyguardExternalView.KeyguardExternalViewCallbacks mExternalKeyguardViewCallbacks =
-            new KeyguardExternalView.KeyguardExternalViewCallbacks() {
-        @Override
-        public boolean requestDismiss() {
-            if (hasExternalKeyguardView()) {
-                post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mStatusBar.showKeyguard();
-                        mStatusBar.showBouncer();
-                    }
-                });
-                return true;
-            }
-            return false;
-        }
-
-        @Override
-        public boolean requestDismissAndStartActivity(final Intent intent) {
-            if (hasExternalKeyguardView()) {
-                if (hasExternalKeyguardView()) {
-                    post(new Runnable() {
-                        @Override
-                        public void run() {
-                            mStatusBar.showKeyguard();
-                            mStatusBar.startActivityDismissingKeyguard(intent, false, true, true,
-                                    null);
-                        }
-                    });
-                }
-                return true;
-            }
-            return false;
-        }
-
-        @Override
-        public void collapseNotificationPanel() {
-            if (mStatusBar.getBarState() == StatusBarState.KEYGUARD && hasExternalKeyguardView() &&
-                    mKeyguardExternalView.isInteractive()) {
-                post(new Runnable() {
-                    @Override
-                    public void run() {
-                        mStatusBar.focusKeyguardExternalView();
-                    }
-                });
-            }
-        }
-
-        @Override
-        public void providerDied() {
-            mKeyguardExternalView.unregisterKeyguardExternalViewCallback(
-                    mExternalKeyguardViewCallbacks);
-            mKeyguardExternalView = null;
-        }
-    };
-
-    private BroadcastReceiver mExternalKeyguardViewChangedReceiver = new BroadcastReceiver() {
-        @Override
-        public void onReceive(Context context, Intent intent) {
-            String pkgName = getSendingPackage(intent);
-            if (pkgName != null) {
-                PackageManager pm = context.getPackageManager();
-                if (pm.checkPermission(android.Manifest.permission.ACCESS_KEYGUARD_SECURE_STORAGE,
-                        pkgName) != PackageManager.PERMISSION_GRANTED) {
-                    // we should not be here if the sending app does not have the proper permission,
-                    // so do nothing and return.
-                    return;
-                }
-            } else {
-                // null package name?  something is not right so just return and skip doing anything
-                return;
-            }
-            updateExternalKeyguardView();
-        }
-    };
-
     private void animateHeaderSlidingIn() {
         // If the QS is already expanded we don't need to slide in the header as it's already
         // visible.
@@ -1487,8 +1690,7 @@ public class NotificationPanelView extends PanelView implements
         if (mKeyguardShowing) {
             updateHeaderKeyguard();
         }
-        if (mStatusBarState == StatusBarState.SHADE_LOCKED
-                || mStatusBarState == StatusBarState.KEYGUARD) {
+        if (mStatusBarState == StatusBarState.KEYGUARD) {
             updateKeyguardBottomAreaAlpha();
         }
         if (mStatusBarState == StatusBarState.SHADE && mQsExpanded
@@ -1669,7 +1871,8 @@ public class NotificationPanelView extends PanelView implements
                 && y >= header.getTop() && y <= header.getBottom();
 
         if (mQsExpanded) {
-            return onHeader || (mScrollView.isScrolledToBottom() && yDiff < 0) && isInQsArea(x, y);
+            return onHeader || mDetailScrollLock
+                    || (mScrollView.isScrolledToBottom() && yDiff < 0) && isInQsArea(x, y);
         } else {
             return onHeader;
         }
@@ -1759,7 +1962,7 @@ public class NotificationPanelView extends PanelView implements
      */
     private int getTempQsMaxExpansion() {
         int qsTempMaxExpansion = mQsMaxExpansionHeight;
-        if (mScrollYOverride != -1) {
+        if (mScrollYOverride != -1 && !mDetailScrollLock) {
             qsTempMaxExpansion -= mScrollYOverride;
         }
         return qsTempMaxExpansion;
@@ -1926,12 +2129,14 @@ public class NotificationPanelView extends PanelView implements
     }
 
     private void updateHeaderKeyguardAlpha() {
+        if (mSwipeHelper.isDragging()) {
+            return;
+        }
         float alphaQsExpansion = 1 - Math.min(1, getQsExpansionFraction() * 2);
         mKeyguardStatusBar.setAlpha(Math.min(getKeyguardContentsAlpha(), alphaQsExpansion)
                 * mKeyguardStatusBarAnimateAlpha);
         mKeyguardStatusBar.setVisibility(mKeyguardStatusBar.getAlpha() != 0f
                 && !mDozing ? VISIBLE : INVISIBLE);
-        mStatusBar.getVisualizer().setAlpha(mKeyguardStatusBar.getAlpha());
     }
 
     private void updateHeaderKeyguard() {
@@ -1941,6 +2146,9 @@ public class NotificationPanelView extends PanelView implements
 
     private void updateKeyguardBottomAreaAlpha() {
         float alpha = Math.min(getKeyguardContentsAlpha(), 1 - getQsExpansionFraction());
+        if (mLiveLockscreenController.getLiveLockScreenHasFocus()) {
+            alpha = 1f;
+        }
         mKeyguardBottomArea.setAlpha(alpha);
         mKeyguardBottomArea.setImportantForAccessibility(alpha == 0f
                 ? IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS
@@ -2164,10 +2372,12 @@ public class NotificationPanelView extends PanelView implements
             mLaunchAnimationEndRunnable.run();
             mLaunchAnimationEndRunnable = null;
         }
+        mKeyguardBottomArea.setVisibility(View.GONE);
     }
 
     @Override
     protected void startUnlockHintAnimation() {
+        mKeyguardBottomArea.expand(true);
         super.startUnlockHintAnimation();
         startHighlightIconAnimation(getCenterIcon());
     }
@@ -2202,11 +2412,13 @@ public class NotificationPanelView extends PanelView implements
         requestDisallowInterceptTouchEvent(true);
         mOnlyAffordanceInThisMotion = true;
         mQsTracking = false;
+        mKeyguardBottomArea.expand(true);
     }
 
     @Override
     public void onSwipingAborted() {
         mKeyguardBottomArea.unbindCameraPrewarmService(false /* launched */);
+        mKeyguardBottomArea.expand(false);
     }
 
     @Override
@@ -2215,6 +2427,8 @@ public class NotificationPanelView extends PanelView implements
             return;
         }
         mHintAnimationRunning = true;
+        mKeyguardBottomArea.expand(true);
+        mKeyguardBottomArea.getIndicationView().animate().cancel();
         mAfforanceHelper.startHintAnimation(rightIcon, new Runnable() {
             @Override
             public void run() {
@@ -2395,11 +2609,6 @@ public class NotificationPanelView extends PanelView implements
 
         // Hide "No notifications" in QS.
         mNotificationStackScroller.updateEmptyShadeView(mShadeEmpty && !mQsExpanded);
-        if (mStatusBarState == StatusBarState.KEYGUARD
-                && (!mQsExpanded || mQsExpandImmediate || mIsExpanding
-                && mQsExpandedWhenExpandingStarted)) {
-            positionClockAndNotifications();
-        }
     }
 
     public void setQsScrimEnabled(boolean qsScrimEnabled) {
@@ -2423,6 +2632,11 @@ public class NotificationPanelView extends PanelView implements
 
     public void onScreenTurningOn() {
         mKeyguardStatusView.refreshTime();
+        if (shouldShowScreenOnHints()) {
+            startScreenOnHintAnimation(mLiveLockscreenController.isLiveLockScreenInteractive() &&
+                            !mUserInteractedWithLiveLockScreen,
+                    !mUserUnlocked, !mUserExpandedNotifications);
+        }
     }
 
     @Override
@@ -2584,6 +2798,10 @@ public class NotificationPanelView extends PanelView implements
         return mHeadsUpManager.hasPinnedHeadsUp() || mHeadsUpAnimatingAway;
     }
 
+    public KeyguardBottomAreaView getKeyguardBottomArea() {
+        return mKeyguardBottomArea;
+    }
+
     class SettingsObserver extends ContentObserver {
         SettingsObserver(Handler handler) {
             super(handler);
@@ -2596,7 +2814,7 @@ public class NotificationPanelView extends PanelView implements
             resolver.registerContentObserver(CMSettings.System.getUriFor(
                     CMSettings.System.DOUBLE_TAP_SLEEP_GESTURE), false, this);
             resolver.registerContentObserver(CMSettings.Secure.getUriFor(
-                    CMSettings.Secure.LIVE_LOCK_SCREEN_ENABLED), false, this);
+                    CMSettings.Secure.LOCK_SCREEN_WEATHER_ENABLED), false, this);
             update();
         }
 
@@ -2622,11 +2840,12 @@ public class NotificationPanelView extends PanelView implements
             mDoubleTapToSleepEnabled = CMSettings.System.getInt(
                     resolver, CMSettings.System.DOUBLE_TAP_SLEEP_GESTURE, 1) == 1;
 
-            boolean liveLockScreenEnabled = CMSettings.Secure.getInt(
-                    resolver, CMSettings.Secure.LIVE_LOCK_SCREEN_ENABLED, 0) == 1;
-            if (liveLockScreenEnabled != mLiveLockScreenEnabled) {
-                mLiveLockScreenEnabled = liveLockScreenEnabled;
-                updateExternalKeyguardView();
+            boolean wasKeyguardWeatherEnabled = mKeyguardWeatherEnabled;
+            mKeyguardWeatherEnabled = CMSettings.Secure.getInt(
+                    resolver, CMSettings.Secure.LOCK_SCREEN_WEATHER_ENABLED, 0) == 1;
+            if (mWeatherController != null
+                    && wasKeyguardWeatherEnabled != mKeyguardWeatherEnabled) {
+                onWeatherChanged(mWeatherController.getWeatherInfo());
             }
         }
     }
@@ -2641,6 +2860,8 @@ public class NotificationPanelView extends PanelView implements
             mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_POWER_DOUBLE_TAP;
         } else if (source == StatusBarManager.CAMERA_LAUNCH_SOURCE_WIGGLE) {
             mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_WIGGLE;
+        } else if (source == StatusBarManager.CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE) {
+            mLastCameraLaunchSource = KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_SCREEN_GESTURE;
         } else {
 
             // Default.
@@ -2650,7 +2871,8 @@ public class NotificationPanelView extends PanelView implements
         // If we are launching it when we are occluded already we don't want it to animate,
         // nor setting these flags, since the occluded state doesn't change anymore, hence it's
         // never reset.
-        if (!isFullyCollapsed()) {
+        if (!isFullyCollapsed() && mLastCameraLaunchSource ==
+                KeyguardBottomAreaView.CAMERA_LAUNCH_SOURCE_AFFORDANCE) {
             mLaunchingAffordance = true;
             setLaunchingAffordance(true);
         } else {
@@ -2699,48 +2921,158 @@ public class NotificationPanelView extends PanelView implements
         return !tasks.isEmpty() && pkgName.equals(tasks.get(0).topActivity.getPackageName());
     }
 
-    public boolean hasExternalKeyguardView() {
-        return mKeyguardExternalView != null && mKeyguardExternalView.isAttachedToWindow();
+    public void setDetailRequestedScrollLock(boolean detailScrollFlag) {
+        if (mDetailScrollLock != detailScrollFlag) {
+            if (mStatusBarState != StatusBarState.SHADE) {
+                mDetailScrollLock = false;
+            } else {
+                mDetailScrollLock = detailScrollFlag;
+            }
+            if (!detailScrollFlag && getQsExpansionFraction() > 0.3f) {
+                flingSettings(getCurrentVelocity(), true, new Runnable() {
+                    @Override
+                    public void run() {
+                        mStackScrollerOverscrolling = false;
+                        mQsExpansionFromOverscroll = false;
+                        updateQsState();
+                        updateHeader();
+                        updateMaxHeadsUpTranslation();
+                        updatePanelExpanded();
+                        requestLayout();
+                    }
+                }, false);
+            } else {
+                requestLayout();
+            }
+        }
     }
 
-    public boolean isExternalKeyguardViewInteractive() {
-        return mKeyguardExternalView != null && mKeyguardExternalView.isInteractive();
+    @Override
+    public void onWeatherChanged(WeatherController.WeatherInfo info) {
+        if (!mKeyguardWeatherEnabled || Double.isNaN(info.temp) || info.condition == null) {
+            mKeyguardWeatherInfo.setVisibility(GONE);
+        } else {
+            mKeyguardWeatherInfo.setText(mContext.getString(
+                    R.string.keyguard_status_view_weather_format,
+                    WeatherUtils.formatTemperature(info.temp, info.tempUnit),
+                    info.condition));
+            mKeyguardWeatherInfo.setVisibility(VISIBLE);
+        }
     }
 
-    public KeyguardExternalView getExternalKeyguardView() {
-        return mKeyguardExternalView;
-    }
+    private class SlideInAnimationListener implements ValueAnimator.AnimatorUpdateListener,
+            ValueAnimator.AnimatorListener {
+        @Override
+        public void onAnimationStart(Animator animator) {}
 
-    private KeyguardExternalView getExternalKeyguardView(ComponentName componentName) {
-        try {
-            return new KeyguardExternalView(getContext(), null, componentName);
-        } catch (Exception e) {
-            // just return null below and move on
+        @Override
+        public void onAnimationEnd(Animator animator) {
+            animationFinished(animator);
         }
-        return null;
-    }
 
-    private void updateExternalKeyguardView() {
-        ComponentName cn = mLiveLockScreenEnabled ?
-                mLockPatternUtils.getThirdPartyKeyguardComponent() : null;
-        // If mThirdPartyKeyguardViewComponent differs from cn, go ahead and update
-        if (!Objects.equals(mThirdPartyKeyguardViewComponent, cn)) {
-            mThirdPartyKeyguardViewComponent = cn;
-            if (mKeyguardExternalView != null) {
-                if (indexOfChild(mKeyguardExternalView) >= 0) {
-                    removeView(mKeyguardExternalView);
-                }
-                mKeyguardExternalView.unregisterKeyguardExternalViewCallback(
-                        mExternalKeyguardViewCallbacks);
-                if (mThirdPartyKeyguardViewComponent != null) {
-                    mKeyguardExternalView =
-                            getExternalKeyguardView(mThirdPartyKeyguardViewComponent);
-                    mKeyguardExternalView.registerKeyguardExternalViewCallback(
-                            mExternalKeyguardViewCallbacks);
-                } else {
-                    mKeyguardExternalView = null;
-                }
+        @Override
+        public void onAnimationCancel(Animator animator) {
+            animationFinished(animator);
+        }
+
+        @Override
+        public void onAnimationRepeat(Animator animator) {}
+
+        @Override
+        public void onAnimationUpdate(ValueAnimator valueAnimator) {
+            View statusBarView = mStatusBar.getStatusBarWindow();
+            if (valueAnimator.getAnimatedFraction() > 0 &&
+                    statusBarView.getVisibility() != View.VISIBLE) {
+                statusBarView.setVisibility(View.VISIBLE);
             }
+            float translationX = (Float) valueAnimator.getAnimatedValue();
+            float alpha = valueAnimator.getAnimatedFraction();
+
+            mViewLinker.getParent().setTranslationX(translationX);
+            mViewLinker.getParent().setAlpha(alpha);
+
+            float alpha1 = ScrimController.SCRIM_BEHIND_ALPHA_KEYGUARD * alpha;
+            alpha1 = Math.max(0, alpha1);
+            mStatusBar.getScrimController().setScrimBehindColor(alpha1);
+            mLiveLockscreenController.getLiveLockScreenView()
+                    .onLockscreenSlideOffsetChanged(alpha);
         }
+
+        private void animationFinished(Animator animator) {
+            mLiveLockscreenController.onLiveLockScreenFocusChanged(false);
+        }
+    }
+
+    private SlideInAnimationListener mSlideInAnimationListener = new SlideInAnimationListener();
+
+    public void slideLockScreenIn() {
+        mNotificationStackScroller.setVisibility(View.VISIBLE);
+        mNotificationStackScroller.setAlpha(0f);
+        mNotificationStackScroller.setTranslationX(-mNotificationStackScroller.getWidth());
+        mKeyguardStatusView.setVisibility(View.VISIBLE);
+        mKeyguardStatusView.setAlpha(0f);
+        mKeyguardStatusView.setTranslationX(mNotificationStackScroller.getTranslationX());
+        mKeyguardStatusBar.setAlpha(0f);
+
+        mStatusBar.getScrimController().setScrimBehindColor(0f);
+        ValueAnimator animator = ValueAnimator.ofFloat(
+                mNotificationStackScroller.getTranslationX(),
+                0f);
+        animator.setDuration(SLIDE_PANEL_IN_ANIMATION_DURATION);
+        animator.addUpdateListener(mSlideInAnimationListener);
+        animator.addListener(mSlideInAnimationListener);
+        animator.start();
+
+        if (!mUserReturnedFromLiveLockScreen) {
+            mUserReturnedFromLiveLockScreen = true;
+            saveUserReturnedFromLls(true);
+        }
+    }
+
+    private void saveBooleanSharedPreference(String key, boolean value) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+        prefs.edit().putBoolean(key, value).apply();
+    }
+
+    private boolean getSharedPreferenceBoolean(String key, boolean defValue) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
+        return prefs.getBoolean(key, defValue);
+    }
+
+    private void saveUserExpandedNotificationsInKeyguard(boolean expanded) {
+        saveBooleanSharedPreference(KEY_USER_EXPANDED_NOTIFICATIONS_IN_KEYGUARD, expanded);
+    }
+
+    private boolean getUserExpandedNotificationsInKeyguard() {
+        return getSharedPreferenceBoolean(KEY_USER_EXPANDED_NOTIFICATIONS_IN_KEYGUARD, false);
+    }
+
+    private void saveUserInteractedWithLls(boolean interacted) {
+        saveBooleanSharedPreference(KEY_USER_INTERACTED_WITH_LLS, interacted);
+    }
+
+    private boolean getUserInteractedWithLls() {
+        return getSharedPreferenceBoolean(KEY_USER_INTERACTED_WITH_LLS, false);
+    }
+
+    private void saveUserUnlocked(boolean unlocked) {
+        saveBooleanSharedPreference(KEY_USER_UNLOCKED, unlocked);
+    }
+
+    private boolean getUserUnlocked() {
+        return getSharedPreferenceBoolean(KEY_USER_UNLOCKED, false);
+    }
+
+    private void saveUserReturnedFromLls(boolean revealed) {
+        saveBooleanSharedPreference(KEY_USER_RETURNED_FROM_LLS, revealed);
+    }
+
+    private boolean getUserReturnedFromLls() {
+        return getSharedPreferenceBoolean(KEY_USER_RETURNED_FROM_LLS, false);
+    }
+
+    public boolean shouldShowScreenOnHints() {
+        return mScreenOnHintsEnabled && mStatusBar.isDeviceProvisioned() &&
+                mStatusBarState == StatusBarState.KEYGUARD;
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
index 82b1e1d..e1a400d 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java
@@ -146,16 +146,6 @@ public abstract class PanelBar extends FrameLayout {
         return result;
     }
 
-    @Override
-    protected void onDetachedFromWindow() {
-        super.onDetachedFromWindow();
-        for (PanelView pv : mPanels) {
-            pv.setBar(null);
-        }
-        mPanels.clear();
-        mPanelHolder.setBar(null);
-    }
-
     // called from PanelView when self-expanding, too
     public void startOpeningPanel(PanelView panel) {
         if (DEBUG) LOG("startOpeningPanel: " + panel);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
index e5711b8..3a2c84c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java
@@ -49,6 +49,9 @@ public abstract class PanelView extends FrameLayout {
     public static final boolean DEBUG = PanelBar.DEBUG;
     public static final String TAG = PanelView.class.getSimpleName();
 
+    private static final long ANIMATION_FADE_DURATION = 1000L;
+    private static final long HINT_DELAY_DURATION = 1500L;
+
     private final void logf(String fmt, Object... args) {
         Log.v(TAG, (mViewName != null ? (mViewName + ": ") : "") + String.format(fmt, args));
     }
@@ -94,7 +97,7 @@ public abstract class PanelView extends FrameLayout {
         public void onLayoutChange(View v, int left, int top, int right, int bottom,
                 int oldLeft, int oldTop, int oldRight, int oldBottom) {
             // update expand height
-            if (mHeightAnimator != null && mExpanding && mUpdateExpandOnLayout) {
+            if (mHeightAnimator != null && mExpanding && mUpdateExpandOnLayout && !mJustPeeked) {
                 final int maxPanelHeight = getMaxPanelHeight();
                 final PropertyValuesHolder[] values = mHeightAnimator.getValues();
                 values[0].setFloatValues(maxPanelHeight);
@@ -121,6 +124,9 @@ public abstract class PanelView extends FrameLayout {
 
     private boolean mPeekPending;
     private boolean mCollapseAfterPeek;
+    private boolean mShowExpandHint;
+    private boolean mShowUnlockHint;
+    private boolean mScreenOnHintAnimationRunning;
 
     /**
      * Speed-up factor to be used when {@link #mFlingCollapseRunnable} runs the next time.
@@ -674,7 +680,7 @@ public abstract class PanelView extends FrameLayout {
             }
             mUpdateExpandOnLayout = isFullyCollapsed();
             mFlingAnimationUtils.apply(animator, mExpandedHeight, target, vel, getHeight());
-            if (expandBecauseOfFalsing) {
+            if (expandBecauseOfFalsing && vel == 0) {
                 animator.setDuration(350);
             }
         } else {
@@ -928,6 +934,7 @@ public abstract class PanelView extends FrameLayout {
     private void abortAnimations() {
         cancelPeek();
         cancelHeightAnimator();
+        mKeyguardBottomArea.getIndicationView().animate().cancel();
         removeCallbacks(mPostCollapseRunnable);
         removeCallbacks(mFlingCollapseRunnable);
     }
@@ -946,6 +953,8 @@ public abstract class PanelView extends FrameLayout {
         }
         cancelPeek();
         notifyExpandingStarted();
+        mKeyguardBottomArea.getIndicationView().animate().cancel();
+        mStatusBar.onUnlockHintStarted();
         startUnlockHintAnimationPhase1(new Runnable() {
             @Override
             public void run() {
@@ -954,8 +963,8 @@ public abstract class PanelView extends FrameLayout {
                 mHintAnimationRunning = false;
             }
         });
-        mStatusBar.onUnlockHintStarted();
         mHintAnimationRunning = true;
+        mShowExpandHint = false;
     }
 
     /**
@@ -989,6 +998,7 @@ public abstract class PanelView extends FrameLayout {
         mKeyguardBottomArea.getIndicationView().animate()
                 .translationY(-mHintDistance)
                 .setDuration(250)
+                .setStartDelay(0)
                 .setInterpolator(mFastOutSlowInInterpolator)
                 .withEndAction(new Runnable() {
                     @Override
@@ -1011,17 +1021,213 @@ public abstract class PanelView extends FrameLayout {
         animator.setDuration(450);
         animator.setInterpolator(mBounceInterpolator);
         animator.addListener(new AnimatorListenerAdapter() {
+            private boolean mCancelled;
+
+            @Override
+            public void onAnimationCancel(Animator animation) {
+                mCancelled = true;
+            }
+
             @Override
             public void onAnimationEnd(Animator animation) {
                 mHeightAnimator = null;
-                onAnimationFinished.run();
-                notifyBarPanelExpansionChanged();
+                if (mCancelled) {
+                    onAnimationFinished.run();
+                } else {
+                    if (mShowExpandHint) {
+                        startUnlockHintFadeOutAnimationPhase(onAnimationFinished);
+                    } else {
+                        onAnimationFinished.run();
+                        notifyBarPanelExpansionChanged();
+                    }
+                }
             }
         });
         animator.start();
         mHeightAnimator = animator;
     }
 
+    /**
+     * Fade in unlock hint
+     */
+    private void startUnlockHintFadeInAnimationPhase(final Runnable onAnimationFinished) {
+        mStatusBar.onUnlockHintStarted();
+        mKeyguardBottomArea.getIndicationView().animate()
+                .alpha(1)
+                .setDuration(ANIMATION_FADE_DURATION)
+                .setStartDelay(0)
+                .setInterpolator(null)
+                .withEndAction(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mShowExpandHint) {
+                            startUnlockHintFadeOutAnimationPhase(onAnimationFinished);
+                        } else {
+                            onAnimationFinished.run();
+                            notifyBarPanelExpansionChanged();
+                        }
+                    }
+                })
+                .start();
+    }
+
+    /**
+     * Fade out unlock hint
+     */
+    private void startUnlockHintFadeOutAnimationPhase(final Runnable onAnimationFinished) {
+        mKeyguardBottomArea.getIndicationView().animate()
+                .alpha(0)
+                .setDuration(ANIMATION_FADE_DURATION)
+                .setStartDelay(HINT_DELAY_DURATION)
+                .setInterpolator(null)
+                .withEndAction(new Runnable() {
+                    @Override
+                    public void run() {
+                        startExpandHintAnimation(onAnimationFinished);
+                    }
+                })
+                .start();
+    }
+
+    /**
+     * Fade in Lls hint
+     */
+    private void startLlsHintFadeInAnimationPhase(final Runnable onAnimationFinished) {
+        mKeyguardBottomArea.getIndicationView().setAlpha(0);
+        mKeyguardBottomArea.getIndicationView().animate()
+                .alpha(1)
+                .setDuration(ANIMATION_FADE_DURATION)
+                .setStartDelay(0)
+                .setInterpolator(null)
+                .withEndAction(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mShowUnlockHint || mShowExpandHint) {
+                            startLlsHintFadeOutAnimationPhase(onAnimationFinished);
+                        } else {
+                            onAnimationFinished.run();;
+                        }
+                    }
+                })
+                .start();
+    }
+
+    /**
+     * Fade out Lls hint
+     */
+    private void startLlsHintFadeOutAnimationPhase(final Runnable onAnimationFinished) {
+        mKeyguardBottomArea.getIndicationView().animate()
+                .alpha(0)
+                .setDuration(ANIMATION_FADE_DURATION)
+                .setStartDelay(HINT_DELAY_DURATION)
+                .setInterpolator(null)
+                .withEndAction(new Runnable() {
+                    @Override
+                    public void run() {
+                        if (mShowUnlockHint) {
+                            startUnlockHintFadeInAnimationPhase(onAnimationFinished);
+                        } else if (mShowExpandHint) {
+                            startExpandHintAnimation(onAnimationFinished);
+                        } else {
+                            onAnimationFinished.run();
+                        }
+                    }
+                })
+                .start();
+    }
+
+    /**
+     * Fade in expand hint
+     */
+    private void startExpandHintAnimation(final Runnable onAnimationFinished) {
+        mStatusBar.onExpandHintStarted();
+        mKeyguardBottomArea.getIndicationView().animate()
+                .alpha(1)
+                .setDuration(ANIMATION_FADE_DURATION)
+                .setStartDelay(0)
+                .setInterpolator(null)
+                .withEndAction(new Runnable() {
+                    @Override
+                    public void run() {
+                        onAnimationFinished.run();
+                    }
+                })
+                .start();
+    }
+
+    /**
+     * Show notifications hint (swipe right hint)
+     */
+    protected void startShowNotificationsHintAnimation() {
+        cancelPeek();
+        mStatusBar.onNotificationsHintStarted();
+        mHintAnimationRunning = true;
+        mKeyguardBottomArea.getIndicationView().setAlpha(0);
+        mKeyguardBottomArea.getIndicationView().animate()
+                .alpha(1)
+                .setDuration(ANIMATION_FADE_DURATION)
+                .setInterpolator(null)
+                .withEndAction(new Runnable() {
+                    @Override
+                    public void run() {
+                        mStatusBar.onHintFinished();
+                        mHintAnimationRunning = false;
+                    }
+                })
+                .start();
+    }
+
+    protected void startScreenOnHintAnimation(boolean showSwipeLeftHint, boolean showUnlockHint,
+            boolean showExpandHint) {
+        // We don't need to hint the user if an animation is already running or the user is changing
+        // the expansion.
+        if (mHintAnimationRunning || mScreenOnHintAnimationRunning) return;
+
+        final View indicationView = mKeyguardBottomArea.getIndicationView();
+        indicationView.animate().cancel();
+        indicationView.animate().setListener(
+                new Animator.AnimatorListener() {
+                    @Override
+                    public void onAnimationStart(Animator animation) { }
+
+                    @Override
+                    public void onAnimationEnd(Animator animation) { }
+
+                    @Override
+                    public void onAnimationCancel(Animator animation) {
+                        mScreenOnHintAnimationRunning = false;
+                        indicationView.setAlpha(1f);
+                    }
+
+                    @Override
+                    public void onAnimationRepeat(Animator animation) { }
+                });
+
+        Runnable r = new Runnable() {
+            @Override
+            public void run() {
+                mStatusBar.onHintFinished();
+                mScreenOnHintAnimationRunning = false;
+            }
+        };
+        if (showSwipeLeftHint) {
+            mStatusBar.onLlsHintStarted();
+            startLlsHintFadeInAnimationPhase(r);
+        } else if (showUnlockHint) {
+            mStatusBar.onUnlockHintStarted();
+            startUnlockHintFadeInAnimationPhase(r);
+        } else if (showExpandHint) {
+            mStatusBar.onExpandHintStarted();
+            startExpandHintAnimation(r);
+        } else {
+            return;
+        }
+        indicationView.setAlpha(0);
+        mShowUnlockHint = showUnlockHint;
+        mShowExpandHint = showExpandHint;
+        mScreenOnHintAnimationRunning = true;
+    }
+
     private ValueAnimator createHeightAnimator(float targetHeight) {
         ValueAnimator animator = ValueAnimator.ofFloat(mExpandedHeight, targetHeight);
         animator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() {
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 adff973..7df8346 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -17,14 +17,11 @@
 package com.android.systemui.statusbar.phone;
 
 
-import static com.android.systemui.settings.BrightnessController.BRIGHTNESS_ADJ_RESOLUTION;
-
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.annotation.NonNull;
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
-import android.app.ActivityOptions;
 import android.app.IActivityManager;
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -103,13 +100,13 @@ import android.view.ViewGroup.LayoutParams;
 import android.view.ViewStub;
 import android.view.ViewTreeObserver;
 import android.view.WindowManager;
-import android.view.WindowManagerGlobal;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.animation.AccelerateDecelerateInterpolator;
 import android.view.animation.AccelerateInterpolator;
 import android.view.animation.Interpolator;
 import android.view.animation.LinearInterpolator;
 import android.view.animation.PathInterpolator;
+import android.widget.AdapterView;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -136,10 +133,7 @@ import com.android.systemui.doze.DozeHost;
 import com.android.systemui.doze.DozeLog;
 import com.android.systemui.keyguard.KeyguardViewMediator;
 import com.android.systemui.qs.QSDragPanel;
-import com.android.systemui.qs.QSPanel;
-import com.android.systemui.qs.QSTile;
 import com.android.systemui.recents.ScreenPinningRequest;
-import com.android.systemui.settings.BrightnessController;
 import com.android.systemui.statusbar.ActivatableNotificationView;
 import com.android.systemui.statusbar.BackDropView;
 import com.android.systemui.statusbar.BaseStatusBar;
@@ -150,6 +144,7 @@ import com.android.systemui.statusbar.EmptyShadeView;
 import com.android.systemui.statusbar.ExpandableNotificationRow;
 import com.android.systemui.statusbar.GestureRecorder;
 import com.android.systemui.statusbar.KeyguardIndicationController;
+import com.android.systemui.statusbar.MediaExpandableNotificationRow;
 import com.android.systemui.statusbar.NotificationData;
 import com.android.systemui.statusbar.NotificationData.Entry;
 import com.android.systemui.statusbar.NotificationOverflowContainer;
@@ -173,6 +168,7 @@ import com.android.systemui.statusbar.policy.HotspotControllerImpl;
 import com.android.systemui.statusbar.policy.KeyButtonView;
 import com.android.systemui.statusbar.policy.KeyguardMonitor;
 import com.android.systemui.statusbar.policy.KeyguardUserSwitcher;
+import com.android.systemui.statusbar.policy.LiveLockScreenController;
 import com.android.systemui.statusbar.policy.LocationControllerImpl;
 import com.android.systemui.statusbar.policy.NetworkController;
 import com.android.systemui.statusbar.policy.NetworkControllerImpl;
@@ -321,6 +317,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     WeatherControllerImpl mWeatherController;
     SuControllerImpl mSuController;
     FingerprintUnlockController mFingerprintUnlockController;
+    LiveLockScreenController mLiveLockScreenController;
 
     int mNaturalBarHeight = -1;
 
@@ -329,7 +326,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
     StatusBarWindowView mStatusBarWindow;
     FrameLayout mStatusBarWindowContent;
-    PhoneStatusBarView mStatusBarView;
+    private PhoneStatusBarView mStatusBarView;
     private int mStatusBarWindowState = WINDOW_STATE_SHOWING;
     private StatusBarWindowManager mStatusBarWindowManager;
     private UnlockMethodCache mUnlockMethodCache;
@@ -497,6 +494,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         }
     }
 
+    public void setStatusBarViewVisibility(boolean visible) {
+        mStatusBarView.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);
+    }
+
     class DevForceNavbarObserver extends UserContentObserver {
         DevForceNavbarObserver(Handler handler) {
             super(handler);
@@ -506,14 +507,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         protected void observe() {
             super.observe();
             ContentResolver resolver = mContext.getContentResolver();
-            resolver.registerContentObserver(CMSettings.Secure.getUriFor(
-                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR), false, this, UserHandle.USER_ALL);
+            resolver.registerContentObserver(CMSettings.Global.getUriFor(
+                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR), false, this, UserHandle.USER_ALL);
         }
 
         @Override
         public void update() {
-            boolean visible = CMSettings.Secure.getIntForUser(mContext.getContentResolver(),
-                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;
+            boolean visible = CMSettings.Global.getIntForUser(mContext.getContentResolver(),
+                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;
 
             if (visible) {
                 forceAddNavigationBar();
@@ -539,7 +540,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
         mNavigationBarView.setDisabledFlags(mDisabled1);
         mNavigationBarView.setBar(this);
-        addNavigationBar();
+        addNavigationBar(true); // dynamically adding nav bar, reset System UI visibility!
     }
 
     // ensure quick settings is disabled until the current user makes it through the setup wizard
@@ -792,6 +793,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     private RankingMap mLatestRankingMap;
     private boolean mNoAnimationOnNextBarModeChange;
 
+    public ScrimController getScrimController() {
+        return mScrimController;
+    }
+
     @Override
     public void start() {
         mDisplay = ((WindowManager)mContext.getSystemService(Context.WINDOW_SERVICE))
@@ -809,7 +814,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
         mStatusBarWindow = new StatusBarWindowView(mContext, null);
         mStatusBarWindow.setService(this);
-        
+
         super.start(); // calls createAndAddWindows()
 
         mMediaSessionManager
@@ -817,7 +822,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         // TODO: use MediaSessionManager.SessionListener to hook us up to future updates
         // in session state
 
-        addNavigationBar();
+        addNavigationBar(false);
 
         // Developer options - Force Navigation bar
         try {
@@ -882,9 +887,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
         Resources res = context.getResources();
 
-        mScreenWidth = (float) context.getResources().getDisplayMetrics().widthPixels;
-        mMinBrightness = context.getResources().getInteger(
-                com.android.internal.R.integer.config_screenBrightnessDim);
+        mScreenWidth = (float) res.getDisplayMetrics().widthPixels;
+        mMinBrightness = res.getInteger(com.android.internal.R.integer.config_screenBrightnessDim);
 
         updateDisplaySize(); // populates mDisplayMetrics
         updateResources(null);
@@ -920,6 +924,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             mNotificationPanel.setBackground(new FastColorDrawable(context.getColor(
                     R.color.notification_panel_solid_background)));
         }
+        mLiveLockScreenController = new LiveLockScreenController(mContext, this,
+                mNotificationPanel);
+        mNotificationPanel.setLiveController(mLiveLockScreenController);
+        if (mStatusBarWindowManager != null) {
+            mStatusBarWindowManager.setLiveLockscreenController(mLiveLockScreenController);
+        }
 
         if (mHeadsUpManager == null) {
             mHeadsUpManager = new HeadsUpManager(context, mStatusBarWindow);
@@ -1032,12 +1042,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         mHeader.setActivityStarter(this);
         mKeyguardStatusBar = (KeyguardStatusBarView) mStatusBarWindowContent.findViewById(R.id.keyguard_header);
         mKeyguardStatusView = mStatusBarWindowContent.findViewById(R.id.keyguard_status_view);
-        mKeyguardBottomArea =
-                (KeyguardBottomAreaView) mStatusBarWindowContent.findViewById(R.id.keyguard_bottom_area);
+        mKeyguardBottomArea = mNotificationPanel.getKeyguardBottomArea();
+
         mKeyguardBottomArea.setActivityStarter(this);
         mKeyguardBottomArea.setAssistManager(mAssistManager);
         mKeyguardIndicationController = new KeyguardIndicationController(mContext,
-                (KeyguardIndicationTextView) mStatusBarWindowContent.findViewById(
+                (KeyguardIndicationTextView) mKeyguardBottomArea.findViewById(
                 R.id.keyguard_indication_text),
                 mKeyguardBottomArea.getLockIcon());
         mKeyguardBottomArea.setKeyguardIndicationController(mKeyguardIndicationController);
@@ -1181,7 +1191,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                         mNetworkController, mZenModeController, mHotspotController,
                         mCastController, mFlashlightController,
                         mUserSwitcherController, mKeyguardMonitor,
-                        mSecurityController);
+                        mSecurityController, mBatteryController);
             }
             mQSPanel.setHost(mQSTileHost);
             if (mBrightnessMirrorController == null) {
@@ -1315,10 +1325,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             }
         }
 
-        mVisualizerView.setKeyguardMonitor(mKeyguardMonitor);
         mHeader.setNextAlarmController(mNextAlarmController);
         mHeader.setWeatherController(mWeatherController);
 
+        mNotificationPanel.setWeatherController(mWeatherController);
+
         PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
         mBroadcastReceiver.onReceive(mContext,
                 new Intent(pm.isScreenOn() ? Intent.ACTION_SCREEN_ON : Intent.ACTION_SCREEN_OFF));
@@ -1490,7 +1501,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                         @Override
                         public void run() {
                             boolean isUpdate = mQSPanel.getHost().getCustomTileData()
-                                    .get(sbc.getKey()) != null;
+                                    .get(sbc.persistableKey()) != null;
                             if (isUpdate) {
                                 mQSPanel.getHost().updateCustomTile(sbc);
                             } else {
@@ -1506,7 +1517,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                     mHandler.post(new Runnable() {
                         @Override
                         public void run() {
-                            mQSPanel.getHost().removeCustomTileSysUi(sbc.getKey());
+                            mQSPanel.getHost().removeCustomTileSysUi(sbc.persistableKey());
                         }
                     });
                 }
@@ -1568,16 +1579,26 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         }
     }
 
-    private void prepareNavigationBarView() {
+    private void prepareNavigationBarView(boolean forceReset) {
         mNavigationBarView.reorient();
 
         mNavigationBarView.setListeners(mRecentsClickListener, mRecentsPreloadOnTouchListener,
                 mLongPressBackRecentsListener, mHomeActionListener, mLongPressHomeListener);
         mAssistManager.onConfigurationChanged();
+        if (forceReset) {
+            // Nav Bar was added dynamically - we need to reset the mSystemUiVisibility and call
+            // setSystemUiVisibility so that mNavigationBarMode is set to the correct value
+            int newVal = mSystemUiVisibility;
+            mSystemUiVisibility = 0;
+            setSystemUiVisibility(newVal, SYSTEM_UI_VISIBILITY_MASK);
+            checkBarMode(mNavigationBarMode,
+                    mNavigationBarWindowState, mNavigationBarView.getBarTransitions(),
+                    mNoAnimationOnNextBarModeChange);
+        }
     }
 
     // For small-screen devices (read: phones) that lack hardware navigation buttons
-    private void addNavigationBar() {
+    private void addNavigationBar(boolean forceReset) {
         if (DEBUG) Log.v(TAG, "addNavigationBar: about to add " + mNavigationBarView);
         if (mNavigationBarView == null) return;
 
@@ -1588,7 +1609,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             return;
         }
 
-        prepareNavigationBarView();
+        prepareNavigationBarView(forceReset);
 
         mWindowManager.addView(mNavigationBarView, getNavigationBarLayoutParams());
     }
@@ -1604,7 +1625,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     private void repositionNavigationBar() {
         if (mNavigationBarView == null || !mNavigationBarView.isAttachedToWindow()) return;
 
-        prepareNavigationBarView();
+        prepareNavigationBarView(false);
 
         mWindowManager.updateViewLayout(mNavigationBarView, getNavigationBarLayoutParams());
     }
@@ -1966,7 +1987,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     }
 
     @Override
-    protected void updateRowStates() {
+    public void updateRowStates() {
         super.updateRowStates();
         mNotificationPanel.notifyVisibleChildrenChanged();
     }
@@ -2080,6 +2101,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                     Log.v(TAG, "DEBUG_MEDIA: insert listener, receive metadata: "
                             + mMediaMetadata);
                 }
+                if (mediaNotification != null
+                        && mediaNotification.row != null
+                        && mediaNotification.row instanceof MediaExpandableNotificationRow) {
+                    ((MediaExpandableNotificationRow) mediaNotification.row)
+                            .setMediaController(controller);
+                }
 
                 if (mediaNotification != null) {
                     mMediaNotificationKey = mediaNotification.notification.getKey();
@@ -2195,7 +2222,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         }
 
         // apply user lockscreen image
-        if (backdropBitmap == null && !mNotificationPanel.hasExternalKeyguardView()) {
+        if (backdropBitmap == null && !mLiveLockScreenController.isShowingLiveLockScreenView()) {
             backdropBitmap = mKeyguardWallpaper;
         }
 
@@ -2476,6 +2503,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         return mMediaNotificationKey;
     }
 
+    @Override
+    protected MediaController getCurrentMediaController() {
+        return mMediaController;
+    }
+
     public boolean isScrimSrcModeEnabled() {
         return mScrimSrcModeEnabled;
     }
@@ -2938,7 +2970,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                 setInteracting(StatusBarManager.WINDOW_STATUS_BAR, true);
             }
         }
-        if (mBrightnessChanged && upOrCancel) {
+        if (mBrightnessChanged && upOrCancel && !isQsExpanded()) {
             mBrightnessChanged = false;
             if (mJustPeeked && mExpandedVisible) {
                 mNotificationPanel.fling(10, false);
@@ -3433,6 +3465,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         mStatusBarWindowManager = new StatusBarWindowManager(mContext, mKeyguardMonitor);
         mStatusBarWindowManager.setShowingMedia(mKeyguardShowingMedia);
         mStatusBarWindowManager.add(mStatusBarWindow, getStatusBarHeight());
+        if (mLiveLockScreenController != null) {
+            mStatusBarWindowManager.setLiveLockscreenController(mLiveLockScreenController);
+        }
     }
 
     // called by makeStatusbar and also by PhoneStatusBarView
@@ -3565,10 +3600,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             } else if (cyanogenmod.content.Intent.ACTION_SCREEN_CAMERA_GESTURE.equals(action)) {
                 boolean userSetupComplete = Settings.Secure.getInt(mContext.getContentResolver(),
                         Settings.Secure.USER_SETUP_COMPLETE, 0) != 0;
-                if (!userSetupComplete) {
-                    if (DEBUG) Log.d(TAG, String.format(
-                            "userSetupComplete = %s, ignoring camera launch gesture.",
-                            userSetupComplete));
+                if (!userSetupComplete || !isDeviceProvisioned()) {
+                    if (DEBUG) {
+                        Log.d(TAG, String.format("userSetupComplete = $1%s, " +
+                                "deviceProvisioned = $2%s, ignoring camera launch gesture.",
+                                userSetupComplete, isDeviceProvisioned()));
+                    }
                     return;
                 }
 
@@ -3661,6 +3698,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         mIconController.updateResources();
         mScreenPinningRequest.onConfigurationChanged();
         mNetworkController.onConfigurationChanged();
+        mStatusBarWindowManager.onConfigurationChanged(newConfig);
     }
 
     @Override
@@ -3686,6 +3724,12 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         }
     }
 
+    public void hideHeadsUp() {
+        if (mUseHeadsUp && mHeadsUpManager != null) {
+            mHeadsUpManager.releaseAllImmediately();
+        }
+    }
+
     private void setControllerUsers() {
         if (mZenModeController != null) {
             mZenModeController.setUserId(mCurrentUserId);
@@ -3753,7 +3797,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         if (mKeyguardIndicationController != null) {
             mKeyguardIndicationController.cleanup();
         }
+        if (mLiveLockScreenController != null) {
+            mLiveLockScreenController.cleanup();
+        }
 
+        mKeyguardBottomArea.cleanup();
         mStatusBarWindow.removeContent(mStatusBarWindowContent);
         mStatusBarWindow.clearDisappearingChildren();
 
@@ -3836,6 +3884,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         if (mState == StatusBarState.KEYGUARD) {
             // this will make sure the keyguard is showing
             showKeyguard();
+            // make sure to hide the notification icon area and system iconography
+            // to avoid overlap (CYNGNOS-2253)
+            mIconController.hideNotificationIconArea(false);
+            mIconController.hideSystemIconArea(false);
         }
 
         // update mLastThemeChangeTime
@@ -3854,7 +3906,9 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
                 removeAllViews((ViewGroup) child);
             }
         }
-        parent.removeAllViews();
+
+        // AdapterView does not support removeAllViews so check before calling
+        if (!(parent instanceof AdapterView)) parent.removeAllViews();
     }
 
     /**
@@ -4307,8 +4361,16 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             mDraggedDownRow = null;
         }
         mAssistManager.onLockscreenShown();
-        if (mNotificationPanel.hasExternalKeyguardView()) {
-            mNotificationPanel.getExternalKeyguardView().onKeyguardShowing(
+        mKeyguardBottomArea.requestFocus();
+        try {
+            WindowManagerGlobal.getWindowManagerService()
+                    .setLiveLockscreenEdgeDetector(false);
+        } catch (RemoteException e){
+            e.printStackTrace();
+        }
+        if (mLiveLockScreenController.isShowingLiveLockScreenView()) {
+            mLiveLockScreenController.onLiveLockScreenFocusChanged(false);
+            mLiveLockScreenController.getLiveLockScreenView().onKeyguardShowing(
                     mStatusBarKeyguardViewManager.isScreenTurnedOn());
         }
     }
@@ -4461,8 +4523,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         mNotificationPanel.onAffordanceLaunchEnded();
         mNotificationPanel.animate().cancel();
         mNotificationPanel.setAlpha(1f);
-        if ( mNotificationPanel.getExternalKeyguardView() != null) {
-            mNotificationPanel.getExternalKeyguardView().onKeyguardDismissed();
+        if (mLiveLockScreenController.isShowingLiveLockScreenView()) {
+            mLiveLockScreenController.getLiveLockScreenView().onKeyguardDismissed();
         }
         return staying;
     }
@@ -4477,6 +4539,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         return mStatusBarKeyguardViewManager != null && mStatusBarKeyguardViewManager.isSecure();
     }
 
+    public boolean isKeyguardInputRestricted() {
+        return mStatusBarKeyguardViewManager != null && mStatusBarKeyguardViewManager.isInputRestricted();
+    }
+
     public long calculateGoingToFullShadeDelay() {
         return mKeyguardFadingAwayDelay + mKeyguardFadingAwayDuration;
     }
@@ -4552,6 +4618,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             mIconPolicy.setKeyguardShowing(false);
         }
         mNotificationPanel.setBarState(mState, mKeyguardFadingAway, goingToFullShade);
+        mLiveLockScreenController.setBarState(mState);
         updateDozingState();
         updatePublicMode();
         updateStackScrollerState(goingToFullShade);
@@ -4640,24 +4707,28 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         return false;
     }
 
-    protected void showBouncer() {
-        if (!mRecreating &&
-                (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED)) {
+    public void showBouncer() {
+        if (!mRecreating && mNotificationPanel.mCanDismissKeyguard
+                && (mState != StatusBarState.SHADE || mLiveLockScreenController.getLiveLockScreenHasFocus())) {
             mWaitingForKeyguardExit = mStatusBarKeyguardViewManager.isShowing();
             mStatusBarKeyguardViewManager.dismiss();
         }
     }
 
     protected void showBouncerOrFocusKeyguardExternalView() {
-        if (mNotificationPanel.hasExternalKeyguardView() && !isKeyguardShowingMedia() &&
-                mNotificationPanel.isExternalKeyguardViewInteractive()) {
+        if (mLiveLockScreenController.isShowingLiveLockScreenView() && !isKeyguardShowingMedia() &&
+                mLiveLockScreenController.isLiveLockScreenInteractive()) {
             focusKeyguardExternalView();
         } else {
             showBouncer();
         }
     }
 
-    protected void focusKeyguardExternalView() {
+    protected void unfocusKeyguardExternalView() {
+        mStatusBarKeyguardViewManager.setKeyguardExternalViewFocus(false);
+    }
+
+    public void focusKeyguardExternalView() {
         mStatusBarView.collapseAllPanels(/*animate=*/ false, false /* delayed*/,
                 1.0f /* speedUpFactor */);
         mStatusBarKeyguardViewManager.setKeyguardExternalViewFocus(true);
@@ -4701,6 +4772,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             clearNotificationEffects();
         }
         mState = state;
+        mVisualizerView.setStatusBarState(state);
         mGroupManager.setStatusBarState(state);
         mStatusBarWindowManager.setStatusBarState(state);
         updateDozing();
@@ -4723,12 +4795,33 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
     }
 
     public void onUnlockHintStarted() {
-        mKeyguardIndicationController.showTransientIndication(R.string.keyguard_unlock);
+        mKeyguardIndicationController.showTransientIndication(R.string.keyguard_unlock,
+                mNotificationPanel.shouldShowScreenOnHints() ?
+                KeyguardIndicationController.IndicationDirection.UP :
+                KeyguardIndicationController.IndicationDirection.NONE);
+    }
+
+    public void onLlsHintStarted() {
+        String llsName = mLiveLockScreenController.getLiveLockScreenName();
+        mKeyguardIndicationController.showTransientIndication(
+                mContext.getString(R.string.swipe_left_hint, llsName),
+                KeyguardIndicationController.IndicationDirection.LEFT);
+    }
+
+    public void onExpandHintStarted() {
+        mKeyguardIndicationController.showTransientIndication(R.string.expand_hint,
+                KeyguardIndicationController.IndicationDirection.DOWN);
+    }
+
+    public void onNotificationsHintStarted() {
+        mKeyguardIndicationController.showTransientIndication(R.string.swipe_right_hint,
+                KeyguardIndicationController.IndicationDirection.RIGHT);
     }
 
     public void onHintFinished() {
         // Delay the reset a bit so the user can read the text.
         mKeyguardIndicationController.hideTransientIndicationDelayed(HINT_RESET_DELAY_MS);
+        mKeyguardBottomArea.expand(false);
     }
 
     public void onCameraHintStarted(String hint) {
@@ -4741,19 +4834,22 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
 
     public void onTrackingStopped(boolean expand) {
         if (mState == StatusBarState.KEYGUARD || mState == StatusBarState.SHADE_LOCKED) {
-            if (!expand && (!mUnlockMethodCache.canSkipBouncer() ||
-                    mNotificationPanel.hasExternalKeyguardView())) {
-                showBouncerOrFocusKeyguardExternalView();
+            if (!expand && !mUnlockMethodCache.canSkipBouncer()) {
+                showBouncer();
             }
-        } else if (expand && mStatusBarWindowManager.keyguardExternalViewHasFocus()) {
-            mStatusBarKeyguardViewManager.setKeyguardExternalViewFocus(false);
-            setBarState(StatusBarState.KEYGUARD);
         }
     }
 
     @Override
     protected int getMaxKeyguardNotifications() {
-        return mKeyguardMaxNotificationCount;
+        int max = mKeyguardMaxNotificationCount;
+        // When an interactive live lockscreen is showing
+        // we want to limit the number of maximum notifications
+        // by 1 so there is additional space for the user to dismiss keygard
+        if (mLiveLockScreenController.isLiveLockScreenInteractive()) {
+            max--;
+        }
+        return max;
     }
 
     public NavigationBarView getNavigationBarView() {
@@ -4911,15 +5007,15 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         mScreenTurningOn = false;
         mDozeScrimController.onScreenTurnedOn();
         mVisualizerView.setVisible(true);
-        if (mNotificationPanel.hasExternalKeyguardView()) {
-            mNotificationPanel.getExternalKeyguardView().onScreenTurnedOn();
+        if (mLiveLockScreenController.isShowingLiveLockScreenView()) {
+            mLiveLockScreenController.onScreenTurnedOn();
         }
     }
 
     public void onScreenTurnedOff() {
         mVisualizerView.setVisible(false);
-        if (mNotificationPanel.hasExternalKeyguardView()) {
-            mNotificationPanel.getExternalKeyguardView().onScreenTurnedOff();
+        if (mLiveLockScreenController.isShowingLiveLockScreenView()) {
+            mLiveLockScreenController.onScreenTurnedOff();
         }
     }
 
@@ -5326,6 +5422,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
         return mVisualizerView;
     }
 
+    public boolean isShowingLiveLockScreenView() {
+        return mLiveLockScreenController.isShowingLiveLockScreenView();
+    }
+
+    public void slideNotificationPanelIn() {
+        mNotificationPanel.slideLockScreenIn();
+    }
+
     private final class ShadeUpdates {
         private final ArraySet<String> mVisibleNotifications = new ArraySet<String>();
         private final ArraySet<String> mNewVisibleNotifications = new ArraySet<String>();
@@ -5478,4 +5582,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
             }
         }
     }
+
+    public boolean isAffordanceSwipeInProgress() {
+        return mNotificationPanel.isAffordanceSwipeInProgress();
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
index ed4880b..1395ff6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
@@ -22,6 +22,8 @@ import android.app.AlarmManager.AlarmClockInfo;
 import android.app.IUserSwitchObserver;
 import android.app.PendingIntent;
 import android.app.StatusBarManager;
+import android.bluetooth.BluetoothAssignedNumbers;
+import android.bluetooth.BluetoothHeadset;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -103,6 +105,7 @@ public class PhoneStatusBarPolicy implements Callback {
     private boolean mZenVisible;
     private boolean mVolumeVisible;
     private boolean mCurrentUserSetup;
+    private Float mBluetoothBatteryLevel = null;
 
     private int mZen;
 
@@ -129,6 +132,9 @@ public class PhoneStatusBarPolicy implements Callback {
             else if (action.equals(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED)) {
                 updateTTY(intent);
             }
+            else if (action.equals(BluetoothHeadset.ACTION_VENDOR_SPECIFIC_HEADSET_EVENT)) {
+                updateBluetoothBattery(intent);
+            }
         }
     };
 
@@ -166,6 +172,9 @@ public class PhoneStatusBarPolicy implements Callback {
         filter.addAction(AudioManager.INTERNAL_RINGER_MODE_CHANGED_ACTION);
         filter.addAction(TelephonyIntents.ACTION_SIM_STATE_CHANGED);
         filter.addAction(TelecomManager.ACTION_CURRENT_TTY_MODE_CHANGED);
+        filter.addAction(BluetoothHeadset.ACTION_VENDOR_SPECIFIC_HEADSET_EVENT);
+        filter.addCategory(BluetoothHeadset.VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID_CATEGORY
+            + "." + Integer.toString(BluetoothAssignedNumbers.APPLE));
         mContext.registerReceiver(mIntentReceiver, filter, null, mHandler);
 
         // listen for user / profile change.
@@ -357,6 +366,27 @@ public class PhoneStatusBarPolicy implements Callback {
         updateBluetooth();
     }
 
+    private void updateBluetoothBattery(Intent intent) {
+        if (intent.hasExtra(BluetoothHeadset.EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD)) {
+            String command = intent.getStringExtra(BluetoothHeadset.EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD);
+            if ("+IPHONEACCEV".equals(command)) {
+                Object[] args = (Object[]) intent.getSerializableExtra(BluetoothHeadset.EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS);
+                if (args.length >= 3 && args[0] instanceof Integer && ((Integer)args[0])*2+1<=args.length) {
+                    for (int i=0;i<((Integer)args[0]);i++) {
+                        if (!(args[i*2+1] instanceof Integer) || !(args[i*2+2] instanceof Integer)) {
+                            continue;
+                        }
+                        if (args[i*2+1].equals(1)) {
+                            mBluetoothBatteryLevel = (((Integer)args[i*2+2])+1)/10.0f;
+                            updateBluetooth();
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    
     private final void updateBluetooth() {
         int iconId = R.drawable.stat_sys_data_bluetooth;
         String contentDescription =
@@ -365,8 +395,24 @@ public class PhoneStatusBarPolicy implements Callback {
         if (mBluetooth != null) {
             bluetoothEnabled = mBluetooth.isBluetoothEnabled();
             if (mBluetooth.isBluetoothConnected()) {
-                iconId = R.drawable.stat_sys_data_bluetooth_connected;
+                if (mBluetoothBatteryLevel == null) {
+                    iconId = R.drawable.stat_sys_data_bluetooth_connected;
+                } else {
+                    if (mBluetoothBatteryLevel<=0.15f) {
+                        iconId = R.drawable.stat_sys_data_bluetooth_connected_battery_1;
+                    } else if (mBluetoothBatteryLevel<=0.375f) {
+                        iconId = R.drawable.stat_sys_data_bluetooth_connected_battery_2;
+                    } else if (mBluetoothBatteryLevel<=0.625f) {
+                        iconId = R.drawable.stat_sys_data_bluetooth_connected_battery_3;
+                    } else if (mBluetoothBatteryLevel<=0.85f) {
+                        iconId = R.drawable.stat_sys_data_bluetooth_connected_battery_4;
+                    } else {
+                        iconId = R.drawable.stat_sys_data_bluetooth_connected_battery_5;
+                    }
+                }
                 contentDescription = mContext.getString(R.string.accessibility_bluetooth_connected);
+            } else {
+                mBluetoothBatteryLevel = null;
             }
         }
 
@@ -474,6 +520,12 @@ public class PhoneStatusBarPolicy implements Callback {
                 @Override
                 public void onUserSwitching(int newUserId, IRemoteCallback reply) {
                     mUserInfoController.reloadUserInfo();
+                    if (reply != null) {
+                        try {
+                            reply.sendResult(null);
+                        } catch (RemoteException e) {
+                        }
+                    }
                 }
 
                 @Override
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
index 3b068d6..8c9daee 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java
@@ -111,6 +111,7 @@ public class PhoneStatusBarView extends PanelBar {
     @Override
     public void onPanelPeeked() {
         super.onPanelPeeked();
+        removePendingHideExpandedRunnables();
         mBar.makeExpandedVisible(false);
     }
 
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 b776a9f..e88ed73 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QSTileHost.java
@@ -54,7 +54,6 @@ import com.android.systemui.qs.tiles.FlashlightTile;
 import com.android.systemui.qs.tiles.HeadsUpTile;
 import com.android.systemui.qs.tiles.HotspotTile;
 import com.android.systemui.qs.tiles.IntentTile;
-import com.android.systemui.qs.tiles.LiveDisplayTile;
 import com.android.systemui.qs.tiles.LocationTile;
 import com.android.systemui.qs.tiles.LockscreenToggleTile;
 import com.android.systemui.qs.tiles.NfcTile;
@@ -67,6 +66,7 @@ import com.android.systemui.qs.tiles.UsbTetherTile;
 import com.android.systemui.qs.tiles.VolumeTile;
 import com.android.systemui.qs.tiles.WifiTile;
 import com.android.systemui.statusbar.CustomTileData;
+import com.android.systemui.statusbar.policy.BatteryController;
 import com.android.systemui.statusbar.policy.BluetoothController;
 import com.android.systemui.statusbar.policy.CastController;
 import com.android.systemui.statusbar.policy.FlashlightController;
@@ -115,6 +115,7 @@ public class QSTileHost implements QSTile.Host, Tunable {
     private final UserSwitcherController mUserSwitcherController;
     private final KeyguardMonitor mKeyguard;
     private final SecurityController mSecurity;
+    private final BatteryController mBattery;
 
     private CustomTileData mCustomTileData;
     private CustomTileListenerService mCustomTileListenerService;
@@ -127,7 +128,7 @@ public class QSTileHost implements QSTile.Host, Tunable {
             ZenModeController zen, HotspotController hotspot,
             CastController cast, FlashlightController flashlight,
             UserSwitcherController userSwitcher, KeyguardMonitor keyguard,
-            SecurityController security) {
+            SecurityController security, BatteryController battery) {
         mContext = context;
         mStatusBar = statusBar;
         mBluetooth = bluetooth;
@@ -141,6 +142,7 @@ public class QSTileHost implements QSTile.Host, Tunable {
         mUserSwitcherController = userSwitcher;
         mKeyguard = keyguard;
         mSecurity = security;
+        mBattery = battery;
         mCustomTileData = new CustomTileData();
 
         final HandlerThread ht = new HandlerThread(QSTileHost.class.getSimpleName(),
@@ -281,6 +283,11 @@ public class QSTileHost implements QSTile.Host, Tunable {
         return mKeyguard;
     }
 
+    @Override
+    public BatteryController getBatteryController() {
+        return mBattery;
+    }
+
     public UserSwitcherController getUserSwitcherController() {
         return mUserSwitcherController;
     }
@@ -311,10 +318,12 @@ public class QSTileHost implements QSTile.Host, Tunable {
                 if (DEBUG) Log.d(TAG, "Creating tile: " + tileSpec);
                 try {
                     if (mCustomTileData.get(tileSpec) != null) {
-                        newTiles.put(tileSpec, new CustomQSTile(this,
-                                mCustomTileData.get(tileSpec).sbc));
+                        final CustomQSTile value = new CustomQSTile(this,
+                                mCustomTileData.get(tileSpec).sbc);
+                        newTiles.put(tileSpec, value);
                     } else {
-                        newTiles.put(tileSpec, createTile(tileSpec));
+                        final QSTile<?> tile = createTile(tileSpec);
+                        newTiles.put(tileSpec, tile);
                     }
                 } catch (Throwable t) {
                     Log.w(TAG, "Error creating tile for spec: " + tileSpec, t);
@@ -361,12 +370,16 @@ public class QSTileHost implements QSTile.Host, Tunable {
         else if (tileSpec.equals("performance")) return new PerfProfileTile(this);
         else if (tileSpec.equals("lockscreen")) return  new LockscreenToggleTile(this);
         else if (tileSpec.equals("ambient_display")) return new AmbientDisplayTile(this);
-        else if (tileSpec.equals("live_display")) return new LiveDisplayTile(this);
         else if (tileSpec.equals("heads_up")) return new HeadsUpTile(this);
         else if (tileSpec.equals("battery_saver")) return new BatterySaverTile(this);
         else if (tileSpec.equals("caffeine")) return new CaffeineTile(this);
         else if (tileSpec.startsWith(IntentTile.PREFIX)) return IntentTile.create(this,tileSpec);
-        else throw new IllegalArgumentException("Bad tile spec: " + tileSpec);
+        else if (TextUtils.split(tileSpec, "\\|").length == 3) {
+            /** restores placeholder for
+             * {@link cyanogenmod.app.StatusBarPanelCustomTile#persistableKey()} **/
+            return new CustomQSTile(this, tileSpec);
+        } else
+            throw new IllegalArgumentException("Bad tile spec: " + tileSpec);
     }
 
     protected List<String> loadTileSpecs(String tileList) {
@@ -393,11 +406,10 @@ public class QSTileHost implements QSTile.Host, Tunable {
                 tiles.add(tile);
             }
         }
-        // ensure edit tile is present
-        if (tiles.size() < TILES_PER_PAGE && !tiles.contains("edit")) {
+        // ensure edit tile is present, default placement should be handled in the default
+        // tile list.
+        if (!tiles.contains("edit")) {
             tiles.add("edit");
-        } else if (tiles.size() > TILES_PER_PAGE && !tiles.contains("edit")) {
-            tiles.add((TILES_PER_PAGE - 1), "edit");
         }
         return tiles;
     }
@@ -455,7 +467,6 @@ public class QSTileHost implements QSTile.Host, Tunable {
         else if (spec.equals("performance")) return R.string.qs_tile_performance;
         else if (spec.equals("lockscreen")) return R.string.quick_settings_lockscreen_label;
         else if (spec.equals("ambient_display")) return R.string.quick_settings_ambient_display_label;
-        else if (spec.equals("live_display")) return R.string.live_display_title;
         else if (spec.equals("heads_up")) return R.string.quick_settings_heads_up_label;
         else if (spec.equals("battery_saver")) return R.string.quick_settings_battery_saver_label;
         else if (spec.equals("caffeine")) return R.string.quick_settings_caffeine_label;
@@ -486,7 +497,6 @@ public class QSTileHost implements QSTile.Host, Tunable {
         else if (spec.equals("performance")) return R.drawable.ic_qs_perf_profile;
         else if (spec.equals("lockscreen")) return R.drawable.ic_qs_lock_screen_on;
         else if (spec.equals("ambient_display")) return R.drawable.ic_qs_ambientdisplay_on;
-        else if (spec.equals("live_display")) return R.drawable.ic_livedisplay_auto;
         else if (spec.equals("heads_up")) return R.drawable.ic_qs_heads_up_on;
         else if (spec.equals("battery_saver")) return R.drawable.ic_qs_battery_saver_on;
         else if (spec.equals("caffeine")) return R.drawable.ic_qs_caffeine_on;
@@ -495,8 +505,8 @@ public class QSTileHost implements QSTile.Host, Tunable {
 
     void updateCustomTile(StatusBarPanelCustomTile sbc) {
         synchronized (mTiles) {
-            if (mTiles.containsKey(sbc.getKey())) {
-                QSTile<?> tile = mTiles.get(sbc.getKey());
+            if (mTiles.containsKey(sbc.persistableKey())) {
+                QSTile<?> tile = mTiles.get(sbc.persistableKey());
                 if (tile instanceof CustomQSTile) {
                     CustomQSTile qsTile = (CustomQSTile) tile;
                     qsTile.update(sbc);
@@ -508,8 +518,8 @@ public class QSTileHost implements QSTile.Host, Tunable {
     void addCustomTile(StatusBarPanelCustomTile sbc) {
         synchronized (mTiles) {
             mCustomTileData.add(new CustomTileData.Entry(sbc));
-            mTileSpecs.add(sbc.getKey());
-            mTiles.put(sbc.getKey(), new CustomQSTile(this, sbc));
+            mTileSpecs.add(sbc.persistableKey());
+            mTiles.put(sbc.persistableKey(), new CustomQSTile(this, sbc));
             if (mCallback != null) {
                 mCallback.onTilesChanged();
             }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
index b9e9292..975cb77 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
@@ -45,9 +45,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
     public static final long ANIMATION_DURATION = 220;
     public static final Interpolator KEYGUARD_FADE_OUT_INTERPOLATOR
             = new PathInterpolator(0f, 0, 0.7f, 1f);
+    public static final float SCRIM_BEHIND_ALPHA_KEYGUARD = 0.45f;
 
     private static final float SCRIM_BEHIND_ALPHA = 0.62f;
-    private static final float SCRIM_BEHIND_ALPHA_KEYGUARD = 0.45f;
     private static final float SCRIM_BEHIND_ALPHA_UNLOCKING = 0.2f;
     private static final float SCRIM_IN_FRONT_ALPHA = 0.75f;
     private static final int TAG_KEY_ANIM = R.id.scrim;
@@ -255,7 +255,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
         }
     }
 
-    private void setScrimBehindColor(float alpha) {
+    public void setScrimBehindColor(float alpha) {
         setScrimColor(mScrimBehind, alpha);
     }
 
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
index 339d469..f9b1f38 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarHeaderView.java
@@ -76,6 +76,7 @@ import java.text.NumberFormat;
 
 import cyanogenmod.app.StatusBarPanelCustomTile;
 import cyanogenmod.providers.CMSettings;
+import cyanogenmod.weather.util.WeatherUtils;
 import org.cyanogenmod.internal.logging.CMMetricsLogger;
 
 /**
@@ -280,6 +281,10 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
         mClockExpandedSize = getResources().getDimensionPixelSize(R.dimen.qs_time_expanded_size);
         mClockCollapsedScaleFactor = (float) mClockCollapsedSize / (float) mClockExpandedSize;
 
+        if (mEditTileDoneText != null) {
+            mEditTileDoneText.setText(R.string.quick_settings_done);
+        }
+
         updateClockScale();
         updateClockCollapsedMargin();
     }
@@ -515,12 +520,12 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
 
     @Override
     public void onWeatherChanged(WeatherController.WeatherInfo info) {
-        if (info.temp == null || info.condition == null) {
+        if (Double.isNaN(info.temp) || info.condition == null) {
             mWeatherLine1.setText(null);
         } else {
             mWeatherLine1.setText(mContext.getString(
                     R.string.status_bar_expanded_header_weather_format,
-                    info.temp,
+                    WeatherUtils.formatTemperature(info.temp, info.tempUnit),
                     info.condition));
         }
         mWeatherLine2.setText(info.city);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 19f2b09..96cf093 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -83,8 +83,6 @@ public class StatusBarKeyguardViewManager {
     private boolean mDeviceWillWakeUp;
     private boolean mDeferScrimFadeOut;
 
-    private View mUnlockFab;
-
     public StatusBarKeyguardViewManager(Context context, ViewMediatorCallback callback,
             LockPatternUtils lockPatternUtils) {
         mContext = context;
@@ -103,7 +101,7 @@ public class StatusBarKeyguardViewManager {
         if (mBouncer != null) mBouncer.removeView();
         mFingerprintUnlockController = fingerprintUnlockController;
         mBouncer = new KeyguardBouncer(mContext, mViewMediatorCallback, mLockPatternUtils,
-                mStatusBarWindowManager, container);
+                mStatusBarWindowManager, container, mPhoneStatusBar);
     }
 
     /**
@@ -257,8 +255,8 @@ public class StatusBarKeyguardViewManager {
         mOccluded = occluded;
         mStatusBarWindowManager.setKeyguardOccluded(occluded);
         mPhoneStatusBar.getVisualizer().setOccluded(occluded);
-        if (mUnlockFab != null && mUnlockFab.isAttachedToWindow() && !occluded) {
-            hideUnlockFab();
+        if (!occluded) {
+            mPhoneStatusBar.mKeyguardBottomArea.setVisibility(View.GONE);
         }
         reset(false);
     }
@@ -393,20 +391,9 @@ public class StatusBarKeyguardViewManager {
         }
     }
 
-    /**
-     * Dismisses the keyguard by going to the next screen or making it gone.
-     */
     public void dismiss() {
-        dismiss(false);
-    }
-
-    public void dismiss(boolean focusKeyguardExternalView) {
-        if ((mDeviceInteractive || mDeviceWillWakeUp) && !focusKeyguardExternalView) {
+        if ((mDeviceInteractive || mDeviceWillWakeUp)) {
             showBouncer();
-            hideUnlockFab();
-        } else if (focusKeyguardExternalView) {
-            showUnlockFab();
-            mStatusBarWindowManager.setKeyguardExternalViewFocus(true);
         }
     }
 
@@ -542,7 +529,7 @@ public class StatusBarKeyguardViewManager {
 
     public boolean shouldDisableWindowAnimationsForUnlock() {
         return mPhoneStatusBar.isInLaunchTransition() ||
-                mPhoneStatusBar.mNotificationPanel.hasExternalKeyguardView();
+                mPhoneStatusBar.isShowingLiveLockScreenView();
     }
 
     public boolean isGoingToNotificationShade() {
@@ -566,7 +553,7 @@ public class StatusBarKeyguardViewManager {
                 false /* delayed */, speedUpFactor);
         if (mStatusBarWindowManager.keyguardExternalViewHasFocus()) {
             mStatusBarWindowManager.setKeyguardExternalViewFocus(false);
-            dismiss(false);
+            dismiss();
         }
     }
 
@@ -591,50 +578,6 @@ public class StatusBarKeyguardViewManager {
     }
 
     public void setKeyguardExternalViewFocus(boolean hasFocus) {
-        if (hasFocus) {
-            showUnlockFab();
-        } else {
-            hideUnlockFab();
-        }
         mStatusBarWindowManager.setKeyguardExternalViewFocus(hasFocus);
     }
-
-    private void showUnlockFab() {
-        if (mUnlockFab == null) {
-            mUnlockFab = View.inflate(mContext, R.layout.unlock_fab, null);
-        }
-        if (!mUnlockFab.isAttachedToWindow()) {
-            WindowManager.LayoutParams lp = new WindowManager.LayoutParams(
-                    WindowManager.LayoutParams.TYPE_STATUS_BAR_PANEL,
-                    WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
-                            | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH
-                            | WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS
-                            | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN,
-                    PixelFormat.TRANSLUCENT);
-            lp.flags |= WindowManager.LayoutParams.FLAG_HARDWARE_ACCELERATED;
-            lp.gravity = Gravity.BOTTOM | Gravity.CENTER_HORIZONTAL;
-            lp.setTitle("UnlockFab");
-            lp.packageName = mContext.getPackageName();
-            lp.width = lp.height =
-                    mContext.getResources().getDimensionPixelSize(R.dimen.unlock_fab_size);
-            WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
-            wm.addView(mUnlockFab, lp);
-            mUnlockFab.setOnClickListener(mUnlockFabClickListener);
-        }
-    }
-
-    private void hideUnlockFab() {
-        if (mUnlockFab != null && mUnlockFab.isAttachedToWindow()) {
-            WindowManager wm = (WindowManager) mContext.getSystemService(Context.WINDOW_SERVICE);
-            wm.removeViewImmediate(mUnlockFab);
-        }
-    }
-
-    private View.OnClickListener mUnlockFabClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            mStatusBarWindowManager.setKeyguardExternalViewFocus(false);
-            dismiss(false);
-        }
-    };
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
index 9a991f4..f0d7828 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowManager.java
@@ -18,11 +18,14 @@ package com.android.systemui.statusbar.phone;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.database.ContentObserver;
 import android.graphics.Point;
 import android.graphics.PixelFormat;
+import android.os.Handler;
 import android.os.SystemProperties;
-import android.util.Log;
+import android.provider.Settings;
 import android.view.Gravity;
 import android.view.Display;
 import android.view.SurfaceSession;
@@ -35,8 +38,8 @@ import com.android.systemui.keyguard.KeyguardViewMediator;
 import com.android.systemui.statusbar.BaseStatusBar;
 import com.android.systemui.statusbar.StatusBarState;
 import com.android.systemui.statusbar.policy.KeyguardMonitor;
+import com.android.systemui.statusbar.policy.LiveLockScreenController;
 import cyanogenmod.providers.CMSettings;
-import org.cyanogenmod.internal.util.CmLockPatternUtils;
 
 import java.io.FileDescriptor;
 import java.io.PrintWriter;
@@ -53,8 +56,9 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
     private WindowManager.LayoutParams mLp;
     private WindowManager.LayoutParams mLpChanged;
     private int mBarHeight;
-    private final boolean mKeyguardScreenRotation;
+    private boolean mKeyguardScreenRotation;
     private final float mScreenBrightnessDoze;
+    private final boolean mBlurSupported;
 
     private boolean mKeyguardBlurEnabled;
     private boolean mShowingMedia;
@@ -62,6 +66,7 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
     private final SurfaceSession mFxSession;
 
     private final KeyguardMonitor mKeyguardMonitor;
+    private int mCurrentOrientation;
 
     private static final int TYPE_LAYER_MULTIPLIER = 10000; // refer to WindowManagerService.TYPE_LAYER_MULTIPLIER
     private static final int TYPE_LAYER_OFFSET = 1000;      // refer to WindowManagerService.TYPE_LAYER_OFFSET
@@ -69,6 +74,7 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
     private static final int STATUS_BAR_LAYER = 16 * TYPE_LAYER_MULTIPLIER + TYPE_LAYER_OFFSET;
 
     private final State mCurrentState = new State();
+    private LiveLockScreenController mLiveLockScreenController;
 
     public StatusBarWindowManager(Context context, KeyguardMonitor kgm) {
         mContext = context;
@@ -76,18 +82,23 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
         mKeyguardScreenRotation = shouldEnableKeyguardScreenRotation();
         mScreenBrightnessDoze = mContext.getResources().getInteger(
                 com.android.internal.R.integer.config_screenBrightnessDoze) / 255f;
+        mBlurSupported = mContext.getResources().getBoolean(
+                com.android.internal.R.bool.config_ui_blur_enabled);
 
         mKeyguardMonitor = kgm;
         mKeyguardMonitor.addCallback(this);
-        mKeyguardBlurEnabled = mContext.getResources().getBoolean(
-                com.android.internal.R.bool.config_ui_blur_enabled);
         mFxSession = new SurfaceSession();
     }
 
     private boolean shouldEnableKeyguardScreenRotation() {
         Resources res = mContext.getResources();
+        boolean enableAccelerometerRotation = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.ACCELEROMETER_ROTATION, 1) != 0;
+        boolean enableLockScreenRotation = CMSettings.System.getInt(mContext.getContentResolver(),
+                CMSettings.System.LOCKSCREEN_ROTATION, 0) != 0;
         return SystemProperties.getBoolean("lockscreen.rot_override", false)
-                || res.getBoolean(R.bool.config_enableLockScreenRotation);
+                || (res.getBoolean(R.bool.config_enableLockScreenRotation)
+                && (enableLockScreenRotation && enableAccelerometerRotation));
     }
 
     /**
@@ -121,27 +132,34 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
         mLpChanged = new WindowManager.LayoutParams();
         mLpChanged.copyFrom(mLp);
 
-        if (mKeyguardBlurEnabled) {
+        mKeyguardBlurEnabled = mBlurSupported ?
+                CMSettings.Secure.getInt(mContext.getContentResolver(),
+                CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED, 1) == 1 : false;
+        if (mBlurSupported) {
             Display display = mWindowManager.getDefaultDisplay();
             Point xy = new Point();
             display.getRealSize(xy);
+            mCurrentOrientation = mContext.getResources().getConfiguration().orientation;
             mKeyguardBlur = new BlurLayer(mFxSession, xy.x, xy.y, "KeyGuard");
             if (mKeyguardBlur != null) {
                 mKeyguardBlur.setLayer(STATUS_BAR_LAYER - 2);
             }
         }
+
+        SettingsObserver observer = new SettingsObserver(new Handler());
+        observer.observe(mContext);
     }
 
     private void applyKeyguardFlags(State state) {
         if (state.keyguardShowing) {
             mLpChanged.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
-            if (!mKeyguardBlurEnabled) {
+            if (!mKeyguardBlurEnabled || mShowingMedia) {
                 mLpChanged.flags |= WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
             }
         } else {
             mLpChanged.flags &= ~WindowManager.LayoutParams.FLAG_SHOW_WALLPAPER;
             mLpChanged.privateFlags &= ~WindowManager.LayoutParams.PRIVATE_FLAG_KEYGUARD;
-            if (mKeyguardBlurEnabled) {
+            if (mKeyguardBlurEnabled && mKeyguardBlur != null) {
                 mKeyguardBlur.hide();
             }
         }
@@ -260,8 +278,7 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
         boolean isblur = false;
         if (mCurrentState.keyguardShowing && mKeyguardBlurEnabled
                 && !mCurrentState.keyguardOccluded
-                && !mShowingMedia
-                && !isShowingLiveLockScreen()) {
+                && !mShowingMedia) {
             isblur = true;
         }
         if (mKeyguardBlur != null) {
@@ -341,11 +358,21 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
     }
 
     public void setKeyguardExternalViewFocus(boolean hasFocus) {
-        mCurrentState.keyguardExternalViewHasFocus = hasFocus;
+        mLiveLockScreenController.onLiveLockScreenFocusChanged(hasFocus);
         // make the keyguard occluded so the external view gets full focus
         setKeyguardOccluded(hasFocus);
     }
 
+    public void onConfigurationChanged(Configuration newConfig) {
+        if (mKeyguardBlur != null && newConfig.orientation != mCurrentOrientation) {
+            Display display = mWindowManager.getDefaultDisplay();
+            Point xy = new Point();
+            display.getRealSize(xy);
+            mKeyguardBlur.setSize(xy.x, xy.y);
+            mCurrentOrientation = newConfig.orientation;
+        }
+    }
+
     /**
      * @param state The {@link StatusBarState} of the status bar.
      */
@@ -394,14 +421,11 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
     }
 
     public boolean keyguardExternalViewHasFocus() {
-        return mCurrentState.keyguardExternalViewHasFocus;
+        return mLiveLockScreenController.getLiveLockScreenHasFocus();
     }
 
-    private boolean isShowingLiveLockScreen() {
-        CmLockPatternUtils lockPatternUtils = new CmLockPatternUtils(mContext);
-        return (CMSettings.Secure.getInt(mContext.getContentResolver(),
-                CMSettings.Secure.LIVE_LOCK_SCREEN_ENABLED, 0) == 1)
-                && lockPatternUtils.isThirdPartyKeyguardEnabled();
+    public void setLiveLockscreenController(LiveLockScreenController liveLockScreenController) {
+        mLiveLockScreenController = liveLockScreenController;
     }
 
     private static class State {
@@ -418,7 +442,6 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
         boolean forceStatusBarVisible;
         boolean forceCollapsed;
         boolean forceDozeBrightness;
-        boolean keyguardExternalViewHasFocus;
 
         /**
          * The {@link BaseStatusBar} state from the status bar.
@@ -455,4 +478,39 @@ public class StatusBarWindowManager implements KeyguardMonitor.Callback {
             return result.toString();
         }
     }
+
+    private class SettingsObserver extends ContentObserver {
+        public SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        public void observe(Context context) {
+            context.getContentResolver().registerContentObserver(
+                    CMSettings.Secure.getUriFor(CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED),
+                    false,
+                    this);
+            context.getContentResolver().registerContentObserver(
+                    Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION),
+                    false,
+                    this);
+            context.getContentResolver().registerContentObserver(
+                    CMSettings.System.getUriFor(CMSettings.System.LOCKSCREEN_ROTATION),
+                    false,
+                    this);
+        }
+
+        public void unobserve(Context context) {
+            context.getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            mKeyguardBlurEnabled = mBlurSupported ?
+                    CMSettings.Secure.getInt(mContext.getContentResolver(),
+                    CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED, 1) == 1 : false;
+            mKeyguardScreenRotation = shouldEnableKeyguardScreenRotation();
+            // update the state
+            apply(mCurrentState);
+        }
+    }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/ViewLinker.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ViewLinker.java
new file mode 100644
index 0000000..48457c6
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/ViewLinker.java
@@ -0,0 +1,76 @@
+package com.android.systemui.statusbar.phone;
+
+import android.view.View;
+
+/*
+    Allows mirroring of view states such as alpha, translation...etc
+ */
+public class ViewLinker<T extends View & ViewLinker.ViewLinkerParent> {
+
+    public static final int LINK_ALPHA = 0x1;
+    public static final int LINK_TRANSLATION = 0x2;
+
+    private final LinkInfo[] mLinkedViews;
+    private final T mParent;
+
+    public interface ViewLinkerCallback {
+        void onAlphaChanged(float alpha);
+        void onTranslationXChanged(float translationX);
+    }
+
+    public interface ViewLinkerParent {
+        void registerLinker(ViewLinkerCallback callback);
+    }
+
+    public static class LinkInfo {
+        private View mView;
+        private int mFlags;
+        public LinkInfo(View v, int linkFlags) {
+            mView = v;
+            mFlags = linkFlags;
+        }
+        private boolean supportsFlag(int flag) {
+            return (mFlags & flag) != 0;
+        }
+    }
+
+    private ViewLinkerCallback mCallback = new ViewLinkerCallback() {
+        @Override
+        public void onAlphaChanged(float alpha) {
+            for (LinkInfo v : mLinkedViews) {
+                if (v.supportsFlag(LINK_ALPHA)) {
+                    v.mView.setAlpha(alpha);
+                }
+            }
+        }
+
+        @Override
+        public void onTranslationXChanged(float translationX) {
+            for (LinkInfo v : mLinkedViews) {
+                if (v.supportsFlag(LINK_TRANSLATION)) {
+                    v.mView.setTranslationX(translationX);
+                }
+            }
+        }
+    };
+
+    public ViewLinker(T parent, LinkInfo... viewsToLink) {
+        mLinkedViews = viewsToLink;
+        mParent = parent;
+        ensureParentNotInLink();
+        parent.registerLinker(mCallback);
+    }
+
+    private void ensureParentNotInLink() {
+        for (LinkInfo v : mLinkedViews) {
+            if (v.mView == mParent) {
+                throw new IllegalStateException("Parent cannot be" +
+                        "one of the linked views");
+            }
+        }
+    }
+
+    public View getParent() {
+        return mParent;
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java
new file mode 100644
index 0000000..2f290cc
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/LiveLockScreenController.java
@@ -0,0 +1,349 @@
+package com.android.systemui.statusbar.policy;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.PowerManager;
+import android.os.RemoteException;
+import android.os.ServiceManager;
+import android.util.EventLog;
+
+import android.view.View;
+import com.android.keyguard.KeyguardUpdateMonitor;
+import com.android.systemui.EventLogTags;
+import com.android.systemui.SystemUIApplication;
+import com.android.systemui.keyguard.KeyguardViewMediator;
+import com.android.systemui.statusbar.StatusBarState;
+import com.android.systemui.statusbar.phone.NotificationPanelView;
+import com.android.systemui.statusbar.phone.PhoneStatusBar;
+
+import cyanogenmod.app.CMContextConstants;
+import cyanogenmod.app.ILiveLockScreenChangeListener;
+import cyanogenmod.app.ILiveLockScreenManager;
+import cyanogenmod.app.LiveLockScreenInfo;
+import cyanogenmod.externalviews.KeyguardExternalView;
+
+import java.util.Objects;
+
+public class LiveLockScreenController {
+    private static final String TAG = LiveLockScreenController.class.getSimpleName();
+
+    private ILiveLockScreenManager mLLSM;
+    private Context mContext;
+    private PhoneStatusBar mBar;
+    private NotificationPanelView mPanelView;
+    private ComponentName mLiveLockScreenComponentName;
+    private KeyguardExternalView mLiveLockScreenView;
+    private Handler mHandler;
+
+    private int mStatusBarState;
+
+    private PowerManager mPowerManager;
+
+    private boolean mLlsHasFocus = false;
+
+    private boolean mScreenOnAndInteractive;
+
+    private String mLlsName;
+    private KeyguardViewMediator mKeyguardViewMediator;
+
+    public LiveLockScreenController(Context context, PhoneStatusBar bar,
+            NotificationPanelView panelView) {
+        mContext = context;
+        mHandler = new Handler(Looper.getMainLooper());
+
+        mLLSM = ILiveLockScreenManager.Stub.asInterface(ServiceManager.getService(
+                CMContextConstants.CM_LIVE_LOCK_SCREEN_SERVICE));
+        mBar = bar;
+        mPanelView = panelView;
+        mPowerManager = context.getSystemService(PowerManager.class);
+        mKeyguardViewMediator = ((SystemUIApplication)
+                mContext.getApplicationContext()).getComponent(KeyguardViewMediator.class);
+        registerListener();
+        try {
+            LiveLockScreenInfo llsInfo = mLLSM.getCurrentLiveLockScreen();
+            if (llsInfo != null && llsInfo.component != null) {
+                updateLiveLockScreenView(llsInfo.component);
+            }
+        } catch (RemoteException e) {
+            /* ignore */
+        }
+    }
+
+    public void cleanup() {
+        unregisterListener();
+        mPanelView = null;
+        if (mLiveLockScreenView != null) {
+            mLiveLockScreenView.setProviderComponent(null);
+        }
+        mLiveLockScreenView = null;
+        mLiveLockScreenComponentName = null;
+    }
+
+    public void setBarState(int statusBarState) {
+        if (mStatusBarState != StatusBarState.SHADE && statusBarState == StatusBarState.SHADE) {
+            // going from KEYGUARD or SHADE_LOCKED to SHADE so device has been unlocked
+            onKeyguardDismissed();
+        }
+
+        if (statusBarState == StatusBarState.KEYGUARD) {
+            mBar.getScrimController().forceHideScrims(false);
+        }
+
+        mStatusBarState = statusBarState;
+        if (statusBarState == StatusBarState.KEYGUARD ||
+                statusBarState == StatusBarState.SHADE_LOCKED) {
+            if (mLiveLockScreenComponentName != null) {
+                if (mLiveLockScreenView == null) {
+                    mLiveLockScreenView =
+                            getExternalKeyguardView(mLiveLockScreenComponentName);
+                    if (mLiveLockScreenView != null) {
+                        mLiveLockScreenView.registerKeyguardExternalViewCallback(
+                                mExternalKeyguardViewCallbacks);
+                    }
+                }
+                if (mLiveLockScreenView != null && !mLiveLockScreenView.isAttachedToWindow()) {
+                    mBar.updateRowStates();
+                    mPanelView.addView(mLiveLockScreenView, 0);
+                }
+            }
+        } else {
+            if (isShowingLiveLockScreenView() && !mBar.isKeyguardInputRestricted()) {
+                mPanelView.removeView(mLiveLockScreenView);
+            }
+            mLlsHasFocus = false;
+        }
+    }
+
+    private ILiveLockScreenChangeListener mChangeListener =
+            new ILiveLockScreenChangeListener.Stub() {
+        @Override
+        public void onLiveLockScreenChanged(LiveLockScreenInfo llsInfo) throws RemoteException {
+            if (mPanelView != null) {
+                updateLiveLockScreenView(llsInfo != null ? llsInfo.component : null);
+            }
+        }
+    };
+
+    private void registerListener() {
+        try {
+            mLLSM.registerChangeListener(mChangeListener);
+        } catch (RemoteException e) {
+            /* ignore */
+        }
+    }
+
+    private void unregisterListener() {
+        try {
+            mLLSM.unregisterChangeListener(mChangeListener);
+        } catch (RemoteException e) {
+            /* ignore */
+        }
+    }
+
+    private KeyguardExternalView getExternalKeyguardView(ComponentName componentName) {
+        try {
+            return new KeyguardExternalView(mContext, null, componentName);
+        } catch (Exception e) {
+            // just return null below and move on
+        }
+        return null;
+    }
+
+    private KeyguardExternalView.KeyguardExternalViewCallbacks mExternalKeyguardViewCallbacks =
+            new KeyguardExternalView.KeyguardExternalViewCallbacks() {
+        @Override
+        public boolean requestDismiss() {
+            if (isShowingLiveLockScreenView()) {
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mBar.showKeyguard();
+                        mBar.showBouncer();
+                    }
+                });
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public boolean requestDismissAndStartActivity(final Intent intent) {
+            if (isShowingLiveLockScreenView()) {
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mBar.startActivityDismissingKeyguard(intent, false, true, true,
+                                null);
+                    }
+                });
+                return true;
+            }
+            return false;
+        }
+
+        @Override
+        public void providerDied() {
+            mLiveLockScreenView.unregisterKeyguardExternalViewCallback(
+                    mExternalKeyguardViewCallbacks);
+            mLiveLockScreenView = null;
+            // make sure we're showing the notification panel if the LLS crashed while it had focus
+            if (mLlsHasFocus) {
+                mLlsHasFocus = false;
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mBar.showKeyguard();
+                    }
+                });
+            }
+        }
+
+        @Override
+        public void slideLockscreenIn() {
+            if (mLlsHasFocus) {
+                mHandler.post(new Runnable() {
+                    @Override
+                    public void run() {
+                        mBar.showKeyguard();
+                    }
+                });
+            }
+        }
+    };
+
+    public boolean isShowingLiveLockScreenView() {
+        return mLiveLockScreenView != null && mLiveLockScreenView.isAttachedToWindow();
+    }
+
+    public boolean isLiveLockScreenInteractive() {
+        return mLiveLockScreenView != null && mLiveLockScreenView.isInteractive();
+    }
+
+    public KeyguardExternalView getLiveLockScreenView() {
+        return mLiveLockScreenView;
+    }
+
+    public void onScreenTurnedOn() {
+        mScreenOnAndInteractive = mPowerManager.isInteractive();
+        if (mScreenOnAndInteractive) {
+            if (mLiveLockScreenView != null) mLiveLockScreenView.onScreenTurnedOn();
+            EventLog.writeEvent(EventLogTags.SYSUI_LLS_KEYGUARD_SHOWING, 1);
+        }
+    }
+
+    public void onScreenTurnedOff() {
+        if (mScreenOnAndInteractive) {
+            if (mLiveLockScreenView != null) mLiveLockScreenView.onScreenTurnedOff();
+            if (mStatusBarState != StatusBarState.SHADE) {
+                EventLog.writeEvent(EventLogTags.SYSUI_LLS_KEYGUARD_SHOWING, 0);
+            }
+            mScreenOnAndInteractive = false;
+        }
+    }
+
+    public void onLiveLockScreenFocusChanged(boolean hasFocus) {
+        mKeyguardViewMediator.notifyKeyguardPanelFocusChanged(hasFocus);
+        if (mLiveLockScreenView != null) {
+            // make sure the LLS knows where the notification panel is
+            mLiveLockScreenView.onLockscreenSlideOffsetChanged(hasFocus ? 0f : 1f);
+        }
+        // don't log focus changes when screen is not interactive
+        if (hasFocus != mLlsHasFocus && mPowerManager.isInteractive()) {
+            EventLog.writeEvent(EventLogTags.SYSUI_LLS_NOTIFICATION_PANEL_SHOWN,
+                    hasFocus ? 0 : 1);
+        }
+        // Hide statusbar and scrim if live lockscreen
+        // currently has focus
+        mBar.setStatusBarViewVisibility(!hasFocus);
+        mBar.getScrimController().forceHideScrims(hasFocus);
+        mLlsHasFocus = hasFocus;
+    }
+
+    public void onKeyguardDismissed() {
+        if (mLiveLockScreenView != null) mLiveLockScreenView.onKeyguardDismissed();
+        EventLog.writeEvent(EventLogTags.SYSUI_LLS_KEYGUARD_DISMISSED, mLlsHasFocus ? 1 : 0);
+        // Ensure we reset visibility when keyguard is dismissed
+        mBar.setStatusBarViewVisibility(true);
+        mBar.getScrimController().forceHideScrims(false);
+    }
+
+    public boolean getLiveLockScreenHasFocus() {
+        return mLlsHasFocus;
+    }
+
+    public String getLiveLockScreenName() {
+        return mLlsName;
+    }
+
+    private String getLlsNameFromComponentName(ComponentName cn) {
+        if (cn == null) return null;
+
+        PackageManager pm = mContext.getPackageManager();
+        Intent intent = new Intent();
+        intent.setComponent(cn);
+        ResolveInfo ri = pm.resolveService(intent, 0);
+        return ri != null ? ri.serviceInfo.loadLabel(pm).toString() : null;
+    }
+
+    private Runnable mAddNewLiveLockScreenRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (mLiveLockScreenComponentName != null) {
+                mLiveLockScreenView =
+                        getExternalKeyguardView(mLiveLockScreenComponentName);
+                mLiveLockScreenView.registerKeyguardExternalViewCallback(
+                        mExternalKeyguardViewCallbacks);
+                if (mStatusBarState != StatusBarState.SHADE) {
+                    mPanelView.addView(mLiveLockScreenView);
+                    mLiveLockScreenView.onKeyguardShowing(true);
+                }
+            } else {
+                mLiveLockScreenView = null;
+            }
+        }
+    };
+
+    private void updateLiveLockScreenView(final ComponentName cn) {
+        mHandler.post(new Runnable() {
+            @Override
+            public void run() {
+                // If mThirdPartyKeyguardViewComponent differs from cn, go ahead and update
+                if (!Objects.equals(mLiveLockScreenComponentName, cn)) {
+                    mLiveLockScreenComponentName = cn;
+                    mLlsName = getLlsNameFromComponentName(cn);
+                    if (mLiveLockScreenView != null) {
+                        mLiveLockScreenView.unregisterKeyguardExternalViewCallback(
+                                mExternalKeyguardViewCallbacks);
+                        // setProviderComponent(null) will unbind the existing service
+                        mLiveLockScreenView.setProviderComponent(null);
+                        if (mPanelView.indexOfChild(mLiveLockScreenView) >= 0) {
+                            mLiveLockScreenView.registerOnWindowAttachmentChangedListener(
+                                    new KeyguardExternalView.OnWindowAttachmentChangedListener() {
+                                        @Override
+                                        public void onAttachedToWindow() {
+                                        }
+
+                                        @Override
+                                        public void onDetachedFromWindow() {
+                                            mLiveLockScreenView
+                                                    .unregisterOnWindowAttachmentChangedListener(
+                                                            this);
+                                            mHandler.post(mAddNewLiveLockScreenRunnable);
+                                        }
+                                    }
+                            );
+                            mPanelView.removeView(mLiveLockScreenView);
+                        } else {
+                            mAddNewLiveLockScreenRunnable.run();
+                        }
+                    }
+                }
+            }
+        });
+    }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
index a8e977f..f7d6f85 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/MobileSignalController.java
@@ -279,13 +279,15 @@ public class MobileSignalController extends SignalController<
     }
 
     private boolean isRoaming() {
-        if (isCdma()) {
+        if (mServiceState == null) {
+            return false;
+        } else if (isCdma()) {
             final int iconMode = mServiceState.getCdmaEriIconMode();
             return mServiceState.getCdmaEriIconIndex() != EriInfo.ROAMING_INDICATOR_OFF
                     && (iconMode == EriInfo.ROAMING_ICON_MODE_NORMAL
                         || iconMode == EriInfo.ROAMING_ICON_MODE_FLASH);
         } else {
-            return mServiceState != null && mServiceState.getRoaming();
+            return mServiceState.getRoaming();
         }
     }
 
@@ -395,7 +397,8 @@ public class MobileSignalController extends SignalController<
             mCurrentState.iconGroup = mDefaultIcons;
         }
         mCurrentState.dataConnected = mCurrentState.connected
-                && mDataState == TelephonyManager.DATA_CONNECTED;
+                && mDataState == TelephonyManager.DATA_CONNECTED
+                && mCurrentState.dataSim;
 
         mCurrentState.showSeparateRoaming = false;
         if (isCarrierNetworkChangeActive()) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherController.java
index 1fa4956..0f71bcc 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherController.java
@@ -25,8 +25,9 @@ public interface WeatherController {
         void onWeatherChanged(WeatherInfo temp);
     }
     public static class WeatherInfo {
-        public String temp = null;
+        public double temp = Double.NaN;
         public String city = null;
         public String condition = null;
+        public int tempUnit;
     }
 }
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherControllerImpl.java
index 288bc7e..1a798f0 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/WeatherControllerImpl.java
@@ -16,43 +16,49 @@
 
 package com.android.systemui.statusbar.policy;
 
-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.database.ContentObserver;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Handler;
-import android.provider.Settings;
 import android.util.Log;
+import cyanogenmod.providers.CMSettings;
+import cyanogenmod.providers.WeatherContract;
+import cyanogenmod.weather.CMWeatherManager;
+import cyanogenmod.weather.util.WeatherUtils;
 
 import java.util.ArrayList;
 
+import static cyanogenmod.providers.WeatherContract.WeatherColumns.CURRENT_CITY;
+import static cyanogenmod.providers.WeatherContract.WeatherColumns.CURRENT_CONDITION;
+import static cyanogenmod.providers.WeatherContract.WeatherColumns.CURRENT_TEMPERATURE;
+import static cyanogenmod.providers.WeatherContract.WeatherColumns.CURRENT_TEMPERATURE_UNIT;
+import static cyanogenmod.providers.WeatherContract.WeatherColumns.TempUnit.CELSIUS;
+import static cyanogenmod.providers.WeatherContract.WeatherColumns.TempUnit.FAHRENHEIT;
+
 public class WeatherControllerImpl implements WeatherController {
 
     private static final String TAG = WeatherController.class.getSimpleName();
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    private WeatherContentObserver mWeatherContentObserver;
+    private Handler mHandler;
+    private int mWeatherUnit;
+    private Uri mWeatherTempetarureUri;
 
     public static final ComponentName COMPONENT_WEATHER_FORECAST = new ComponentName(
             "com.cyanogenmod.lockclock", "com.cyanogenmod.lockclock.weather.ForecastActivity");
-    public static final String ACTION_UPDATE_FINISHED
-            = "com.cyanogenmod.lockclock.action.WEATHER_UPDATE_FINISHED";
-    public static final String EXTRA_UPDATE_CANCELLED = "update_cancelled";
     public static final String ACTION_FORCE_WEATHER_UPDATE
             = "com.cyanogenmod.lockclock.action.FORCE_WEATHER_UPDATE";
-    public static final Uri CURRENT_WEATHER_URI
-            = Uri.parse("content://com.cyanogenmod.lockclock.weather.provider/weather/current");
-    public static final String[] WEATHER_PROJECTION = new String[]{
-            "temperature",
-            "city",
-            "condition"
+    private static final String[] WEATHER_PROJECTION = new String[]{
+            CURRENT_TEMPERATURE,
+            CURRENT_TEMPERATURE_UNIT,
+            CURRENT_CITY,
+            CURRENT_CONDITION
     };
 
     private final ArrayList<Callback> mCallbacks = new ArrayList<Callback>();
-    private final Receiver mReceiver = new Receiver();
     private final Context mContext;
 
     private WeatherInfo mCachedInfo = new WeatherInfo();
@@ -60,10 +66,16 @@ public class WeatherControllerImpl implements WeatherController {
     public WeatherControllerImpl(Context context) {
         mContext = context;
                 mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
+        mHandler = new Handler();
+        mWeatherContentObserver = new WeatherContentObserver(mHandler);
+        mWeatherTempetarureUri
+                = CMSettings.Global.getUriFor(CMSettings.Global.WEATHER_TEMPERATURE_UNIT);
+        mContext.getContentResolver().registerContentObserver(
+                WeatherContract.WeatherColumns.CURRENT_WEATHER_URI,true, mWeatherContentObserver);
+        mContext.getContentResolver().registerContentObserver(mWeatherTempetarureUri, true,
+                mWeatherContentObserver);
+        queryWeatherTempUnit();
         queryWeather();
-        final IntentFilter filter = new IntentFilter();
-        filter.addAction(ACTION_UPDATE_FINISHED);
-        mContext.registerReceiver(mReceiver, filter);
     }
 
     public void addCallback(Callback callback) {
@@ -85,17 +97,29 @@ public class WeatherControllerImpl implements WeatherController {
     }
 
     private void queryWeather() {
-        Cursor c = mContext.getContentResolver().query(CURRENT_WEATHER_URI, WEATHER_PROJECTION,
+        Cursor c = mContext.getContentResolver().query(
+                WeatherContract.WeatherColumns.CURRENT_WEATHER_URI, WEATHER_PROJECTION,
                 null, null, null);
         if (c == null) {
             if(DEBUG) Log.e(TAG, "cursor was null for temperature, forcing weather update");
+            //LockClock keeps track of the user settings (temp unit, search by geo location/city)
+            //so we delegate the responsibility of handling a weather update to LockClock
             mContext.sendBroadcast(new Intent(ACTION_FORCE_WEATHER_UPDATE));
         } else {
             try {
                 c.moveToFirst();
-                mCachedInfo.temp = c.getString(0);
-                mCachedInfo.city = c.getString(1);
-                mCachedInfo.condition = c.getString(2);
+                double temp = c.getDouble(0);
+                int reportedUnit = c.getInt(1);
+                if (reportedUnit == CELSIUS && mWeatherUnit == FAHRENHEIT) {
+                    temp = WeatherUtils.celsiusToFahrenheit(temp);
+                } else if (reportedUnit == FAHRENHEIT && mWeatherUnit == CELSIUS) {
+                    temp = WeatherUtils.fahrenheitToCelsius(temp);
+                }
+
+                mCachedInfo.temp = temp;
+                mCachedInfo.tempUnit = mWeatherUnit;
+                mCachedInfo.city = c.getString(2);
+                mCachedInfo.condition = c.getString(3);
             } finally {
                 c.close();
             }
@@ -108,19 +132,53 @@ public class WeatherControllerImpl implements WeatherController {
         }
     }
 
-    private final class Receiver extends BroadcastReceiver {
+    private class WeatherContentObserver extends ContentObserver {
+
+        public WeatherContentObserver(Handler handler) {
+            super(handler);
+        }
+
         @Override
-        public void onReceive(Context context, Intent intent) {
-            if (DEBUG) Log.d(TAG, "onReceive " + intent.getAction());
-            if (intent.hasExtra(EXTRA_UPDATE_CANCELLED)) {
-                if (intent.getBooleanExtra(EXTRA_UPDATE_CANCELLED, false)) {
-                    // no update
-                    return;
+        public void onChange(boolean selfChange, Uri uri) {
+            if (uri != null) {
+                if (uri.compareTo(WeatherContract.WeatherColumns.CURRENT_WEATHER_URI) == 0) {
+                    queryWeather();
+                    fireCallback();
+                } else if (uri.compareTo(mWeatherTempetarureUri) == 0) {
+                    queryWeatherTempUnit();
+                    fixCachedWeatherInfo();
+                    fireCallback();
+                } else {
+                    super.onChange(selfChange, uri);
                 }
             }
-            queryWeather();
-            fireCallback();
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            onChange(selfChange, null);
         }
     }
 
+    private void queryWeatherTempUnit() {
+        try {
+            mWeatherUnit = CMSettings.Global.getInt(mContext.getContentResolver(),
+                    CMSettings.Global.WEATHER_TEMPERATURE_UNIT);
+        } catch (CMSettings.CMSettingNotFoundException e) {
+            //CMSettingsProvider should have taken care of setting a default value for this setting
+            //so how is that we ended up here?? We need to set a valid temp unit anyway to keep
+            //this going
+            mWeatherUnit = WeatherContract.WeatherColumns.TempUnit.CELSIUS;
+        }
+    }
+
+    private void fixCachedWeatherInfo() {
+        if (mCachedInfo.tempUnit == CELSIUS && mWeatherUnit == FAHRENHEIT) {
+            mCachedInfo.temp = WeatherUtils.celsiusToFahrenheit(mCachedInfo.temp);
+            mCachedInfo.tempUnit = FAHRENHEIT;
+        } else if (mCachedInfo.tempUnit == FAHRENHEIT && mWeatherUnit == CELSIUS) {
+            mCachedInfo.temp = WeatherUtils.fahrenheitToCelsius(mCachedInfo.temp);
+            mCachedInfo.tempUnit = CELSIUS;
+        }
+    }
 }
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 2f04b42..b6e131a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -50,6 +50,7 @@ import com.android.systemui.statusbar.StatusBarState;
 import com.android.systemui.statusbar.phone.NotificationGroupManager;
 import com.android.systemui.statusbar.phone.PhoneStatusBar;
 import com.android.systemui.statusbar.phone.ScrimController;
+import com.android.systemui.statusbar.phone.ViewLinker;
 import com.android.systemui.statusbar.policy.HeadsUpManager;
 import com.android.systemui.statusbar.policy.ScrollAdapter;
 
@@ -63,7 +64,8 @@ import java.util.HashSet;
  */
 public class NotificationStackScrollLayout extends ViewGroup
         implements SwipeHelper.Callback, ExpandHelper.Callback, ScrollAdapter,
-        ExpandableView.OnHeightChangedListener, NotificationGroupManager.OnGroupChangeListener {
+        ExpandableView.OnHeightChangedListener, NotificationGroupManager.OnGroupChangeListener,
+        ViewLinker.ViewLinkerParent {
 
     private static final String TAG = "NotificationStackScrollLayout";
     private static final boolean DEBUG = false;
@@ -234,6 +236,7 @@ public class NotificationStackScrollLayout extends ViewGroup
     private boolean mForceNoOverlappingRendering;
     private NotificationOverflowContainer mOverflowContainer;
     private final ArrayList<Pair<ExpandableNotificationRow, Boolean>> mTmpList = new ArrayList<>();
+    private ViewLinker.ViewLinkerCallback mLinkerCallback;
 
     public NotificationStackScrollLayout(Context context) {
         this(context, null);
@@ -2879,6 +2882,23 @@ public class NotificationStackScrollLayout extends ViewGroup
         return !mForceNoOverlappingRendering && super.hasOverlappingRendering();
     }
 
+    @Override
+    public void registerLinker(ViewLinker.ViewLinkerCallback callback) {
+        mLinkerCallback = callback;
+    }
+
+    @Override
+    public void setAlpha(float alpha) {
+        super.setAlpha(alpha);
+        mLinkerCallback.onAlphaChanged(alpha);
+    }
+
+    @Override
+    public void setTranslationX(float translationX) {
+        super.setTranslationX(translationX);
+        mLinkerCallback.onTranslationXChanged(translationX);
+    }
+
     /**
      * A listener that is notified when some child locations might have changed.
      */
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java b/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java
index 9d63d08..53fbef7 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/QsTuner.java
@@ -163,7 +163,7 @@ public class QsTuner extends Fragment implements Callback {
 
         public CustomHost(Context context) {
             super(context, null, null, null, null, null, null, null, null, null,
-                    null, null, new BlankSecurityController());
+                    null, null, new BlankSecurityController(), null);
         }
 
         @Override
diff --git a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
index b2c90be..3e7477c 100644
--- a/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
+++ b/packages/SystemUI/src/com/android/systemui/tuner/TunerService.java
@@ -132,6 +132,12 @@ public class TunerService extends SystemUI {
 
     public void reloadSetting(Uri uri) {
         String key = mListeningUris.get(uri);
+
+        // Handle possible null keys
+        if (TextUtils.isEmpty(key)) {
+            return;
+        }
+
         String value;
         if (uri.getAuthority().equals(CMSettings.AUTHORITY)) {
             value = CMSettings.Secure.getStringForUser(mContentResolver, key, mCurrentUser);
diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
index 7d34cdc..baa5321 100644
--- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
+++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java
@@ -327,7 +327,7 @@ public class StorageNotification extends SystemUI {
 
         // Don't annoy when user dismissed in past.  (But make sure the disk is adoptable; we
         // used to allow snoozing non-adoptable disks too.)
-        if (rec.isSnoozed() && disk.isAdoptable()) {
+        if (rec == null || (rec.isSnoozed() && disk.isAdoptable())) {
             return null;
         }
 
@@ -364,6 +364,11 @@ public class StorageNotification extends SystemUI {
                     .setContentIntent(browseIntent)
                     .setCategory(Notification.CATEGORY_SYSTEM)
                     .setPriority(Notification.PRIORITY_LOW);
+            // USB disks notification can be persistent
+            if (disk.isUsb()) {
+                builder.setOngoing(mContext.getResources().getBoolean(
+                        R.bool.config_persistUsbDriveNotification));
+            }
             // Non-adoptable disks can't be snoozed.
             if (disk.isAdoptable()) {
                 builder.setDeleteIntent(buildSnoozeIntent(vol.getFsUuid()));
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
index 27c6601..9fda531 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
@@ -106,7 +106,6 @@ public class VolumeDialog {
     private final SpTexts mSpTexts;
     private final SparseBooleanArray mDynamic = new SparseBooleanArray();
     private final KeyguardManager mKeyguard;
-    private final AudioManager mAudioManager;
     private final int mExpandButtonAnimationDuration;
     private final ZenFooter mZenFooter;
     private final LayoutTransition mLayoutTransition;
@@ -139,7 +138,6 @@ public class VolumeDialog {
         mCallback = callback;
         mSpTexts = new SpTexts(mContext);
         mKeyguard = (KeyguardManager) context.getSystemService(Context.KEYGUARD_SERVICE);
-        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
 
         mDialog = new CustomDialog(mContext);
 
@@ -666,8 +664,7 @@ public class VolumeDialog {
     private void updateFooterH() {
         if (D.BUG) Log.d(TAG, "updateFooterH");
         final boolean wasVisible = mZenFooter.getVisibility() == View.VISIBLE;
-        final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF
-                && mAudioManager.isStreamAffectedByRingerMode(mActiveStream);
+        final boolean visible = mState.zenMode != Global.ZEN_MODE_OFF;
         if (wasVisible != visible && !visible) {
             prepareForCollapse();
         }
diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
index 9494e27..9269c1c 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogController.java
@@ -371,6 +371,7 @@ public class VolumeDialogController {
         updateZenModeW();
         updateEffectsSuppressorW(mNoMan.getEffectsSuppressor());
         updateZenModeConfigW();
+        updateLinkNotificationConfigW();
         mCallbacks.onStateChanged(mState);
     }
 
diff --git a/packages/SystemUI/tests/Android.mk b/packages/SystemUI/tests/Android.mk
index 7392869..25581e3 100644
--- a/packages/SystemUI/tests/Android.mk
+++ b/packages/SystemUI/tests/Android.mk
@@ -33,7 +33,9 @@ LOCAL_PACKAGE_NAME := SystemUITests
 LOCAL_STATIC_JAVA_LIBRARIES := mockito-target Keyguard
 LOCAL_STATIC_JAVA_LIBRARIES += org.cyanogenmod.platform.internal \
     android-support-v7-palette \
-    android-support-v4
+    android-support-v4 \
+    uicommon
+
 
 # sign this with platform cert, so this test is allowed to inject key events into
 # UI it doesn't own. This is necessary to allow screenshots to be taken
diff --git a/packages/VpnDialogs/res/values-as-rIN/strings.xml b/packages/VpnDialogs/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-as-rIN/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-ast-rES/strings.xml b/packages/VpnDialogs/res/values-ast-rES/strings.xml
index 2bc2c7e..7b17f14 100644
--- a/packages/VpnDialogs/res/values-ast-rES/strings.xml
+++ b/packages/VpnDialogs/res/values-ast-rES/strings.xml
@@ -15,7 +15,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
   <string name="prompt">Solicitú de conexón</string>
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
   <string name="warning"><xliff:g id="app">%s</xliff:g> quier facer una conexón VPN
         que permite monitorear el tráficu. Aceuta namái si confíes na fonte.
         <![CDATA[
@@ -24,13 +26,21 @@
         <img src="vpn_icon" />
         ]]> apaez arriba na pantalla cuando VPN ta activa.
     </string>
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
   <string name="legacy_title">VPN coneutada</string>
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
   <string name="configure">Configurar</string>
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
   <string name="disconnect">Desconeutar</string>
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
   <string name="session">Sesión:</string>
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
   <string name="duration">Duración:</string>
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
   <string name="data_transmitted">Unvióse:</string>
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
   <string name="data_received">Recibióse:</string>
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
   <string name="data_value_format">
         <xliff:g id="number">%1$s</xliff:g> bytes /
         <xliff:g id="number">%2$s</xliff:g> paquetes
diff --git a/packages/VpnDialogs/res/values-az-rAZ/strings.xml b/packages/VpnDialogs/res/values-az-rAZ/strings.xml
index fdeb06f..c568e94 100644
--- a/packages/VpnDialogs/res/values-az-rAZ/strings.xml
+++ b/packages/VpnDialogs/res/values-az-rAZ/strings.xml
@@ -16,9 +16,8 @@
 
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="prompt" msgid="8359175999006833462">"VPN bağlantısı yaratmaq üçün <xliff:g id="APP">%s</xliff:g> cəhdləri."</string>
-    <string name="warning" msgid="5470743576660160079">"Bunu həyata keçirməklə, siz tətbiqə bütün şəbəkə hərəkətinə qarışmağa icazə verirsiniz. "<b>" Tətbiqə güvənmirsizsə qəbul etməyin. "</b>" Əks halda, datanızın təhlükəli proqramlar tərəfindən ələ keçirilmə riskini alırsınız."</string>
-    <string name="accept" msgid="2889226408765810173">"Bu tətbiqə güvənirəm."</string>
+    <string name="prompt" msgid="3183836924226407828">"Bağlantı Sorğusu"</string>
+    <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> VPN bağlantı yaratmaq istəyir ki, bu da şəbəkə trafikini izləyə bilər. Yalnız mənbəyə güvəndiyiniz halda qəbul edin. VPN aktiv olan zaman &lt;br /&gt; &lt;br /&gt; &lt;img src=vpn_icon /&gt; ekranın yuxarısında görünür."</string>
     <string name="legacy_title" msgid="192936250066580964">"VPN qoşuludur"</string>
     <string name="configure" msgid="4905518375574791375">"Konfiqurasiya edin"</string>
     <string name="disconnect" msgid="971412338304200056">"Əlaqəni kəs"</string>
diff --git a/packages/VpnDialogs/res/values-be/strings.xml b/packages/VpnDialogs/res/values-be/strings.xml
index 075251f..4903231 100644
--- a/packages/VpnDialogs/res/values-be/strings.xml
+++ b/packages/VpnDialogs/res/values-be/strings.xml
@@ -15,7 +15,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
   <string name="prompt">Запыт на злучэнне</string>
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
   <string name="warning"><xliff:g id="app">%s</xliff:g>хоча ўсталяваць злучэнне VPN
         гэта дазваляе яму кантраляваць сеткавы трафік. Працягвайце, калі вы давяраеце крыніцы.
         <![CDATA[
@@ -24,13 +26,21 @@
         <img src="vpn_icon" />
         ]]>адлюстроўваецца ў верхняй частцы экрана, калі VPN-актыўны.
     </string>
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
   <string name="legacy_title">VPN падключаны</string>
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
   <string name="configure">Налады</string>
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
   <string name="disconnect">Адключыцца</string>
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
   <string name="session">Сэсія:</string>
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
   <string name="duration">Працягласць:</string>
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
   <string name="data_transmitted">Дасланыя:</string>
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
   <string name="data_received">Атрымана:</string>
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
   <string name="data_value_format">
         <xliff:g id="number">%1$s</xliff:g> байт /
         <xliff:g id="number">%2$s</xliff:g> пакетаў
diff --git a/packages/VpnDialogs/res/values-br-rFR/strings.xml b/packages/VpnDialogs/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-br-rFR/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-bs-rBA/strings.xml b/packages/VpnDialogs/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-bs-rBA/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-csb-rPL/strings.xml b/packages/VpnDialogs/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-csb-rPL/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-cy/strings.xml b/packages/VpnDialogs/res/values-cy/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-cy/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-en-rPT/strings.xml b/packages/VpnDialogs/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-en-rPT/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-eo/strings.xml b/packages/VpnDialogs/res/values-eo/strings.xml
new file mode 100644
index 0000000..946765c
--- /dev/null
+++ b/packages/VpnDialogs/res/values-eo/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <string name="disconnect">Malkonekti</string>
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-es-rCO/strings.xml b/packages/VpnDialogs/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-es-rCO/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-es-rMX/strings.xml b/packages/VpnDialogs/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-es-rMX/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-frp-rIT/strings.xml b/packages/VpnDialogs/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-frp-rIT/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-fy-rNL/strings.xml b/packages/VpnDialogs/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-fy-rNL/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-ga-rIE/strings.xml b/packages/VpnDialogs/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-ga-rIE/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-gd-rGB/strings.xml b/packages/VpnDialogs/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-gd-rGB/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-ku/strings.xml b/packages/VpnDialogs/res/values-ku/strings.xml
index 2706a6a..65b6380 100644
--- a/packages/VpnDialogs/res/values-ku/strings.xml
+++ b/packages/VpnDialogs/res/values-ku/strings.xml
@@ -15,13 +15,23 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
   <string name="legacy_title">VPN پەیوەستکراوە</string>
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
   <string name="configure">رێکخستن</string>
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
   <string name="disconnect">پچڕاندنی پەیوەندی</string>
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
   <string name="session">دانشتن:</string>
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
   <string name="duration">ماوه‌:</string>
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
   <string name="data_transmitted">گەیشت:</string>
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
   <string name="data_received">گەیشت:</string>
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
   <string name="data_value_format">
         <xliff:g id="number">%1$s</xliff:g> بایت /
         <xliff:g id="number">%2$s</xliff:g> گیرفانەکان
diff --git a/packages/VpnDialogs/res/values-lb/strings.xml b/packages/VpnDialogs/res/values-lb/strings.xml
index 9a310e8..f598ac6 100644
--- a/packages/VpnDialogs/res/values-lb/strings.xml
+++ b/packages/VpnDialogs/res/values-lb/strings.xml
@@ -15,7 +15,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
   <string name="prompt">Connectiounsufro</string>
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
   <string name="warning"><xliff:g id="app">%s</xliff:g> wëll eng VPN-Connectioun opstellen, wouduerch den Netzwierktrafic kann iwwerwaacht ginn. Acceptéier dat just, wann s du der Quell vertraus.
         <![CDATA[
         <br />
@@ -23,13 +25,21 @@
         <img src="vpn_icon" />
         ]]> erschéngt uewen um Schierm, wa VPN aktiv ass.
     </string>
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
   <string name="legacy_title">VPN connectéiert</string>
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
   <string name="configure">Astellen</string>
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
   <string name="disconnect">Deconnectéieren</string>
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
   <string name="session">Sëtzung:</string>
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
   <string name="duration">Dauer:</string>
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
   <string name="data_transmitted">Geschéckt:</string>
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
   <string name="data_received">Empfaangen:</string>
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
   <string name="data_value_format">
         <xliff:g id="number">%1$s</xliff:g> Bytes /
         <xliff:g id="number">%2$s</xliff:g> Päck
diff --git a/packages/VpnDialogs/res/values-nl/strings.xml b/packages/VpnDialogs/res/values-nl/strings.xml
index 0f28016..ae789b2 100644
--- a/packages/VpnDialogs/res/values-nl/strings.xml
+++ b/packages/VpnDialogs/res/values-nl/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">"Verbindingsverzoek"</string>
-    <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> wil een VPN-verbinding opzetten om netwerkverkeer te controleren. Accepteer het verzoek alleen als u de bron vertrouwt. &lt;br /&gt; &lt;br /&gt; &lt;img src=vpn_icon /&gt; wordt boven aan uw scherm weergegeven wanneer VPN actief is."</string>
+    <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> wil een VPN-verbinding opzetten om netwerkverkeer te controleren. Accepteer het verzoek alleen als je de bron vertrouwt. &lt;br /&gt; &lt;br /&gt; &lt;img src=vpn_icon /&gt; wordt boven aan je scherm weergegeven wanneer VPN actief is."</string>
     <string name="legacy_title" msgid="192936250066580964">"Verbinding met VPN"</string>
     <string name="configure" msgid="4905518375574791375">"Configureren"</string>
     <string name="disconnect" msgid="971412338304200056">"Verbinding verbreken"</string>
diff --git a/packages/VpnDialogs/res/values-oc-rFR/strings.xml b/packages/VpnDialogs/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-oc-rFR/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-or-rIN/strings.xml b/packages/VpnDialogs/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..4afbe1f
--- /dev/null
+++ b/packages/VpnDialogs/res/values-or-rIN/strings.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2011 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
+</resources>
diff --git a/packages/VpnDialogs/res/values-pt-rBR/strings.xml b/packages/VpnDialogs/res/values-pt-rBR/strings.xml
new file mode 100644
index 0000000..e4154bc
--- /dev/null
+++ b/packages/VpnDialogs/res/values-pt-rBR/strings.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--  Copyright (C) 2011 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.
+ -->
+
+<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">"Solicitação de conexão"</string>
+    <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> quer configurar uma conexão VPN que permite monitorar o tráfego da rede. Aceite se confiar na origem. &lt;br /&gt; &lt;br /&gt; &lt;img src=vpn_icon /&gt; é exibido na parte superior da tela quando a VPN estiver ativa."</string>
+    <string name="legacy_title" msgid="192936250066580964">"O VPN está conectado"</string>
+    <string name="configure" msgid="4905518375574791375">"Configurar"</string>
+    <string name="disconnect" msgid="971412338304200056">"Desconectar"</string>
+    <string name="session" msgid="6470628549473641030">"Sessão:"</string>
+    <string name="duration" msgid="3584782459928719435">"Duração:"</string>
+    <string name="data_transmitted" msgid="7988167672982199061">"Enviado:"</string>
+    <string name="data_received" msgid="4062776929376067820">"Recebido:"</string>
+    <string name="data_value_format" msgid="2192466557826897580">"<xliff:g id="NUMBER_0">%1$s</xliff:g> bytes/<xliff:g id="NUMBER_1">%2$s</xliff:g> pacotes"</string>
+</resources>
diff --git a/packages/VpnDialogs/res/values-sk/strings.xml b/packages/VpnDialogs/res/values-sk/strings.xml
index 7a06554..b7ce966 100644
--- a/packages/VpnDialogs/res/values-sk/strings.xml
+++ b/packages/VpnDialogs/res/values-sk/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">"Žiadosť o pripojenie"</string>
-    <string name="warning" msgid="809658604548412033">"Aplikácia <xliff:g id="APP">%s</xliff:g> žiada o nastavenie pripojenia VPN, pomocou ktorého bude môcť sledovať návštevnosť siete. Povoľte iba v prípade, že zdroju dôverujete. &lt;br /&gt; &lt;br /&gt; &lt;img src=vpn_icon /&gt; – keď je sieť VPN aktívna, zobrazuje sa v hornej časti obrazovky."</string>
+    <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> žiada o nastavenie pripojenia VPN, pomocou ktorého bude môcť sledovať sieťové prenosy. Povoľte iba v prípade, že zdroju dôverujete. &lt;br /&gt; &lt;br /&gt; &lt;img src=vpn_icon /&gt; sa zobrazuje v hornej časti obrazovky, keď je pripojenie VPN aktívne."</string>
     <string name="legacy_title" msgid="192936250066580964">"Sieť VPN je pripojená"</string>
     <string name="configure" msgid="4905518375574791375">"Konfigurovať"</string>
     <string name="disconnect" msgid="971412338304200056">"Odpojiť"</string>
diff --git a/packages/VpnDialogs/res/values-ug/strings.xml b/packages/VpnDialogs/res/values-ug/strings.xml
index bec6790..f85983d 100644
--- a/packages/VpnDialogs/res/values-ug/strings.xml
+++ b/packages/VpnDialogs/res/values-ug/strings.xml
@@ -15,12 +15,25 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Dialog title to identify the request from a VPN application. [CHAR LIMIT=60] -->
+  <string name="prompt">باغلىنىش ئىلتىماسى</string>
+  <!-- Dialog message to warn about the risk of using a VPN application. [CHAR LIMIT=NONE] -->
+  <string name="warning"><xliff:g id="app">%s</xliff:g> سىزنىڭ  VPN ئۇلىنىشىنى بېكىتىشىڭىزنى تەلەپ قىلىدۇ، تورنى نازارەت قىلدۇ. ئەگەر سىز ئىشەنسىڭىز يول قويۇڭ.
+<![CDATA[<br /><br /><img src="vpn_icon" />]]> ئېكراننىڭ چوققىسىدا كۆرۈنسە، VPN نىڭ ئاكتىپ ئىكەنلىكىنى بىلدۈرىدۇ.    </string>
+  <!-- Dialog title for built-in VPN. [CHAR LIMIT=40]  -->
   <string name="legacy_title">VPN باغلاندى</string>
+  <!-- Button label to configure the current VPN session. [CHAR LIMIT=20] -->
   <string name="configure">سەپلىمە</string>
+  <!-- Button label to disconnect the current VPN session. [CHAR LIMIT=20] -->
   <string name="disconnect">ئۈز</string>
+  <!-- Label for the name of the current VPN session. [CHAR LIMIT=20] -->
   <string name="session">سۆزلىشىش</string>
+  <!-- Label for the duration of the current VPN session. [CHAR LIMIT=20] -->
   <string name="duration">داۋاملىشىش ۋاقتى:</string>
+  <!-- Label for the network usage of data transmitted over VPN. [CHAR LIMIT=20] -->
   <string name="data_transmitted">ئەۋەتىلگىنى:</string>
+  <!-- Label for the network usage of data received over VPN. [CHAR LIMIT=20] -->
   <string name="data_received">تاپشۇرۇۋالغىنى:</string>
+  <!-- Formatted string for the network usage over VPN. [CHAR LIMIT=40] -->
   <string name="data_value_format"><xliff:g id="NUMBER_0">%1$s</xliff:g> بايت/<xliff:g id="NUMBER_1">%2$s</xliff:g> بوغچا</string>
 </resources>
diff --git a/packages/WAPPushManager/src/com/android/smspush/WapPushManager.java b/packages/WAPPushManager/src/com/android/smspush/WapPushManager.java
index e970367..96d29fd 100644
--- a/packages/WAPPushManager/src/com/android/smspush/WapPushManager.java
+++ b/packages/WAPPushManager/src/com/android/smspush/WapPushManager.java
@@ -185,7 +185,6 @@ public class WapPushManager extends Service {
             WapPushManDBHelper dbh = getDatabase(mContext);
             SQLiteDatabase db = dbh.getReadableDatabase();
             WapPushManDBHelper.queryData lastapp = dbh.queryLastApp(db, app_id, content_type);
-            db.close();
 
             if (lastapp == null) {
                 Log.w(LOG_TAG, "no receiver app found for " + app_id + ":" + content_type);
@@ -284,7 +283,6 @@ public class WapPushManager extends Service {
                 ret = true;
             }
 
-            db.close();
 
             return ret;
         }
@@ -308,7 +306,6 @@ public class WapPushManager extends Service {
             WapPushManDBHelper.queryData lastapp = dbh.queryLastApp(db, x_app_id, content_type);
 
             if (lastapp == null) {
-                db.close();
                 return false;
             }
 
@@ -328,7 +325,6 @@ public class WapPushManager extends Service {
                     + package_name + "." + class_name
                     + ", sq:" + lastapp.installOrder);
 
-            db.close();
 
             return num > 0;
         }
@@ -346,7 +342,6 @@ public class WapPushManager extends Service {
                     + " and class_name=\'" + class_name + "\'";
             int num_removed = db.delete(APPID_TABLE_NAME, where, null);
 
-            db.close();
             if (LOCAL_LOGV) Log.v(LOG_TAG, "deleted " + num_removed + " rows:"
                     + x_app_id + ":" + content_type + " "
                     + package_name + "." + class_name);
@@ -399,7 +394,6 @@ public class WapPushManager extends Service {
         if (LOCAL_LOGV) Log.v(LOG_TAG, "verifyData app id: " + x_app_id + " content type: " +
                 content_type + " lastapp: " + lastapp);
 
-        db.close();
 
         if (lastapp == null) return false;
 
@@ -430,7 +424,6 @@ public class WapPushManager extends Service {
         SQLiteDatabase db = dbh.getReadableDatabase();
         boolean ret = dbh.queryLastApp(db, x_app_id, content_type) != null;
 
-        db.close();
         return ret;
     }
 
diff --git a/packages/WallpaperCropper/res/values-as-rIN/strings.xml b/packages/WallpaperCropper/res/values-as-rIN/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-as-rIN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-ast-rES/strings.xml b/packages/WallpaperCropper/res/values-ast-rES/strings.xml
index 92ff614..caa847e 100644
--- a/packages/WallpaperCropper/res/values-ast-rES/strings.xml
+++ b/packages/WallpaperCropper/res/values-ast-rES/strings.xml
@@ -16,6 +16,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crop_wallpaper">Recortar el fondu de pantalla</string>
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
   <string name="wallpaper_instructions">Afitar fondu de pantalla</string>
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
   <string name="wallpaper_load_fail">Nun pudo cargase la imaxe como fondu de pantalla</string>
 </resources>
diff --git a/packages/WallpaperCropper/res/values-be/strings.xml b/packages/WallpaperCropper/res/values-be/strings.xml
index 1e728f8..d8cce31 100644
--- a/packages/WallpaperCropper/res/values-be/strings.xml
+++ b/packages/WallpaperCropper/res/values-be/strings.xml
@@ -16,6 +16,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crop_wallpaper">Абрэзаць шпалеру</string>
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
   <string name="wallpaper_instructions">Усталяваць шпалеру</string>
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
   <string name="wallpaper_load_fail">Не атрымалася загрузіць выяву</string>
 </resources>
diff --git a/packages/WallpaperCropper/res/values-br-rFR/strings.xml b/packages/WallpaperCropper/res/values-br-rFR/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-br-rFR/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-bs-rBA/strings.xml b/packages/WallpaperCropper/res/values-bs-rBA/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-bs-rBA/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-csb-rPL/strings.xml b/packages/WallpaperCropper/res/values-csb-rPL/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-csb-rPL/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-cy/strings.xml b/packages/WallpaperCropper/res/values-cy/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-cy/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-en-rPT/strings.xml b/packages/WallpaperCropper/res/values-en-rPT/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-en-rPT/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-eo/strings.xml b/packages/WallpaperCropper/res/values-eo/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-eo/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-es-rCO/strings.xml b/packages/WallpaperCropper/res/values-es-rCO/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-es-rCO/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-es-rMX/strings.xml b/packages/WallpaperCropper/res/values-es-rMX/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-es-rMX/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-frp-rIT/strings.xml b/packages/WallpaperCropper/res/values-frp-rIT/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-frp-rIT/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-fy-rNL/strings.xml b/packages/WallpaperCropper/res/values-fy-rNL/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-fy-rNL/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-ga-rIE/strings.xml b/packages/WallpaperCropper/res/values-ga-rIE/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-ga-rIE/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-gd-rGB/strings.xml b/packages/WallpaperCropper/res/values-gd-rGB/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-gd-rGB/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-ku/strings.xml b/packages/WallpaperCropper/res/values-ku/strings.xml
index f2a9f6c..973d055 100644
--- a/packages/WallpaperCropper/res/values-ku/strings.xml
+++ b/packages/WallpaperCropper/res/values-ku/strings.xml
@@ -16,6 +16,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crop_wallpaper">بڕینی وێنەی پشتەوە</string>
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
   <string name="wallpaper_instructions">دانانی وێنەی پشتەوە</string>
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
   <string name="wallpaper_load_fail">نەتوانرا وێنەی پشتەوە دابنرێت</string>
 </resources>
diff --git a/packages/WallpaperCropper/res/values-lb/strings.xml b/packages/WallpaperCropper/res/values-lb/strings.xml
index 46fcd67..b4c6af6 100644
--- a/packages/WallpaperCropper/res/values-lb/strings.xml
+++ b/packages/WallpaperCropper/res/values-lb/strings.xml
@@ -16,6 +16,11 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="crop_wallpaper">Hannergrondbild schneiden</string>
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
   <string name="wallpaper_instructions">Hannergrondbild setzen</string>
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
   <string name="wallpaper_load_fail">D\'Bild konnt net als Hannergrondbild geluede ginn</string>
 </resources>
diff --git a/packages/WallpaperCropper/res/values-oc-rFR/strings.xml b/packages/WallpaperCropper/res/values-oc-rFR/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-oc-rFR/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-or-rIN/strings.xml b/packages/WallpaperCropper/res/values-or-rIN/strings.xml
new file mode 100644
index 0000000..0e609fe
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-or-rIN/strings.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+</resources>
diff --git a/packages/WallpaperCropper/res/values-ug/strings.xml b/packages/WallpaperCropper/res/values-ug/strings.xml
new file mode 100644
index 0000000..e28e735
--- /dev/null
+++ b/packages/WallpaperCropper/res/values-ug/strings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<!-- Copyright (C) 2013 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.
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="crop_wallpaper">تام قەغەز كەس</string>
+  <!-- Button label on Wallpaper picker screen; user selects this button to set a specific wallpaper -->
+  <string name="wallpaper_instructions">تام قەغەز تەڭشىكى</string>
+  <!-- Error message when an image is selected as a wallpaper,
+         but the wallpaper cropper cannot load it. The user will
+         usually see this when using another app and trying to set
+         an image as the wallpaper -->
+  <string name="wallpaper_load_fail">سۈرەتنى تام قەغەز سۈپىتىدە يۈكلىيەلمىدى</string>
+</resources>
diff --git a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
index 1b4182d..4e4c249 100644
--- a/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
+++ b/services/accessibility/java/com/android/server/accessibility/DisplayAdjustmentUtils.java
@@ -31,7 +31,7 @@ import cyanogenmod.providers.CMSettings;
 /**
  * Utility methods for performing accessibility display adjustments.
  */
-public class DisplayAdjustmentUtils {
+class DisplayAdjustmentUtils {
     private static final String LOG_TAG = DisplayAdjustmentUtils.class.getSimpleName();
 
     /** Matrix and offset used for converting color to gray-scale. */
@@ -77,11 +77,6 @@ public class DisplayAdjustmentUtils {
             return true;
         }
 
-        if (CMSettings.Secure.getStringForUser(cr,
-                CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId) != null) {
-            return true;
-        }
-
         return false;
     }
 
@@ -97,23 +92,6 @@ public class DisplayAdjustmentUtils {
             colorMatrix = multiply(colorMatrix, INVERSION_MATRIX_VALUE_ONLY);
         }
 
-        String adj = CMSettings.Secure.getStringForUser(cr,
-                CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX, userId);
-        if (adj != null) {
-            String[] tmp = adj.split(" ");
-            if (tmp.length == 16) {
-                float[] adjMatrix = new float[16];
-                try {
-                    for (int i = 0; i < 16; i++) {
-                        adjMatrix[i] = Float.parseFloat(tmp[i]);
-                    }
-                    colorMatrix = multiply(colorMatrix, adjMatrix);
-                } catch (NumberFormatException e) {
-                    Slog.e(LOG_TAG, e.getMessage(), e);
-                }
-            }
-        }
-
         if (Settings.Secure.getIntForUser(cr,
                 Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED, 0, userId) != 0) {
             final int daltonizerMode = Settings.Secure.getIntForUser(cr,
diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java
index 1629a37..d16c78a 100644
--- a/services/backup/java/com/android/server/backup/BackupManagerService.java
+++ b/services/backup/java/com/android/server/backup/BackupManagerService.java
@@ -80,7 +80,9 @@ import android.os.storage.StorageManager;
 import android.provider.Settings;
 import android.system.ErrnoException;
 import android.system.Os;
+import android.text.TextUtils;
 import android.util.ArrayMap;
+import android.util.ArraySet;
 import android.util.AtomicFile;
 import android.util.EventLog;
 import android.util.Log;
@@ -93,6 +95,7 @@ import com.android.internal.backup.IBackupTransport;
 import com.android.internal.backup.IObbBackupService;
 import com.android.server.AppWidgetBackupBridge;
 import com.android.server.EventLogTags;
+import com.android.server.SystemConfig;
 import com.android.server.SystemService;
 import com.android.server.backup.PackageManagerBackupAgent.Metadata;
 
@@ -300,6 +303,7 @@ public class BackupManagerService {
     volatile boolean mClearingData;
 
     // Transport bookkeeping
+    final ArraySet<ComponentName> mTransportWhitelist;
     final Intent mTransportServiceIntent = new Intent(SERVICE_ACTION_TRANSPORT_HOST);
     final ArrayMap<String,String> mTransportNames
             = new ArrayMap<String,String>();             // component name -> registration name
@@ -1084,11 +1088,15 @@ public class BackupManagerService {
 
         // Set up our transport options and initialize the default transport
         // TODO: Don't create transports that we don't need to?
-        mCurrentTransport = Settings.Secure.getString(context.getContentResolver(),
+        SystemConfig systemConfig = SystemConfig.getInstance();
+        mTransportWhitelist = systemConfig.getBackupTransportWhitelist();
+
+        String transport = Settings.Secure.getString(context.getContentResolver(),
                 Settings.Secure.BACKUP_TRANSPORT);
-        if ("".equals(mCurrentTransport)) {
-            mCurrentTransport = null;
+        if (TextUtils.isEmpty(transport)) {
+            transport = null;
         }
+        mCurrentTransport = transport;
         if (DEBUG) Slog.v(TAG, "Starting with transport " + mCurrentTransport);
 
         // Find all transport hosts and bind to their services
@@ -1099,11 +1107,11 @@ public class BackupManagerService {
         }
         if (hosts != null) {
             for (int i = 0; i < hosts.size(); i++) {
-                final ServiceInfo transport = hosts.get(i).serviceInfo;
+                final ServiceInfo transportService = hosts.get(i).serviceInfo;
                 if (MORE_DEBUG) {
-                    Slog.v(TAG, "   " + transport.packageName + "/" + transport.name);
+                    Slog.v(TAG, "   " + transportService.packageName + "/" + transportService.name);
                 }
-                tryBindTransport(transport);
+                tryBindTransport(transportService);
             }
         }
 
@@ -1983,7 +1991,12 @@ public class BackupManagerService {
     // Actually bind; presumes that we have already validated the transport service
     boolean bindTransport(ServiceInfo transport) {
         ComponentName svcName = new ComponentName(transport.packageName, transport.name);
-        if (MORE_DEBUG) {
+        if (!mTransportWhitelist.contains(svcName)) {
+            Slog.w(TAG, "Proposed transport " + svcName + " not whitelisted; ignoring");
+            return false;
+        }
+
+        if (DEBUG) {
             Slog.i(TAG, "Binding to transport host " + svcName);
         }
         Intent intent = new Intent(mTransportServiceIntent);
@@ -2222,7 +2235,8 @@ public class BackupManagerService {
             synchronized(mAgentConnectLock) {
                 mConnecting = true;
                 mConnectedAgent = null;
-                if (mActivityManager.bindBackupAgent(app, mode)) {
+                if (mActivityManager.bindBackupAgent(app.packageName, mode,
+                        UserHandle.USER_OWNER)) {
                     Slog.d(TAG, "awaiting agent for " + app);
 
                     // success; wait for the agent to arrive
@@ -9654,6 +9668,12 @@ if (MORE_DEBUG) Slog.v(TAG, "   + got " + nRead + "; now wanting " + (size - soF
                     + " (now = " + System.currentTimeMillis() + ')');
             pw.println("  next scheduled: " + KeyValueBackupJob.nextScheduled());
 
+            pw.println("Transport whitelist:");
+            for (ComponentName transport : mTransportWhitelist) {
+                pw.print("    ");
+                pw.println(transport.flattenToShortString());
+            }
+
             pw.println("Available transports:");
             final String[] transports = listAllTransports();
             if (transports != null) {
diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java
index 1433490..5875ca9 100644
--- a/services/core/java/com/android/server/AlarmManagerService.java
+++ b/services/core/java/com/android/server/AlarmManagerService.java
@@ -74,6 +74,8 @@ import java.util.Locale;
 import java.util.Random;
 import java.util.TimeZone;
 import java.util.TreeSet;
+import java.util.Timer;
+import java.util.TimerTask;
 
 import static android.app.AlarmManager.RTC_WAKEUP;
 import static android.app.AlarmManager.RTC;
@@ -127,6 +129,7 @@ class AlarmManagerService extends SystemService {
 
     private final ArrayList<Integer> mTriggeredUids = new ArrayList<Integer>();
     private final ArrayList<Integer> mBlockedUids = new ArrayList<Integer>();
+    private static final int BLOCKED_UID_CHECK_INTERVAL = 1000; // 1 sec.
 
     long mNativeData;
     private long mNextWakeup;
@@ -1250,16 +1253,9 @@ class AlarmManagerService extends SystemService {
             synchronized(mLock) {
                 if(isBlocked) {
                     mBlockedUids.add(new Integer(uid));
-                    if (checkReleaseWakeLock()) {
-                        /* all the uids for which the alarms are triggered
-                         * are either blocked or have called onSendFinished.
-                         */
-                        if (mWakeLock.isHeld()) {
-                            mWakeLock.release();
-                            if (localLOGV)
-                                Slog.v(TAG, "AM WakeLock Released Internally in updateBlockedUids");
-                        }
-                    }
+                    Timer checkBlockedUidTimer = new Timer();
+                    checkBlockedUidTimer.schedule( new CheckBlockedUidTimerTask(uid),
+                                                   BLOCKED_UID_CHECK_INTERVAL);
                 } else {
                     mBlockedUids.clear();
                 }
@@ -1267,6 +1263,24 @@ class AlarmManagerService extends SystemService {
         }
     };
 
+    class CheckBlockedUidTimerTask extends TimerTask {
+        private int mUid;
+        CheckBlockedUidTimerTask(int uid) {
+            mUid = uid;
+        }
+        @Override
+        public void run(){
+            if (mBlockedUids.contains(mUid) && mTriggeredUids.contains(mUid)) {
+                if (mWakeLock.isHeld()) {
+                    mWakeLock.release();
+                    if (localLOGV)
+                        Slog.v(TAG, "AM WakeLock Released Internally!!");
+                    return;
+                }
+            }
+            return;
+        }
+    }
     void dumpImpl(PrintWriter pw) {
         synchronized (mLock) {
             pw.println("Current Alarm Manager state:");
@@ -1745,20 +1759,6 @@ class AlarmManagerService extends SystemService {
         }
     }
 
-    boolean checkReleaseWakeLock() {
-        if (mTriggeredUids.size() == 0 || mBlockedUids.size() == 0)
-            return false;
-
-        int uid;
-        for (int i = 0; i <  mTriggeredUids.size(); i++) {
-            uid = mTriggeredUids.get(i);
-            if (!mBlockedUids.contains(uid)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
     private void removeLocked(PendingIntent operation) {
         boolean didRemove = false;
         for (int i = mAlarmBatches.size() - 1; i >= 0; i--) {
@@ -2277,12 +2277,6 @@ class AlarmManagerService extends SystemService {
                 mInFlight.add(inflight);
                 mBroadcastRefCount++;
                 mTriggeredUids.add(new Integer(alarm.uid));
-                if (checkReleaseWakeLock()) {
-                    if (mWakeLock.isHeld()) {
-                        mWakeLock.release();
-                        if (localLOGV) Slog.v(TAG, "AM WakeLock Released Internally deliverAlarms");
-                    }
-                }
 
                 if (allowWhileIdle) {
                     // Record the last time this uid handled an ALLOW_WHILE_IDLE alarm.
@@ -2839,13 +2833,6 @@ class AlarmManagerService extends SystemService {
                 mBroadcastRefCount--;
                 mTriggeredUids.remove(new Integer(uid));
 
-                if (checkReleaseWakeLock()) {
-                    if (mWakeLock.isHeld()) {
-                        mWakeLock.release();
-                        if (localLOGV) Slog.v(TAG, "AM WakeLock Released Internally onSendFinish");
-                    }
-                }
-
                 if (mBroadcastRefCount == 0) {
                     if (mWakeLock.isHeld()) {
                       mWakeLock.release();
diff --git a/services/core/java/com/android/server/AppOpsPolicy.java b/services/core/java/com/android/server/AppOpsPolicy.java
index 75bca05..d51983f 100644
--- a/services/core/java/com/android/server/AppOpsPolicy.java
+++ b/services/core/java/com/android/server/AppOpsPolicy.java
@@ -60,6 +60,11 @@ public class AppOpsPolicy {
 
     public static final int CONTROL_UNKNOWN = 2;
 
+    // Rate limiting thresholds for ask operations
+    public static final int RATE_LIMIT_OP_COUNT = 3;
+    public static final int RATE_LIMIT_OPS_TOTAL_PKG_COUNT = 4;
+    public static final int RATE_LIMIT_OP_DELAY_CEILING = 10;
+
     public static int stringToControl(String show) {
         if ("true".equalsIgnoreCase(show)) {
             return CONTROL_SHOW;
@@ -438,4 +443,4 @@ public class AppOpsPolicy {
             Slog.d(TAG, "Returning mode=" + mode);
         return mode;
     }
-}
\ No newline at end of file
+}
diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java
index 83a0a99..b205d24 100644
--- a/services/core/java/com/android/server/AppOpsService.java
+++ b/services/core/java/com/android/server/AppOpsService.java
@@ -39,8 +39,10 @@ import android.app.ActivityThread;
 import android.app.AppGlobals;
 import android.app.AppOpsManager;
 import android.app.Dialog;
+import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.IPackageManager;
 import android.content.pm.PackageManager;
@@ -51,6 +53,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
+import android.os.PowerManager;
 import android.os.Process;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -96,6 +99,7 @@ public class AppOpsService extends IAppOpsService.Stub {
     final Looper mLooper;
     final boolean mStrictEnable;
     AppOpsPolicy mPolicy;
+    private PowerManager mPowerManager;
 
     private static final int[] PRIVACY_GUARD_OP_STATES = new int[] {
         AppOpsManager.OP_COARSE_LOCATION,
@@ -184,6 +188,7 @@ public class AppOpsService extends IAppOpsService.Stub {
         final ArrayList<IBinder> clientTokens;
         public int allowedCount;
         public int ignoredCount;
+        public int delayedCount;
 
         public Op(int _uid, String _packageName, int _op, int _mode) {
             uid = _uid;
@@ -317,10 +322,17 @@ public class AppOpsService extends IAppOpsService.Stub {
                     } catch (RemoteException ignored) {
                     }
                     if (curUid != ops.uidState.uid) {
-                        Slog.i(TAG, "Pruning old package " + ops.packageName
-                                + "/" + ops.uidState + ": new uid=" + curUid);
-                        it.remove();
-                        changed = true;
+                        // Do not prune apps that are not currently present in the device
+                        // (like SDcard ones). While booting, SDcards are not available but
+                        // must not be purged from AppOps, because they are still present
+                        // in the Android app database.
+                        String pkgName = mContext.getPackageManager().getNameForUid(ops.uidState.uid);
+                        if (curUid != -1 || pkgName == null || !pkgName.equals(ops.packageName)) {
+                            Slog.i(TAG, "Pruning old package " + ops.packageName
+                                    + "/" + ops.uidState + ": new uid=" + curUid);
+                            it.remove();
+                            changed = true;
+                        }
                     }
                 }
 
@@ -360,8 +372,45 @@ public class AppOpsService extends IAppOpsService.Stub {
                                 || mountMode == Zygote.MOUNT_EXTERNAL_WRITE;
                     }
                 });
+
+        mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(Intent.ACTION_SCREEN_OFF);
+        mContext.registerReceiver(mIntentReceiver, filter);
     }
 
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(Intent.ACTION_SCREEN_OFF)) {
+                synchronized (this) {
+                    for (int i = mUidStates.size() - 1; i >= 0; i--) {
+                        UidState uidState = mUidStates.valueAt(i);
+
+                        ArrayMap<String, Ops> packages = uidState.pkgOps;
+                        if (packages == null) {
+                            continue;
+                        }
+
+                        Iterator<Map.Entry<String, Ops>> it = packages.entrySet().iterator();
+                        while (it.hasNext()) {
+                            Map.Entry<String, Ops> ent = it.next();
+                            Ops pkgOps = ent.getValue();
+                            for (int j = pkgOps.size() - 1; j >= 0; j--) {
+                                Op curOp = pkgOps.valueAt(j);
+                                if (DEBUG)
+                                    Log.d(TAG, "Ignoring " + curOp.packageName + " request "
+                                            + curOp.op);
+                                curOp.dialogReqQueue.ignore();
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    };
+
     public void packageRemoved(int uid, String packageName) {
         synchronized (this) {
             UidState uidState = mUidStates.get(uid);
@@ -1058,8 +1107,50 @@ public class AppOpsService extends IAppOpsService.Stub {
                                     + packageName + ")");
                     return switchOp.mode;
                 }
-                op.noteOpCount++;
-                req = askOperationLocked(code, uid, packageName, switchOp);
+
+                if (DEBUG) {
+                        Log.d(TAG, "Package " + op.packageName + " has " + op.noteOpCount
+                                + " requests and " + op.startOpCount + " start requests with "
+                                + op.ignoredCount + " ignored at " + op.time +
+                                " with a duration of "
+                                + op.duration + " while being delayed " + op.delayedCount +
+                                " times");
+                        Log.d(TAG, "Total pkops for " + ops.packageName + " "
+                                + ops.uidState.pkgOps.size());
+                }
+
+                // First drop all request events if the device is not interactive, next
+                // check what the global pkg ops count for the package,
+                // then check op scoped count. High frequency request ops will be delayed until
+                // their delay count ceiling is met. This is to mitigate the overloading the
+                // main activity manager service handler and having watchdog kill our service.
+                // Google play services likes to share its uid with numerous packages to avoid
+                // having to grant permissions from the users perspective and thus is the worst
+                // example of overloading this queue -- so, to not encourage bad behavior,
+                // we move them to the back of the line. NOTE: these values are magic, and may need
+                // tuning. Ideally we'd want a ringbuffer or token bucket here to do proper rate
+                // limiting.
+                final boolean isInteractive = mPowerManager.isInteractive();
+                if (isInteractive &&
+                        (ops.uidState.pkgOps.size() < AppOpsPolicy.RATE_LIMIT_OPS_TOTAL_PKG_COUNT
+                        && op.noteOpCount < AppOpsPolicy.RATE_LIMIT_OP_COUNT
+                        || op.delayedCount > AppOpsPolicy.RATE_LIMIT_OP_DELAY_CEILING)) {
+
+                    // Reset delayed count, most ops will never need this
+                    if (op.delayedCount > 0) {
+                        if (DEBUG) Log.d(TAG, "Resetting delayed count for " + op.packageName);
+                        op.delayedCount = 0;
+                    }
+
+                    op.noteOpCount++;
+                    req = askOperationLocked(code, uid, packageName, switchOp);
+                } else {
+                    if (isInteractive) {
+                        op.delayedCount++;
+                    }
+                    op.ignoredCount++;
+                    return AppOpsManager.MODE_IGNORED;
+                }
             }
         }
 
diff --git a/services/core/java/com/android/server/BatteryService.java b/services/core/java/com/android/server/BatteryService.java
index f20cfe9..97ad02c 100644
--- a/services/core/java/com/android/server/BatteryService.java
+++ b/services/core/java/com/android/server/BatteryService.java
@@ -58,10 +58,6 @@ import android.util.Slog;
 import java.io.File;
 import java.io.FileDescriptor;
 import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.PrintWriter;
 
@@ -165,6 +161,7 @@ public final class BatteryService extends SystemService {
 
     private boolean mAdjustableNotificationLedBrightness;
     private int mNotificationLedBrightnessLevel = LIGHT_BRIGHTNESS_MAXIMUM;
+    private boolean mUseSegmentedBatteryLed = false;
 
     private boolean mMultipleNotificationLeds;
     private boolean mMultipleLedsEnabled = false;
@@ -1030,51 +1027,29 @@ public final class BatteryService extends SystemService {
         private final int mBatteryLedOff;
 
         public Led(Context context, LightsManager lights) {
+            NotificationManager nm = context.getSystemService(NotificationManager.class);
             mBatteryLight = lights.getLight(LightsManager.LIGHT_ID_BATTERY);
 
             // Does the Device support changing battery LED colors?
-            mMultiColorLed = context.getResources().getBoolean(
-                    com.android.internal.R.bool.config_multiColorBatteryLed);
+            mMultiColorLed = nm.deviceLightsCan(NotificationManager.LIGHTS_RGB_BATTERY);
 
             // Is the notification LED brightness changeable ?
-            mAdjustableNotificationLedBrightness = context.getResources().getBoolean(
-                    org.cyanogenmod.platform.internal.R.bool.config_adjustableNotificationLedBrightness);
+            mAdjustableNotificationLedBrightness = nm.deviceLightsCan(
+                                            NotificationManager.LIGHTS_ADJUSTABLE_NOTIFICATION_BRIGHTNESS);
 
             // Does the Device have multiple LEDs ?
-            mMultipleNotificationLeds = context.getResources().getBoolean(
-                    org.cyanogenmod.platform.internal.R.bool.config_multipleNotificationLeds);
+            mMultipleNotificationLeds = nm.deviceLightsCan(
+                                            NotificationManager.LIGHTS_MULTIPLE_LED);
 
             mBatteryLedOn = context.getResources().getInteger(
                     com.android.internal.R.integer.config_notificationsBatteryLedOn);
             mBatteryLedOff = context.getResources().getInteger(
                     com.android.internal.R.integer.config_notificationsBatteryLedOff);
-        }
-
-        private boolean isHvdcpPresent() {
-            File mChargerTypeFile = new File("/sys/class/power_supply/usb/type");
-            FileReader fileReader;
-            BufferedReader br;
-            String type;
-            boolean ret = false;
-
-            if (!mChargerTypeFile.exists()) {
-                // Device does not support HVDCP
-                return ret;
-            }
-
-            try {
-                fileReader = new FileReader(mChargerTypeFile);
-                br = new BufferedReader(fileReader);
-                type =  br.readLine();
-                if (type.regionMatches(true, 0, "USB_HVDCP", 0, 9))
-                    ret = true;
-                br.close();
-                fileReader.close();
-            } catch (IOException e) {
-                Slog.e(TAG, "Failure in reading charger type", e);
-            }
 
-            return ret;
+            // Does the Device have segmented battery LED support? In this case, we send the level
+            // in the alpha channel of the color and let the HAL sort it out.
+            mUseSegmentedBatteryLed = nm.deviceLightsCan(
+                                            NotificationManager.LIGHTS_SEGMENTED_BATTERY_LIGHTS);
         }
 
         /**
@@ -1089,6 +1064,9 @@ public final class BatteryService extends SystemService {
 
             final int level = mBatteryProps.batteryLevel;
             final int status = mBatteryProps.batteryStatus;
+            mNotificationLedBrightnessLevel = mUseSegmentedBatteryLed ? level :
+                    LIGHT_BRIGHTNESS_MAXIMUM;
+
             if (!mLightEnabled) {
                 // No lights if explicitly disabled
                 mBatteryLight.turnOff();
@@ -1114,14 +1092,8 @@ public final class BatteryService extends SystemService {
                     // Battery is full or charging and nearly full
                     mBatteryLight.setColor(mBatteryFullARGB);
                 } else {
-                    if (isHvdcpPresent()) {
-                        // Blinking orange if HVDCP charger
-                        mBatteryLight.setFlashing(mBatteryMediumARGB, Light.LIGHT_FLASH_TIMED,
-                                mBatteryLedOn, mBatteryLedOn);
-                    } else {
-                        // Battery is charging and halfway full
-                        mBatteryLight.setColor(mBatteryMediumARGB);
-                    }
+                    // Battery is charging and halfway full
+                    mBatteryLight.setColor(mBatteryMediumARGB);
                 }
             } else {
                 // No lights if not charging and not low
diff --git a/services/core/java/com/android/server/BluetoothManagerService.java b/services/core/java/com/android/server/BluetoothManagerService.java
index 5a76227..dbdffef 100644
--- a/services/core/java/com/android/server/BluetoothManagerService.java
+++ b/services/core/java/com/android/server/BluetoothManagerService.java
@@ -763,6 +763,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                     }  catch (RemoteException e) {
                         Log.e(TAG, "Unable to call onBluetoothServiceUp() on callback #" + i, e);
                     }
+                    Log.d(TAG, "Broadcasted onBluetoothServiceUp() to " + mCallbacks.getBroadcastItem(i));
                 }
             } finally {
                 mCallbacks.finishBroadcast();
@@ -784,6 +785,7 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                     }  catch (RemoteException e) {
                         Log.e(TAG, "Unable to call onBluetoothServiceDown() on callback #" + i, e);
                     }
+                    Log.d(TAG, "Broadcasted onBluetoothServiceDown() to " + mCallbacks.getBroadcastItem(i));
                 }
             } finally {
                 mCallbacks.finishBroadcast();
@@ -1145,8 +1147,13 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
                         recoverBluetoothServiceFromError();
                     }
                     if ((prevState == BluetoothAdapter.STATE_TURNING_ON) &&
-                        (newState == BluetoothAdapter.STATE_BLE_ON) &&
-                        (mBluetooth != null) && mEnable) {
+                            (newState == BluetoothAdapter.STATE_OFF) &&
+                            (mBluetooth != null) && mEnable) {
+                        persistBluetoothSetting(BLUETOOTH_OFF);
+                    }
+                    if ((prevState == BluetoothAdapter.STATE_TURNING_ON) &&
+                            (newState == BluetoothAdapter.STATE_BLE_ON) &&
+                            (mBluetooth != null) && mEnable) {
                         recoverBluetoothServiceFromError();
                     }
                     if (newState == BluetoothAdapter.STATE_ON ||
@@ -1646,7 +1653,11 @@ class BluetoothManagerService extends IBluetoothManager.Stub {
             if (mBluetooth != null) {
                 mBluetooth = null;
                 //Unbind
-                mContext.unbindService(mConnection);
+                try {
+                    mContext.unbindService(mConnection);
+                } catch (Exception e) {
+                    Log.e(TAG, "Unable to unbind",e);
+                }
             }
             mBluetoothGatt = null;
         }
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 2a47460..1489fd8 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -159,6 +159,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.Random;
 
 /**
  * @hide
@@ -646,18 +647,23 @@ public class ConnectivityService extends IConnectivityManager.Stub
         mTrackerHandler = new NetworkStateTrackerHandler(mHandlerThread.getLooper());
 
         // setup our unique device name
-        String hostname = CMSettings.Secure.getString(context.getContentResolver(),
-                CMSettings.Secure.DEVICE_HOSTNAME);
-        if (TextUtils.isEmpty(hostname) &&
-                TextUtils.isEmpty(SystemProperties.get("net.hostname"))) {
+        // either to (in order): current net.hostname
+        //                       DEVICE_HOSTNAME
+        //                       android-ANDROID_ID
+        //                       android-r-RANDOM_NUMBER
+        if (TextUtils.isEmpty(SystemProperties.get("net.hostname"))) {
+            String hostname = CMSettings.Secure.getString(context.getContentResolver(),
+                    CMSettings.Secure.DEVICE_HOSTNAME);
             String id = Settings.Secure.getString(context.getContentResolver(),
                     Settings.Secure.ANDROID_ID);
-            if (id != null && id.length() > 0) {
+            if (!TextUtils.isEmpty(hostname)) {
+                SystemProperties.set("net.hostname", hostname);
+            } else if (!TextUtils.isEmpty(id)) {
                 String name = new String("android-").concat(id);
                 SystemProperties.set("net.hostname", name);
+            } else {
+                SystemProperties.set("net.hostname", "android-r-" + new Random().nextInt());
             }
-        } else {
-            SystemProperties.set("net.hostname", hostname);
         }
 
         // read our default dns server ip
diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java
index a9f6e40..6348460 100644
--- a/services/core/java/com/android/server/InputMethodManagerService.java
+++ b/services/core/java/com/android/server/InputMethodManagerService.java
@@ -3029,10 +3029,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
                     Slog.d(TAG, "Found an input method " + p);
                 }
 
-            } catch (XmlPullParserException e) {
-                Slog.w(TAG, "Unable to load input method " + compName, e);
-            } catch (IOException e) {
-                Slog.w(TAG, "Unable to load input method " + compName, e);
+            } catch (Exception e) {
+                Slog.wtf(TAG, "Unable to load input method " + compName, e);
             }
         }
 
diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index ebe8759..6cd8e10 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -2418,11 +2418,8 @@ public class LocationManagerService extends ILocationManager.Stub {
 
         Bundle extras = location.getExtras();
         boolean isBeingScreened = false;
-        if (extras == null) {
-            extras = new Bundle();
-        }
 
-        if (!extras.containsKey(mComboNlpReadyMarker)) {
+        if (extras == null || !extras.containsKey(mComboNlpReadyMarker)) {
             // see if Combo Nlp is a passive listener
             ArrayList<UpdateRecord> records =
                 mRecordsByProvider.get(LocationManager.PASSIVE_PROVIDER);
@@ -2431,6 +2428,10 @@ public class LocationManagerService extends ILocationManager.Stub {
                     if (r.mReceiver.mPackageName.equals(mComboNlpPackageName)) {
                         if (!isBeingScreened) {
                             isBeingScreened = true;
+                            if (extras == null) {
+                                location.setExtras(new Bundle());
+                                extras = location.getExtras();
+                            }
                             extras.putBoolean(mComboNlpScreenMarker, true);
                         }
                         // send location to Combo Nlp for screening
diff --git a/services/core/java/com/android/server/LockSettingsService.java b/services/core/java/com/android/server/LockSettingsService.java
index 274adf8..10b0bdd 100644
--- a/services/core/java/com/android/server/LockSettingsService.java
+++ b/services/core/java/com/android/server/LockSettingsService.java
@@ -263,6 +263,17 @@ public class LockSettingsService extends ILockSettings.Stub {
                 setString("migrated_lockscreen_disabled", "true", 0);
                 Slog.i(TAG, "Migrated lockscreen disabled flag");
             }
+
+            if (getString("migrated_pattern_size", null, 0) == null) {
+                final String val = getString(Secure.LOCK_PATTERN_SIZE, null,
+                        UserHandle.USER_CURRENT);
+                if (val != null) {
+                    setString(Secure.LOCK_PATTERN_SIZE, val, 0);
+                }
+
+                setString("migrated_pattern_size", "true", 0);
+                Slog.i(TAG, "Migrated primary user pattern size");
+            }
         } catch (RemoteException re) {
             Slog.e(TAG, "Unable to migrate old data", re);
         }
@@ -459,6 +470,7 @@ public class LockSettingsService extends ILockSettings.Stub {
     @Override
     public void setLockPattern(String pattern, String savedCredential, int userId)
             throws RemoteException {
+        checkWritePermission(userId);
         byte[] currentHandle = getCurrentHandle(userId);
 
         if (pattern == null) {
@@ -487,6 +499,7 @@ public class LockSettingsService extends ILockSettings.Stub {
     @Override
     public void setLockPassword(String password, String savedCredential, int userId)
             throws RemoteException {
+        checkWritePermission(userId);
         byte[] currentHandle = getCurrentHandle(userId);
 
         if (password == null) {
@@ -552,6 +565,9 @@ public class LockSettingsService extends ILockSettings.Stub {
     private VerifyCredentialResponse doVerifyPattern(String pattern, boolean hasChallenge,
             long challenge, int userId) throws RemoteException {
        checkPasswordReadPermission(userId);
+       if (TextUtils.isEmpty(pattern)) {
+           throw new IllegalArgumentException("Pattern can't be null or empty");
+       }
        CredentialHash storedHash = mStorage.readPatternHash(userId);
        boolean shouldReEnrollBaseZero = storedHash != null && storedHash.isBaseZeroPattern;
 
@@ -615,6 +631,9 @@ public class LockSettingsService extends ILockSettings.Stub {
     private VerifyCredentialResponse doVerifyPassword(String password, boolean hasChallenge,
             long challenge, int userId) throws RemoteException {
        checkPasswordReadPermission(userId);
+       if (TextUtils.isEmpty(password)) {
+           throw new IllegalArgumentException("Password can't be null or empty");
+       }
        CredentialHash storedHash = mStorage.readPasswordHash(userId);
        return verifyCredential(userId, storedHash, password, hasChallenge, challenge,
                new CredentialUtil() {
diff --git a/services/core/java/com/android/server/LockSettingsStorage.java b/services/core/java/com/android/server/LockSettingsStorage.java
index 1b42dfe..7ac2e42 100644
--- a/services/core/java/com/android/server/LockSettingsStorage.java
+++ b/services/core/java/com/android/server/LockSettingsStorage.java
@@ -62,6 +62,7 @@ class LockSettingsStorage {
     private static final String LOCK_PATTERN_FILE = "gatekeeper.pattern.key";
     private static final String BASE_ZERO_LOCK_PATTERN_FILE = "gatekeeper.gesture.key";
     private static final String LEGACY_LOCK_PATTERN_FILE = "gesture.key";
+    private static final String CM_LEGACY_LOCK_PATTERN_FILE = "cm_gesture.key";
     private static final String LOCK_PASSWORD_FILE = "gatekeeper.password.key";
     private static final String LEGACY_LOCK_PASSWORD_FILE = "password.key";
 
@@ -241,6 +242,11 @@ class LockSettingsStorage {
             return new CredentialHash(stored, CredentialHash.VERSION_LEGACY);
         }
 
+        stored = readFile(getCmLegacyLockPatternFilename(userId));
+        if (stored != null && stored.length > 0) {
+            return new CredentialHash(stored, CredentialHash.VERSION_LEGACY);
+        }
+
         return null;
     }
 
@@ -253,7 +259,8 @@ class LockSettingsStorage {
     public boolean hasPattern(int userId) {
         return hasFile(getLockPatternFilename(userId)) ||
             hasFile(getBaseZeroLockPatternFilename(userId)) ||
-            hasFile(getLegacyLockPatternFilename(userId));
+            hasFile(getLegacyLockPatternFilename(userId)) ||
+            hasFile(getCmLegacyLockPatternFilename(userId));
     }
 
     private boolean hasFile(String name) {
@@ -380,6 +387,10 @@ class LockSettingsStorage {
         return getLockCredentialFilePathForUser(userId, LEGACY_LOCK_PATTERN_FILE);
     }
 
+    String getCmLegacyLockPatternFilename(int userId) {
+        return getLockCredentialFilePathForUser(userId, CM_LEGACY_LOCK_PATTERN_FILE);
+    }
+
     @VisibleForTesting
     String getLegacyLockPasswordFilename(int userId) {
         return getLockCredentialFilePathForUser(userId, LEGACY_LOCK_PASSWORD_FILE);
diff --git a/services/core/java/com/android/server/MasterClearReceiver.java b/services/core/java/com/android/server/MasterClearReceiver.java
index 23556c0..3fa02ba 100644
--- a/services/core/java/com/android/server/MasterClearReceiver.java
+++ b/services/core/java/com/android/server/MasterClearReceiver.java
@@ -57,7 +57,7 @@ public class MasterClearReceiver extends BroadcastReceiver {
             @Override
             public void run() {
                 try {
-                    boolean wipeMedia = intent.getBooleanExtra(EXTRA_WIPE_MEDIA, false);
+                    boolean wipeMedia = intent.getBooleanExtra(EXTRA_WIPE_MEDIA, true);
                     RecoverySystem.rebootWipeUserData(context, shutdown, reason, wipeMedia);
                     Log.wtf(TAG, "Still running after master clear?!");
                 } catch (IOException e) {
diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java
index 4847de3..d539201 100644
--- a/services/core/java/com/android/server/MountService.java
+++ b/services/core/java/com/android/server/MountService.java
@@ -1742,6 +1742,8 @@ class MountService extends IMountService.Stub
         Preconditions.checkNotNull(fsUuid);
         synchronized (mLock) {
             final VolumeRecord rec = mRecords.get(fsUuid);
+            if (rec == null)
+                return;
             rec.nickname = nickname;
             mCallbacks.notifyVolumeRecordChanged(rec);
             writeSettingsLocked();
@@ -1756,6 +1758,8 @@ class MountService extends IMountService.Stub
         Preconditions.checkNotNull(fsUuid);
         synchronized (mLock) {
             final VolumeRecord rec = mRecords.get(fsUuid);
+            if (rec == null)
+                return;
             rec.userFlags = (rec.userFlags & ~mask) | (flags & mask);
             mCallbacks.notifyVolumeRecordChanged(rec);
             writeSettingsLocked();
@@ -2388,6 +2392,12 @@ class MountService extends IMountService.Stub
                 // to let the UI to clear itself
                 mHandler.postDelayed(new Runnable() {
                     public void run() {
+                        // unmount the internal emulated volume first
+                        try {
+                            mConnector.execute("volume", "unmount", "emulated");
+                        } catch (NativeDaemonConnectorException e) {
+                            Slog.e(TAG, "unable to shut down internal volume", e);
+                        }
                         try {
                             mCryptConnector.execute("cryptfs", "restart");
                         } catch (NativeDaemonConnectorException e) {
diff --git a/services/core/java/com/android/server/net/NetPluginDelegate.java b/services/core/java/com/android/server/NetPluginDelegate.java
index 6716a6b..18365f1 100644
--- a/services/core/java/com/android/server/net/NetPluginDelegate.java
+++ b/services/core/java/com/android/server/NetPluginDelegate.java
@@ -27,17 +27,16 @@
  *IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-package com.android.server.net;
+package com.android.server;
 
 import dalvik.system.PathClassLoader;
 
-import java.lang.reflect.Constructor;
-
 import android.util.Slog;
+import android.net.Network;
 import android.net.NetworkStats;
 import android.util.Log;
 
-class NetPluginDelegate {
+public class NetPluginDelegate {
 
     private static final String TAG = "ConnectivityExtension";
     private static final boolean LOGV = false;
@@ -47,7 +46,7 @@ class NetPluginDelegate {
 
     private static boolean extensionFailed;
 
-    static void getTetherStats(NetworkStats uidStats, NetworkStats devStats,
+    public static void getTetherStats(NetworkStats uidStats, NetworkStats devStats,
             NetworkStats xtStats) {
         if (!loadTetherExtJar()) {
             return;
@@ -60,9 +59,10 @@ class NetPluginDelegate {
             e.printStackTrace();
             Log.w(TAG, "error in invoke method");
         }
+        if (LOGV) Slog.v(TAG, "getTetherStats() X");
     }
 
-    static void setQuota(String iface, long quota) {
+    public static void setQuota(String iface, long quota) {
         if (!loadTetherExtJar()) {
             return;
         }
@@ -72,8 +72,20 @@ class NetPluginDelegate {
         } catch (Exception ex) {
             Log.w(TAG, "Error calling setQuota Method on extension jar");
         }
+        if (LOGV) Slog.v(TAG, "setQuota(" + iface + ", " + quota + ") X");
     }
 
+    public static void setUpstream(Network net) {
+        if (LOGV) Slog.v(TAG, "setUpstream(" + net + ") E");
+        loadTetherExtJar();
+        try {
+            tetherExtensionClass.getMethod("setUpstream", Network.class).invoke(
+                    tetherExtensionObj, net);
+        } catch (Exception ex) {
+            Log.w(TAG, "Error calling setUpstream Method on extension jar");
+        }
+        if (LOGV) Slog.v(TAG, "setUpstream(" + net + ") E");
+    }
 
 
     private static boolean loadTetherExtJar() {
diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java
index fd42b0a..f53c4ef 100644
--- a/services/core/java/com/android/server/NetworkManagementService.java
+++ b/services/core/java/com/android/server/NetworkManagementService.java
@@ -46,12 +46,16 @@ import static com.android.server.NetworkManagementSocketTagger.PROP_QTAGUID_ENAB
 
 import android.annotation.NonNull;
 import android.app.ActivityManagerNative;
+import android.content.BroadcastReceiver;
 import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
 import android.net.ConnectivityManager;
 import android.net.INetworkManagementEventObserver;
 import android.net.InterfaceConfiguration;
 import android.net.IpPrefix;
 import android.net.LinkAddress;
+import android.net.LinkProperties;
 import android.net.Network;
 import android.net.NetworkPolicyManager;
 import android.net.NetworkStats;
@@ -77,11 +81,13 @@ import android.telephony.DataConnectionRealTimeInfo;
 import android.telephony.PhoneStateListener;
 import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
+import android.text.TextUtils;
 import android.util.Log;
 import android.util.Slog;
 import android.util.SparseBooleanArray;
 import android.util.SparseIntArray;
 
+import com.android.internal.R;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.app.IBatteryStats;
 import com.android.internal.net.NetworkStatsFactory;
@@ -110,6 +116,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
+import java.util.Objects;
 import java.util.StringTokenizer;
 import java.util.concurrent.CountDownLatch;
 
@@ -188,7 +195,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
     private final Handler mFgHandler;
     private final Handler mDaemonHandler;
     private final PhoneStateListener mPhoneStateListener;
-
+    private String mWifiInterfaceName, mDataInterfaceName;
     private IBatteryStats mBatteryStats;
 
     private final Thread mThread;
@@ -231,6 +238,10 @@ public class NetworkManagementService extends INetworkManagementService.Stub
     /** Set of states for the child firewall chains. True if the chain is active. */
     @GuardedBy("mQuotaLock")
     final SparseBooleanArray mFirewallChainStates = new SparseBooleanArray();
+    @GuardedBy("mQuotaLock")
+    final Map<Integer, Boolean> mWlanBlacklist = new HashMap<Integer, Boolean>();
+    @GuardedBy("mQuotaLock")
+    final Map<Integer, Boolean> mDataBlacklist = new HashMap<Integer, Boolean>();
 
     private Object mIdleTimerLock = new Object();
     /** Set of interfaces with active idle timers. */
@@ -258,6 +269,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
     private final RemoteCallbackList<INetworkActivityListener> mNetworkActivityListeners =
             new RemoteCallbackList<INetworkActivityListener>();
     private boolean mNetworkActive;
+    private HashMap<Integer, Boolean> mPendingRestrictOnData = new HashMap<Integer, Boolean>();
 
     /**
      * Constructs a new NetworkManagementService instance
@@ -282,6 +294,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
                 FgThread.get().getLooper());
         mThread = new Thread(mConnector, NETD_TAG);
 
+        mWifiInterfaceName = SystemProperties.get("wifi.interface");
         mDaemonHandler = new Handler(FgThread.get().getLooper());
 
         mPhoneStateListener = new PhoneStateListener(SubscriptionManager.DEFAULT_SUBSCRIPTION_ID,
@@ -292,6 +305,7 @@ public class NetworkManagementService extends INetworkManagementService.Stub
                 if (DBG) Slog.d(TAG, "onDataConnectionRealTimeInfoChanged: " + dcRtInfo);
                 notifyInterfaceClassActivity(ConnectivityManager.TYPE_MOBILE,
                         dcRtInfo.getDcPowerState(), dcRtInfo.getTime(), true);
+                processPendingDataRestrictRequests();
             }
         };
         TelephonyManager tm = (TelephonyManager)context.getSystemService(Context.TELEPHONY_SERVICE);
@@ -322,6 +336,12 @@ public class NetworkManagementService extends INetworkManagementService.Stub
 
     public void systemReady() {
         prepareNativeDaemon();
+        // Register the receiver for Zerobalance blocking/unblocking
+        if (mContext.getResources().getBoolean(R.bool.config_zero_balance_operator)) {
+            final IntentFilter restrictFilter = new IntentFilter();
+            restrictFilter.addAction("org.codeaurora.restrictData");
+            mContext.registerReceiver(mZeroBalanceReceiver, restrictFilter);
+        }
         if (DBG) Slog.d(TAG, "Prepared");
     }
 
@@ -1821,6 +1841,85 @@ public class NetworkManagementService extends INetworkManagementService.Stub
         }
     }
 
+    private void processPendingDataRestrictRequests() {
+        initDataInterface();
+        if (TextUtils.isEmpty(mDataInterfaceName) || mPendingRestrictOnData.isEmpty()) {
+            return;
+        }
+        for (Integer key : mPendingRestrictOnData.keySet()) {
+            restrictAppOnData(key, mPendingRestrictOnData.get(key));
+        }
+        mPendingRestrictOnData.clear();
+    }
+
+    @Override
+    public void restrictAppOnData(int uid, boolean restrict) {
+        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
+        // silently discard when control disabled
+        // TODO: eventually migrate to be always enabled
+        if (!mBandwidthControlEnabled) return;
+
+        initDataInterface();
+        if (TextUtils.isEmpty(mDataInterfaceName)) {
+            // We don't have an interface name since data is not active
+            // yet, so queue up the request for when it comes up alive
+            mPendingRestrictOnData.put(uid, restrict);
+            return;
+        }
+
+        synchronized (mQuotaLock) {
+            if (!mDataBlacklist.containsKey(uid) && !restrict) {
+                return;
+            }
+            Boolean wasRestricted = mDataBlacklist.get(uid);
+            if (Objects.equals(wasRestricted, restrict)) {
+                return;
+            }
+            mDataBlacklist.put(uid, restrict);
+        }
+
+        try {
+            if (restrict) {
+                mConnector.execute("bandwidth", "addrestrictappsondata", mDataInterfaceName, uid);
+            } else {
+                mConnector.execute("bandwidth", "removerestrictappsondata", mDataInterfaceName, uid);
+            }
+        } catch (NativeDaemonConnectorException e) {
+            throw e.rethrowAsParcelableException();
+        }
+    }
+
+    @Override
+    public void restrictAppOnWlan(int uid, boolean restrict) {
+        mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
+
+        // silently discard when control disabled
+        // TODO: eventually migrate to be always enabled
+        if (!mBandwidthControlEnabled) return;
+
+        synchronized (mQuotaLock) {
+            if (!mWlanBlacklist.containsKey(uid) && !restrict) {
+                return;
+            }
+            Boolean wasRestricted = mWlanBlacklist.get(uid);
+            if (Objects.equals(wasRestricted, restrict) || TextUtils.isEmpty(mWifiInterfaceName)) {
+                return;
+            }
+            mWlanBlacklist.put(uid, restrict);
+        }
+
+
+        try {
+            if (restrict) {
+                mConnector.execute("bandwidth", "addrestrictappsonwlan", mWifiInterfaceName, uid);
+            } else {
+                mConnector.execute("bandwidth", "removerestrictappsonwlan", mWifiInterfaceName, uid);
+            }
+        } catch (NativeDaemonConnectorException e) {
+            throw e.rethrowAsParcelableException();
+        }
+    }
+
     @Override
     public void setUidCleartextNetworkPolicy(int uid, int policy) {
         if (Binder.getCallingUid() != uid) {
@@ -2573,4 +2672,41 @@ public class NetworkManagementService extends INetworkManagementService.Stub
     public void removeInterfaceFromLocalNetwork(String iface) {
         modifyInterfaceInNetwork("remove", "local", iface);
     }
+
+    private void initDataInterface() {
+        if (!TextUtils.isEmpty(mDataInterfaceName)) {
+            return;
+        }
+        ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
+                Context.CONNECTIVITY_SERVICE);
+        LinkProperties linkProperties = cm.getLinkProperties(ConnectivityManager.TYPE_MOBILE);
+        if (linkProperties != null) {
+            mDataInterfaceName = linkProperties.getInterfaceName();
+        }
+    }
+
+    private BroadcastReceiver mZeroBalanceReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            boolean isBlockAllData = false;
+            if (intent != null
+                    && intent.getAction().equals("org.codeaurora.restrictData")) {
+                isBlockAllData = intent.getBooleanExtra("Restrict", false);
+                Log.wtf("ZeroBalance", "Intent value to block unblock data" + isBlockAllData);
+            }
+            mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG);
+
+            // Silently discard when control disabled
+            // TODO: Eventually migrate to always be enabled
+            if (!mBandwidthControlEnabled) return;
+            try {
+                Log.wtf("ZeroBalance", "before calling connector Intent"
+                        + "value to block unblock data" + isBlockAllData);
+                mConnector.execute("bandwidth",
+                        isBlockAllData ? "blockAllData" : "unblockAllData");
+            } catch (NativeDaemonConnectorException e) {
+                throw e.rethrowAsParcelableException();
+            }
+        }
+    };
 }
diff --git a/services/core/java/com/android/server/PermissionDialog.java b/services/core/java/com/android/server/PermissionDialog.java
index 0f337b8..fd676b5 100644
--- a/services/core/java/com/android/server/PermissionDialog.java
+++ b/services/core/java/com/android/server/PermissionDialog.java
@@ -102,6 +102,10 @@ public class PermissionDialog extends BasePermissionDialog {
                 mHandler.obtainMessage(ACTION_IGNORED_TIMEOUT), DISMISS_TIMEOUT);
     }
 
+    public void ignore() {
+        mHandler.sendMessage(mHandler.obtainMessage(ACTION_IGNORED_TIMEOUT));
+    }
+
     private String getAppName(String packageName) {
         ApplicationInfo appInfo = null;
         PackageManager pm = mContext.getPackageManager();
diff --git a/services/core/java/com/android/server/PermissionDialogReqQueue.java b/services/core/java/com/android/server/PermissionDialogReqQueue.java
index ee94427..5b602e3 100644
--- a/services/core/java/com/android/server/PermissionDialogReqQueue.java
+++ b/services/core/java/com/android/server/PermissionDialogReqQueue.java
@@ -79,4 +79,10 @@ public class PermissionDialogReqQueue {
             }
         }
     }
+
+    public void ignore() {
+        if (mDialog != null) {
+            mDialog.ignore();
+        }
+    }
 }
diff --git a/services/core/java/com/android/server/SystemConfig.java b/services/core/java/com/android/server/SystemConfig.java
index 2d94370..fe69d98 100644
--- a/services/core/java/com/android/server/SystemConfig.java
+++ b/services/core/java/com/android/server/SystemConfig.java
@@ -16,7 +16,14 @@
 
 package com.android.server;
 
+import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS;
+import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK;
+import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER;
+import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;
+import static android.content.pm.PackageManager.INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK;
+
 import android.app.ActivityManager;
+import android.content.ComponentName;
 import android.content.pm.FeatureInfo;
 import android.content.pm.Signature;
 import android.os.*;
@@ -98,11 +105,14 @@ public class SystemConfig {
 
     // These are the package names of apps which should be in the 'always'
     // URL-handling state upon factory reset.
-    final ArraySet<String> mLinkedApps = new ArraySet<>();
+    final ArraySet<AppLink> mLinkedApps = new ArraySet<>();
 
     final ArrayMap<Signature, ArraySet<String>> mSignatureAllowances
             = new ArrayMap<Signature, ArraySet<String>>();
 
+    // These are the permitted backup transport service components
+    final ArraySet<ComponentName> mBackupTransportWhitelist = new ArraySet<>();
+
     public static SystemConfig getInstance() {
         synchronized (SystemConfig.class) {
             if (sInstance == null) {
@@ -144,7 +154,7 @@ public class SystemConfig {
         return mFixedImeApps;
     }
 
-    public ArraySet<String> getLinkedApps() {
+    public ArraySet<AppLink> getLinkedApps() {
         return mLinkedApps;
     }
 
@@ -152,6 +162,10 @@ public class SystemConfig {
         return mSignatureAllowances;
     }
 
+    public ArraySet<ComponentName> getBackupTransportWhitelist() {
+        return mBackupTransportWhitelist;
+    }
+
     SystemConfig() {
         // Read configuration from system
         readPermissions(Environment.buildPath(
@@ -418,11 +432,29 @@ public class SystemConfig {
 
                 } else if ("app-link".equals(name)) {
                     String pkgname = parser.getAttributeValue(null, "package");
+                    String state = parser.getAttributeValue(null, "state");
                     if (pkgname == null) {
                         Slog.w(TAG, "<app-link> without package in " + permFile + " at "
                                 + parser.getPositionDescription());
                     } else {
-                        mLinkedApps.add(pkgname);
+                        mLinkedApps.add(makeLink(pkgname, state));
+                    }
+                    XmlUtils.skipCurrentTag(parser);
+                } else if ("backup-transport-whitelisted-service".equals(name)) {
+                    String serviceName = parser.getAttributeValue(null, "service");
+                    if (serviceName == null) {
+                        Slog.w(TAG, "<backup-transport-whitelisted-service> without service in "
+                                + permFile + " at " + parser.getPositionDescription());
+                    } else {
+                        ComponentName cn = ComponentName.unflattenFromString(serviceName);
+                        if (cn == null) {
+                            Slog.w(TAG,
+                                    "<backup-transport-whitelisted-service> with invalid service name "
+                                    + serviceName + " in "+ permFile
+                                    + " at " + parser.getPositionDescription());
+                        } else {
+                            mBackupTransportWhitelist.add(cn);
+                        }
                     }
                     XmlUtils.skipCurrentTag(parser);
 
@@ -446,6 +478,23 @@ public class SystemConfig {
         }
     }
 
+    private AppLink makeLink(String pkgname, String state) {
+        AppLink al = new AppLink();
+        al.pkgname = pkgname;
+        if (state == null || "always".equals(state)) { // default
+            al.state = INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS;
+        } else if ("always-ask".equals(state)) {
+            al.state = INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS_ASK;
+        } else if ("ask".equals("state")) {
+            al.state = INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ASK;
+        } else if ("never".equals("state")) {
+            al.state = INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_NEVER;
+        } else {
+            al.state = INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED;
+        }
+        return al;
+    }
+
     void readPermission(XmlPullParser parser, String name)
             throws IOException, XmlPullParserException {
         if (mPermissions.containsKey(name)) {
@@ -480,4 +529,20 @@ public class SystemConfig {
             XmlUtils.skipCurrentTag(parser);
         }
     }
+
+    /** Simple value class to hold an app-link entry.
+     *  It is public because PackageManagerService needs to see it */
+    public static class AppLink {
+        public String pkgname;
+        public int state;
+
+        @Override
+        public int hashCode() { return pkgname.hashCode(); }
+
+        @Override
+        public boolean equals(Object other) {
+            if (!(other instanceof AppLink)) { return false; }
+            return pkgname.equals(((AppLink)other).pkgname);
+        }
+    }
 }
diff --git a/services/core/java/com/android/server/TelephonyRegistry.java b/services/core/java/com/android/server/TelephonyRegistry.java
index 71ff6e9..c7f4d0f 100644
--- a/services/core/java/com/android/server/TelephonyRegistry.java
+++ b/services/core/java/com/android/server/TelephonyRegistry.java
@@ -1019,7 +1019,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
             if (validatePhoneId(phoneId)) {
                 mDataActivity[phoneId] = state;
                 for (Record r : mRecords) {
-                    if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_DATA_ACTIVITY)) {
+                    if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_DATA_ACTIVITY)
+                            && idMatch(r.subId, subId, phoneId)) {
                         try {
                             r.callback.onDataActivity(state);
                         } catch (RemoteException ex) {
@@ -1062,7 +1063,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
                 }
                 boolean modified = false;
                 if (state == TelephonyManager.DATA_CONNECTED) {
-                    if (!mConnectedApns[phoneId].contains(apnType)) {
+                    if (!mConnectedApns[phoneId].contains(apnType)
+                            && !apnType.equals(PhoneConstants.APN_TYPE_IMS)) {
                         mConnectedApns[phoneId].add(apnType);
                         if (mDataConnectionState[phoneId] != state) {
                             mDataConnectionState[phoneId] = state;
@@ -1248,7 +1250,41 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
         }
         broadcastPreciseCallStateChanged(ringingCallState, foregroundCallState, backgroundCallState,
                 DisconnectCause.NOT_VALID,
-                PreciseDisconnectCause.NOT_VALID);
+                PreciseDisconnectCause.NOT_VALID, SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+    }
+
+    public void notifyPreciseCallStateForSubscriber(int subId, int ringingCallState,
+            int foregroundCallState, int backgroundCallState) {
+        if (!checkNotifyPermission("notifyPreciseCallStateForSubscriber()")) {
+            return;
+        }
+        synchronized (mRecords) {
+            int phoneId = SubscriptionManager.getPhoneId(subId);
+            if (validatePhoneId(phoneId)) {
+                mRingingCallState = ringingCallState;
+                mForegroundCallState = foregroundCallState;
+                mBackgroundCallState = backgroundCallState;
+                mPreciseCallState = new PreciseCallState(ringingCallState, foregroundCallState,
+                        backgroundCallState,
+                        DisconnectCause.NOT_VALID,
+                        PreciseDisconnectCause.NOT_VALID);
+                for (Record r : mRecords) {
+                    if (r.matchPhoneStateListenerEvent(PhoneStateListener.LISTEN_PRECISE_CALL_STATE)
+                            && ((r.subId == subId) ||
+                            (r.subId == SubscriptionManager.DEFAULT_SUBSCRIPTION_ID))) {
+                        try {
+                            r.callback.onPreciseCallStateChanged(mPreciseCallState);
+                        } catch (RemoteException ex) {
+                            mRemoveList.add(r.binder);
+                        }
+                    }
+                }
+            }
+            handleRemoveListLocked();
+        }
+        broadcastPreciseCallStateChanged(ringingCallState, foregroundCallState, backgroundCallState,
+                DisconnectCause.NOT_VALID,
+                PreciseDisconnectCause.NOT_VALID, subId);
     }
 
     public void notifyDisconnectCause(int disconnectCause, int preciseDisconnectCause) {
@@ -1270,7 +1306,8 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
             handleRemoveListLocked();
         }
         broadcastPreciseCallStateChanged(mRingingCallState, mForegroundCallState,
-                mBackgroundCallState, disconnectCause, preciseDisconnectCause);
+                mBackgroundCallState, disconnectCause, preciseDisconnectCause,
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
     }
 
     public void notifyPreciseDataConnectionFailed(String reason, String apnType,
@@ -1510,13 +1547,16 @@ class TelephonyRegistry extends ITelephonyRegistry.Stub {
     }
 
     private void broadcastPreciseCallStateChanged(int ringingCallState, int foregroundCallState,
-            int backgroundCallState, int disconnectCause, int preciseDisconnectCause) {
+            int backgroundCallState, int disconnectCause, int preciseDisconnectCause, int subId) {
         Intent intent = new Intent(TelephonyManager.ACTION_PRECISE_CALL_STATE_CHANGED);
         intent.putExtra(TelephonyManager.EXTRA_RINGING_CALL_STATE, ringingCallState);
         intent.putExtra(TelephonyManager.EXTRA_FOREGROUND_CALL_STATE, foregroundCallState);
         intent.putExtra(TelephonyManager.EXTRA_BACKGROUND_CALL_STATE, backgroundCallState);
         intent.putExtra(TelephonyManager.EXTRA_DISCONNECT_CAUSE, disconnectCause);
         intent.putExtra(TelephonyManager.EXTRA_PRECISE_DISCONNECT_CAUSE, preciseDisconnectCause);
+        if (subId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
+            intent.putExtra(PhoneConstants.SUBSCRIPTION_KEY, subId);
+        }
         mContext.sendBroadcastAsUser(intent, UserHandle.ALL,
                 android.Manifest.permission.READ_PRECISE_PHONE_STATE);
     }
diff --git a/services/core/java/com/android/server/accounts/TokenCache.java b/services/core/java/com/android/server/accounts/TokenCache.java
index be91f98..81c6b0e 100644
--- a/services/core/java/com/android/server/accounts/TokenCache.java
+++ b/services/core/java/com/android/server/accounts/TokenCache.java
@@ -125,7 +125,7 @@ import java.util.Objects;
                  * This is recursive, but it won't spiral out of control because LruCache is
                  * thread safe and the Evictor can only be removed once.
                  */
-                Evictor evictor = mTokenEvictors.remove(oldVal.token);
+                Evictor evictor = mTokenEvictors.remove(new Pair<>(k.account.type, oldVal.token));
                 if (evictor != null) {
                     evictor.evict();
                 }
@@ -133,13 +133,15 @@ import java.util.Objects;
         }
 
         public void putToken(Key k, Value v) {
-            // Prepare for removal by token string.
-            Evictor tokenEvictor = mTokenEvictors.get(v.token);
+            // Prepare for removal by pair of account type and token string.
+            Pair<String, String> pair = new Pair<>(k.account.type, v.token);
+
+            Evictor tokenEvictor = mTokenEvictors.get(pair);
             if (tokenEvictor == null) {
                 tokenEvictor = new Evictor();
             }
             tokenEvictor.add(k);
-            mTokenEvictors.put(new Pair<>(k.account.type, v.token), tokenEvictor);
+            mTokenEvictors.put(pair, tokenEvictor);
 
             // Prepare for removal by associated account.
             Evictor accountEvictor = mAccountEvictors.get(k.account);
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index def4c59..30f35af 100755
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -44,6 +44,7 @@ import android.app.ApplicationThreadNative;
 import android.app.BroadcastOptions;
 import android.app.IActivityContainer;
 import android.app.IActivityContainerCallback;
+import android.app.IActivityManager;
 import android.app.IAppTask;
 import android.app.ITaskStackListener;
 import android.app.ProfilerInfo;
@@ -218,6 +219,7 @@ import android.os.UpdateLock;
 import android.os.UserHandle;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.telecom.TelecomManager;
 import android.text.format.DateUtils;
 import android.text.format.Time;
 import android.util.AtomicFile;
@@ -264,6 +266,9 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
+
+import cyanogenmod.power.PerformanceManagerInternal;
+
 import java.util.Date;
 import java.text.SimpleDateFormat;
 
@@ -1094,6 +1099,8 @@ public final class ActivityManagerService extends ActivityManagerNative
      */
     private IVoiceInteractionSession mRunningVoice;
 
+    PerformanceManagerInternal mPerf;
+
     /**
      * For some direct access we need to power manager.
      */
@@ -2200,6 +2207,7 @@ public final class ActivityManagerService extends ActivityManagerNative
 
                 try {
                     Intent protectedAppIntent = new Intent();
+                    protectedAppIntent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
                     protectedAppIntent.setComponent(
                             new ComponentName("com.android.settings",
                                     "com.android.settings.applications.ProtectedAppsActivity"));
@@ -2232,6 +2240,8 @@ public final class ActivityManagerService extends ActivityManagerNative
                             .build();
                     try {
                         int[] outId = new int[1];
+                        inm.cancelNotificationWithTag("android", null,
+                                R.string.notify_package_component_protected_title, msg.arg1);
                         inm.enqueueNotificationWithTag("android", "android", null,
                                 R.string.notify_package_component_protected_title,
                                 notification, outId, mCurrentUserId);
@@ -3010,7 +3020,7 @@ public final class ActivityManagerService extends ActivityManagerNative
             if (!app.killed) {
                 Slog.wtfStack(TAG, "Removing process that hasn't been killed: " + app);
                 Process.killProcessQuiet(app.pid);
-                killProcessGroup(app.info.uid, app.pid);
+                killProcessGroup(app.uid, app.pid);
             }
             if (lrui <= mLruProcessActivityStart) {
                 mLruProcessActivityStart--;
@@ -3385,7 +3395,7 @@ public final class ActivityManagerService extends ActivityManagerNative
             // clean it up now.
             if (DEBUG_PROCESSES || DEBUG_CLEANUP) Slog.v(TAG_PROCESSES, "App died: " + app);
             checkTime(startTime, "startProcess: bad proc running, killing");
-            killProcessGroup(app.info.uid, app.pid);
+            killProcessGroup(app.uid, app.pid);
             handleAppDiedLocked(app, true, true);
             checkTime(startTime, "startProcess: done killing old proc");
         }
@@ -3440,6 +3450,17 @@ public final class ActivityManagerService extends ActivityManagerNative
                 null /* entryPoint */, null /* entryPointArgs */);
     }
 
+    void launchBoost(int pid, String packageName) {
+        if (mPerf == null) {
+            mPerf = LocalServices.getService(PerformanceManagerInternal.class);
+            if (mPerf == null) {
+                Slog.e(TAG, "PerformanceManager not ready!");
+                return;
+            }
+        }
+        mPerf.launchBoost(pid, packageName);
+    }
+
     private final void startProcessLocked(ProcessRecord app, String hostingType,
             String hostingNameStr, String abiOverride, String entryPoint, String[] entryPointArgs) {
         long startTime = SystemClock.elapsedRealtime();
@@ -3602,6 +3623,9 @@ public final class ActivityManagerService extends ActivityManagerNative
             checkTime(startTime, "startProcess: building log message");
             StringBuilder buf = mStringBuilder;
             buf.setLength(0);
+            if (hostingType.equals("activity")) {
+                launchBoost(startResult.pid, app.processName);
+            }
             buf.append("Start proc ");
             buf.append(startResult.pid);
             buf.append(':');
@@ -3626,6 +3650,18 @@ public final class ActivityManagerService extends ActivityManagerNative
             app.killed = false;
             app.killedByAm = false;
             checkTime(startTime, "startProcess: starting to update pids map");
+            ProcessRecord oldApp;
+            synchronized (mPidsSelfLocked) {
+                oldApp = mPidsSelfLocked.get(startResult.pid);
+            }
+            // If there is already an app occupying that pid that hasn't been cleaned up
+            if (oldApp != null && !app.isolated) {
+                // Clean up anything relating to this pid first
+                Slog.w(TAG, "Reusing pid " + startResult.pid
+                        + " while app is still mapped to it");
+                cleanUpApplicationRecordLocked(oldApp, false, false, -1,
+                        true /*replacingPid*/);
+            }
             synchronized (mPidsSelfLocked) {
                 this.mPidsSelfLocked.put(startResult.pid, app);
                 if (isActivityProcess) {
@@ -4780,7 +4816,8 @@ public final class ActivityManagerService extends ActivityManagerNative
     private final void handleAppDiedLocked(ProcessRecord app,
             boolean restarting, boolean allowRestart) {
         int pid = app.pid;
-        boolean kept = cleanUpApplicationRecordLocked(app, restarting, allowRestart, -1);
+        boolean kept = cleanUpApplicationRecordLocked(app, restarting, allowRestart, -1,
+                false /*replacingPid*/);
         if (!kept && !restarting) {
             removeLruProcessLocked(app);
             if (pid > 0) {
@@ -4921,7 +4958,7 @@ public final class ActivityManagerService extends ActivityManagerNative
             if (!fromBinderDied) {
                 Process.killProcessQuiet(pid);
             }
-            killProcessGroup(app.info.uid, pid);
+            killProcessGroup(app.uid, pid);
             app.killed = true;
         }
 
@@ -6535,12 +6572,14 @@ public final class ActivityManagerService extends ActivityManagerNative
     }
 
     @Override
-    public void showBootMessage(final CharSequence msg, final boolean always) {
+    public void updateBootProgress(final int stage, final ApplicationInfo optimizedApp,
+            final int currentAppPos, final int totalAppCount, final boolean always) {
         if (Binder.getCallingUid() != Process.myUid()) {
             // These days only the core system can call this, so apps can't get in
             // the way of what we show about running them.
         }
-        mWindowManager.showBootMessage(msg, always);
+        mWindowManager.updateBootProgress(stage, optimizedApp,
+                currentAppPos, totalAppCount, always);
     }
 
     @Override
@@ -9047,6 +9086,27 @@ public final class ActivityManagerService extends ActivityManagerNative
         }
     }
 
+    private void cleanupProtectedComponentTasksLocked() {
+        for (int i = mRecentTasks.size() - 1; i >= 0; i--) {
+            TaskRecord tr = mRecentTasks.get(i);
+
+            for (int j = tr.mActivities.size() - 1; j >= 0; j--) {
+                ActivityRecord r = tr.mActivities.get(j);
+                ComponentName cn = r.realActivity;
+
+                try {
+                    boolean isProtected = AppGlobals.getPackageManager()
+                        .isComponentProtected(null, -1, cn, getCurrentUserIdLocked());
+                    if (isProtected) {
+                        removeTaskByIdLocked(tr.taskId, false);
+                    }
+                } catch (RemoteException re) {
+
+                }
+            }
+        }
+    }
+
     /**
      * Removes the task with the specified task id.
      *
@@ -9453,6 +9513,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);
         }
@@ -11937,8 +12001,8 @@ public final class ActivityManagerService extends ActivityManagerNative
                 intent.setComponent(comp);
                 doneReceivers.add(comp);
                 lastRi = curRi;
-                CharSequence label = ai.loadLabel(mContext.getPackageManager());
-                showBootMessage(mContext.getString(R.string.android_preparing_apk, label), false);
+                updateBootProgress(IActivityManager.BOOT_STAGE_PREPARING_APPS,
+                        ai.applicationInfo, 0, 0, false);
             }
             Slog.i(TAG, "Pre-boot of " + intent.getComponent().toShortString()
                     + " for user " + users[curUser]);
@@ -12046,6 +12110,7 @@ public final class ActivityManagerService extends ActivityManagerNative
 
             mRecentTasks.clear();
             mRecentTasks.addAll(mTaskPersister.restoreTasksLocked());
+            cleanupProtectedComponentTasksLocked();
             mRecentTasks.cleanupLocked(UserHandle.USER_ALL);
             mTaskPersister.startPersisting();
 
@@ -12060,9 +12125,8 @@ public final class ActivityManagerService extends ActivityManagerNative
                         synchronized (ActivityManagerService.this) {
                             mDidUpdate = true;
                         }
-                        showBootMessage(mContext.getText(
-                                R.string.android_upgrading_complete),
-                                false);
+                        updateBootProgress(IActivityManager.BOOT_STAGE_COMPLETE,
+                                null, 0, 0, false);
                         writeLastDonePreBootReceivers(doneReceivers);
                         systemReady(goingCallback);
                     }
@@ -12552,6 +12616,7 @@ public final class ActivityManagerService extends ActivityManagerNative
         synchronized (sb) {
             bufferWasEmpty = sb.length() == 0;
             appendDropBoxProcessHeaders(process, processName, sb);
+            sb.append("CM Version: ").append(cyanogenmod.os.Build.CYANOGENMOD_VERSION).append("\n");
             sb.append("Build: ").append(Build.FINGERPRINT).append("\n");
             sb.append("System-App: ").append(isSystemApp).append("\n");
             sb.append("Uptime-Millis: ").append(info.violationUptimeMillis).append("\n");
@@ -12821,6 +12886,7 @@ public final class ActivityManagerService extends ActivityManagerNative
         if (subject != null) {
             sb.append("Subject: ").append(subject).append("\n");
         }
+        sb.append("CM Version: ").append(cyanogenmod.os.Build.CYANOGENMOD_VERSION).append("\n");
         sb.append("Build: ").append(Build.FINGERPRINT).append("\n");
         if (Debug.isDebuggerConnected()) {
             sb.append("Debugger: Connected\n");
@@ -15850,7 +15916,8 @@ public final class ActivityManagerService extends ActivityManagerNative
      * app that was passed in must remain on the process lists.
      */
     private final boolean cleanUpApplicationRecordLocked(ProcessRecord app,
-            boolean restarting, boolean allowRestart, int index) {
+            boolean restarting, boolean allowRestart, int index, boolean replacingPid) {
+        Slog.d(TAG, "cleanUpApplicationRecord -- " + app.pid);
         if (index >= 0) {
             removeLruProcessLocked(app);
             ProcessList.remove(app.pid);
@@ -15980,7 +16047,9 @@ public final class ActivityManagerService extends ActivityManagerNative
         if (!app.persistent || app.isolated) {
             if (DEBUG_PROCESSES || DEBUG_CLEANUP) Slog.v(TAG_CLEANUP,
                     "Removing non-persistent process during cleanup: " + app);
-            removeProcessNameLocked(app.processName, app.uid);
+            if (!replacingPid) {
+                removeProcessNameLocked(app.processName, app.uid);
+            }
             if (mHeavyWeightProcess == app) {
                 mHandler.sendMessage(mHandler.obtainMessage(CANCEL_HEAVY_NOTIFICATION_MSG,
                         mHeavyWeightProcess.userId, 0));
@@ -16387,11 +16456,22 @@ public final class ActivityManagerService extends ActivityManagerNative
     // Cause the target app to be launched if necessary and its backup agent
     // instantiated.  The backup agent will invoke backupAgentCreated() on the
     // activity manager to announce its creation.
-    public boolean bindBackupAgent(ApplicationInfo app, int backupMode) {
-        if (DEBUG_BACKUP) Slog.v(TAG_BACKUP,
-                "bindBackupAgent: app=" + app + " mode=" + backupMode);
+    public boolean bindBackupAgent(String packageName, int backupMode, int userId) {
+        if (DEBUG_BACKUP) Slog.v(TAG, "bindBackupAgent: app=" + packageName + " mode=" + backupMode);
         enforceCallingPermission("android.permission.CONFIRM_FULL_BACKUP", "bindBackupAgent");
 
+        IPackageManager pm = AppGlobals.getPackageManager();
+        ApplicationInfo app = null;
+        try {
+            app = pm.getApplicationInfo(packageName, 0, userId);
+        } catch (RemoteException e) {
+            // can't happen; package manager is process-local
+        }
+        if (app == null) {
+            Slog.w(TAG, "Unable to bind backup agent for " + packageName);
+            return false;
+        }
+
         synchronized(this) {
             // !!! TODO: currently no check here that we're already bound
             BatteryStatsImpl.Uid.Pkg.Serv ss = null;
@@ -16916,7 +16996,8 @@ public final class ActivityManagerService extends ActivityManagerNative
         } else if (callerApp == null || !callerApp.persistent) {
             try {
                 if (AppGlobals.getPackageManager().isProtectedBroadcast(
-                        intent.getAction())) {
+                        intent.getAction()) && !AppGlobals.getPackageManager()
+                        .isProtectedBroadcastAllowed(intent.getAction(), callingUid)) {
                     String msg = "Permission Denial: not allowed to send broadcast "
                             + intent.getAction() + " from pid="
                             + callingPid + ", uid=" + callingUid;
@@ -17087,6 +17168,14 @@ public final class ActivityManagerService extends ActivityManagerNative
                     ProxyInfo proxy = intent.getParcelableExtra(Proxy.EXTRA_PROXY_INFO);
                     mHandler.sendMessage(mHandler.obtainMessage(UPDATE_HTTP_PROXY_MSG, proxy));
                     break;
+                case cyanogenmod.content.Intent.ACTION_PROTECTED_CHANGED:
+                    final boolean state =
+                            intent.getBooleanExtra(
+                                    cyanogenmod.content.Intent.EXTRA_PROTECTED_STATE, false);
+                    if (state == PackageManager.COMPONENT_PROTECTED_STATUS) {
+                        cleanupProtectedComponentTasksLocked();
+                    }
+                    break;
             }
         }
 
@@ -17753,6 +17842,11 @@ public final class ActivityManagerService extends ActivityManagerNative
                             !values.themeConfig.equals(mConfiguration.themeConfig));
                 }
 
+                if ((changes & ActivityInfo.CONFIG_THEME_FONT) != 0) {
+                    // Notify zygote that themes need a refresh
+                    SystemProperties.set(PROP_REFRESH_THEME, "1");
+                }
+
                 mConfigurationSeq++;
                 if (mConfigurationSeq <= 0) {
                     mConfigurationSeq = 1;
@@ -19923,7 +20017,7 @@ public final class ActivityManagerService extends ActivityManagerNative
                             // Ignore exceptions.
                         }
                     }
-                    cleanUpApplicationRecordLocked(app, false, true, -1);
+                    cleanUpApplicationRecordLocked(app, false, true, -1, false /*replacingPid*/);
                     mRemovedProcesses.remove(i);
 
                     if (app.persistent) {
diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java
index f439966..f676db9 100644
--- a/services/core/java/com/android/server/am/ActivityStack.java
+++ b/services/core/java/com/android/server/am/ActivityStack.java
@@ -1701,10 +1701,10 @@ final class ActivityStack {
         if (DEBUG_SWITCH) Slog.v(TAG_SWITCH, "Resuming " + next);
 
         // Some activities may want to alter the system power management
-        if (mStackSupervisor.mPerf != null) {
-            mStackSupervisor.mPerf.activityResumed(next.intent);
+        if (mStackSupervisor.mService.mPerf != null) {
+            mStackSupervisor.mService.mPerf.activityResumed(next.intent);
         }
-        
+
         // If we are currently pausing an activity, then don't do anything
         // until that is done.
         if (!mStackSupervisor.allPausedActivitiesComplete()) {
@@ -1838,8 +1838,8 @@ final class ActivityStack {
                             ? AppTransition.TRANSIT_ACTIVITY_CLOSE
                             : AppTransition.TRANSIT_TASK_CLOSE, false);
                     if (prev.task != next.task) {
-                        if (mStackSupervisor.mPerf != null) {
-                            mStackSupervisor.mPerf.cpuBoost(2000 * 1000);
+                        if (mStackSupervisor.mService.mPerf != null) {
+                            mStackSupervisor.mService.mPerf.cpuBoost(2000 * 1000);
                         }
                     }
                 }
@@ -1858,8 +1858,8 @@ final class ActivityStack {
                                     ? AppTransition.TRANSIT_TASK_OPEN_BEHIND
                                     : AppTransition.TRANSIT_TASK_OPEN, false);
                     if (prev.task != next.task) {
-                        if (mStackSupervisor.mPerf != null) {
-                            mStackSupervisor.mPerf.cpuBoost(2000 * 1000);
+                        if (mStackSupervisor.mService.mPerf != null) {
+                            mStackSupervisor.mService.mPerf.cpuBoost(2000 * 1000);
                         }
                     }
                 }
@@ -4230,7 +4230,8 @@ final class ActivityStack {
             if (focusedStack && topTask) {
                 // Give the latest time to ensure foreground task can be sorted
                 // at the first, because lastActiveTime of creating task is 0.
-                ci.lastActiveTime = System.currentTimeMillis();
+                // Only do this if the clock didn't run backwards, though.
+                ci.lastActiveTime = Math.max(ci.lastActiveTime, System.currentTimeMillis());
                 topTask = false;
             }
 
diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
index cf49e15..bde32e7 100644
--- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java
@@ -118,8 +118,6 @@ import com.android.server.LocalServices;
 import com.android.server.am.ActivityStack.ActivityState;
 import com.android.server.wm.WindowManagerService;
 
-import cyanogenmod.power.PerformanceManagerInternal;
-
 import java.io.FileDescriptor;
 import java.io.IOException;
 import java.io.PrintWriter;
@@ -276,8 +274,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
 
     PowerManager mPm;
 
-    PerformanceManagerInternal mPerf;
-
     /**
      * Is the privacy guard currently enabled? Shared between ActivityStacks
      */
@@ -354,17 +350,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
         mHandler = new ActivityStackSupervisorHandler(mService.mHandler.getLooper());
     }
 
-    private void launchBoost() {
-        if (mPerf == null) {
-            mPerf = LocalServices.getService(PerformanceManagerInternal.class);
-        }
-        if (mPerf == null) {
-            Slog.e(TAG, "PerformanceManager not ready!");
-        } else {
-            mPerf.launchBoost();
-        }
-    }
-    
     /**
      * At the time when the constructor runs, the power manager has not yet been
      * initialized.  So we initialize our wakelocks afterwards.
@@ -972,10 +957,26 @@ public final class ActivityStackSupervisor implements DisplayListener {
                 return ActivityManager.START_CANCELED;
             }
 
+            if (intent.getAction() != null && !isProvisioned()) {
+                switch (intent.getAction()) {
+                    case Intent.ACTION_SEARCH:
+                    case Intent.ACTION_WEB_SEARCH:
+                    case Intent.ACTION_PROCESS_TEXT:
+                    case Intent.ACTION_ASSIST:
+                    case Intent.ACTION_VOICE_ASSIST:
+                        Slog.w(TAG, "not starting assist intent while not provisioned");
+                        return ActivityManager.START_NOT_CURRENT_USER_ACTIVITY;
+                }
+            }
             try {
                 //TODO: This needs to be a flushed out API in the future.
-                if (intent.getComponent() != null && AppGlobals.getPackageManager()
-                        .isComponentProtected(callingPackage, intent.getComponent(), userId)) {
+                boolean isProtected = intent.getComponent() != null
+                        && AppGlobals.getPackageManager()
+                        .isComponentProtected(callingPackage, callingUid,
+                                intent.getComponent(), userId) &&
+                        (intent.getFlags()&Intent.FLAG_GRANT_READ_URI_PERMISSION) == 0;
+
+                if (isProtected) {
                     Message msg = mService.mHandler.obtainMessage(
                             ActivityManagerService.POST_COMPONENT_PROTECTED_MSG);
                     //Store start flags, userid
@@ -988,6 +989,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
             } catch (RemoteException e) {
                 e.printStackTrace();
             }
+
             final int realCallingPid = Binder.getCallingPid();
             final int realCallingUid = Binder.getCallingUid();
             int callingPid;
@@ -1468,8 +1470,6 @@ public final class ActivityStackSupervisor implements DisplayListener {
                             Display.DEFAULT_DISPLAY : mFocusedStack.mDisplayId) :
                             (container.mActivityDisplay == null ? Display.DEFAULT_DISPLAY :
                                     container.mActivityDisplay.mDisplayId)));
-            /* Acquire perf lock during new app launch */
-            launchBoost();
         }
 
         ActivityRecord sourceRecord = null;
@@ -1886,6 +1886,29 @@ public final class ActivityStackSupervisor implements DisplayListener {
             inTask = null;
         }
 
+        try {
+            //TODO: This needs to be a flushed out API in the future.
+            boolean isProtected = intent.getComponent() != null
+                    && AppGlobals.getPackageManager()
+                    .isComponentProtected(sourceRecord == null ? "android" :
+                                    sourceRecord.launchedFromPackage, r.launchedFromUid,
+                            intent.getComponent(), r.userId) &&
+                    (intent.getFlags()&Intent.FLAG_GRANT_READ_URI_PERMISSION) == 0;
+
+            if (isProtected && r.state == INITIALIZING) {
+                Message msg = mService.mHandler.obtainMessage(
+                        ActivityManagerService.POST_COMPONENT_PROTECTED_MSG);
+                //Store start flags, userid
+                intent.setFlags(startFlags);
+                intent.putExtra("com.android.settings.PROTECTED_APPS_USER_ID", r.userId);
+                msg.obj = intent;
+                mService.mHandler.sendMessage(msg);
+                return ActivityManager.START_NOT_CURRENT_USER_ACTIVITY;
+            }
+        } catch (RemoteException e) {
+            e.printStackTrace();
+        }
+
         final boolean launchSingleTop = r.launchMode == ActivityInfo.LAUNCH_SINGLE_TOP;
         final boolean launchSingleInstance = r.launchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE;
         final boolean launchSingleTask = r.launchMode == ActivityInfo.LAUNCH_SINGLE_TASK;
@@ -2822,7 +2845,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
         ActivityRecord top = task.stack.topRunningActivityLocked(null);
         /* App is launching from recent apps and it's a new process */
         if(top != null && top.state == ActivityState.DESTROYED) {
-            launchBoost();
+            mService.launchBoost(-1, top.packageName);
         }
 
         if ((flags & ActivityManager.MOVE_TASK_NO_USER_ACTION) == 0) {
@@ -3107,15 +3130,15 @@ public final class ActivityStackSupervisor implements DisplayListener {
                 final ActivityRecord ar = stack.findTaskLocked(r);
                 if (ar != null) {
                     if (ar.state == ActivityState.DESTROYED) {
-                        launchBoost();
+                        mService.launchBoost(-1, r.packageName);
                     }
                     return ar;
                 }
             }
         }
-        if (DEBUG_TASKS) Slog.d(TAG_TASKS, "No task found");
-        launchBoost();
+        mService.launchBoost(-1, r.packageName);
 
+        if (DEBUG_TASKS) Slog.d(TAG_TASKS, "No task found");
         return null;
     }
 
@@ -3924,7 +3947,9 @@ public final class ActivityStackSupervisor implements DisplayListener {
     }
 
     void showLockTaskToast() {
-        mLockTaskNotify.showToast(mLockTaskModeState);
+        if (mLockTaskNotify != null) {
+            mLockTaskNotify.showToast(mLockTaskModeState);
+        }
     }
 
     void showLockTaskEscapeMessageLocked(TaskRecord task) {
@@ -4663,4 +4688,9 @@ public final class ActivityStackSupervisor implements DisplayListener {
 
         return onLeanbackOnly;
     }
+
+    private boolean isProvisioned() {
+        return Settings.Global.getInt(mService.mContext.getContentResolver(),
+                Settings.Global.DEVICE_PROVISIONED, 0) == 1;
+    }
 }
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index 589a4b8..e7fec19 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -297,6 +297,11 @@ public final class BroadcastQueue {
         boolean didSomething = false;
         final BroadcastRecord br = mPendingBroadcast;
         if (br != null && br.curApp.pid == app.pid) {
+            if (br.curApp != app) {
+                Slog.e(TAG, "App mismatch when sending pending broadcast to "
+                        + app.processName + ", intended target is " + br.curApp.processName);
+                return false;
+            }
             try {
                 mPendingBroadcast = null;
                 processCurBroadcastLocked(br, app);
diff --git a/services/core/java/com/android/server/am/LockTaskNotify.java b/services/core/java/com/android/server/am/LockTaskNotify.java
index 055e33e..a5d37f0 100644
--- a/services/core/java/com/android/server/am/LockTaskNotify.java
+++ b/services/core/java/com/android/server/am/LockTaskNotify.java
@@ -51,8 +51,8 @@ public class LockTaskNotify {
     private boolean hasNavigationBar() {
         return mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_showNavigationBar)
-                || CMSettings.Secure.getIntForUser(mContext.getContentResolver(),
-                        CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;
+                || CMSettings.Global.getIntForUser(mContext.getContentResolver(),
+                        CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;
     }
 
     public void showToast(int lockTaskModeState) {
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index 9c9a421..4def2fb 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -260,8 +260,8 @@ final class ProcessList {
         int maxSize = 1280*800; // 1024000  230400 870400  .264
         float scaleDisp = ((float)(displayWidth*displayHeight)-minSize)/(maxSize-minSize);
         if (false) {
-            Slog.i("XXXXXX", "scaleMem=" + scaleMem);
-            Slog.i("XXXXXX", "scaleDisp=" + scaleDisp + " dw=" + displayWidth
+            Slog.i(TAG, "scaleMem=" + scaleMem);
+            Slog.i(TAG, "scaleDisp=" + scaleDisp + " dw=" + displayWidth
                     + " dh=" + displayHeight);
         }
 
@@ -273,7 +273,7 @@ final class ProcessList {
         int minfree_abs = Resources.getSystem().getInteger(
                 com.android.internal.R.integer.config_lowMemoryKillerMinFreeKbytesAbsolute);
         if (false) {
-            Slog.i("XXXXXX", "minfree_adj=" + minfree_adj + " minfree_abs=" + minfree_abs);
+            Slog.i(TAG, "minfree_adj=" + minfree_adj + " minfree_abs=" + minfree_abs);
         }
 
         // We've now baked in the increase to the basic oom values above, since
@@ -286,12 +286,12 @@ final class ProcessList {
             int low = mOomMinFreeLow[i];
             int high = mOomMinFreeHigh[i];
             if (is64bit) {
-                Slog.i("XXXXXX", "choosing minFree values for 64 Bit");
+                Slog.i(TAG, "choosing minFree values for 64 Bit");
                 // Increase the high min-free levels for cached processes for 64-bit
                 if (i == 4) high = (high*3)/2;
                 else if (i == 5) high = (high*7)/4;
             } else {
-                Slog.i("XXXXXX", "choosing minFree values for 32 Bit");
+                Slog.i(TAG, "choosing minFree values for 32 Bit");
                 low = mOomMinFreeLow32Bit[i];
                 high = mOomMinFreeHigh32Bit[i];
             }
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index 33f1a1c..30f2c3e 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -578,7 +578,7 @@ final class ProcessRecord {
             }
             EventLog.writeEvent(EventLogTags.AM_KILL, userId, pid, processName, setAdj, reason);
             Process.killProcessQuiet(pid);
-            Process.killProcessGroup(info.uid, pid);
+            Process.killProcessGroup(uid, pid);
             if (!persistent) {
                 killed = true;
                 killedByAm = true;
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 92643ba..fe3df61 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -911,59 +911,63 @@ public class AudioService extends IAudioService.Stub {
      * @hide
      */
     public void addMediaPlayerAndUpdateRemoteController (String packageName) {
-        Log.v(TAG, "addMediaPlayerAndUpdateRemoteController: size of existing list: " +
-                mMediaPlayers.size());
-        boolean playerToAdd = true;
-        if (mMediaPlayers.size() > 0) {
-            final Iterator<MediaPlayerInfo> rccIterator = mMediaPlayers.iterator();
-            while (rccIterator.hasNext()) {
-                final MediaPlayerInfo player = rccIterator.next();
-                if (packageName.equals(player.getPackageName())) {
-                    Log.e(TAG, "Player entry present, no need to add");
-                    playerToAdd = false;
-                    player.setFocus(true);
-                } else {
-                    Log.e(TAG, "Player: " + player.getPackageName()+ "Lost Focus");
-                    player.setFocus(false);
+        synchronized(mMediaPlayers) {
+            Log.v(TAG, "addMediaPlayerAndUpdateRemoteController: size of existing list: " +
+                    mMediaPlayers.size());
+            boolean playerToAdd = true;
+            if (mMediaPlayers.size() > 0) {
+                final Iterator<MediaPlayerInfo> rccIterator = mMediaPlayers.iterator();
+                while (rccIterator.hasNext()) {
+                    final MediaPlayerInfo player = rccIterator.next();
+                    if (packageName.equals(player.getPackageName())) {
+                        Log.e(TAG, "Player entry present, no need to add");
+                        playerToAdd = false;
+                        player.setFocus(true);
+                    } else {
+                        Log.e(TAG, "Player: " + player.getPackageName()+ "Lost Focus");
+                        player.setFocus(false);
+                    }
                 }
             }
+            if (playerToAdd) {
+                Log.e(TAG, "Adding Player: " + packageName + " to available player list");
+                mMediaPlayers.add(new MediaPlayerInfo(packageName, true));
+            }
+            Intent intent = new Intent(AudioManager.RCC_CHANGED_ACTION);
+            intent.putExtra(AudioManager.EXTRA_CALLING_PACKAGE_NAME, packageName);
+            intent.putExtra(AudioManager.EXTRA_FOCUS_CHANGED_VALUE, true);
+            intent.putExtra(AudioManager.EXTRA_AVAILABLITY_CHANGED_VALUE, true);
+            sendBroadcastToAll(intent);
+            Log.v(TAG, "updating focussed RCC change to RCD: CallingPackageName:"
+                    + packageName);
         }
-        if (playerToAdd) {
-            Log.e(TAG, "Adding Player: " + packageName + " to available player list");
-            mMediaPlayers.add(new MediaPlayerInfo(packageName, true));
-        }
-        Intent intent = new Intent(AudioManager.RCC_CHANGED_ACTION);
-        intent.putExtra(AudioManager.EXTRA_CALLING_PACKAGE_NAME, packageName);
-        intent.putExtra(AudioManager.EXTRA_FOCUS_CHANGED_VALUE, true);
-        intent.putExtra(AudioManager.EXTRA_AVAILABLITY_CHANGED_VALUE, true);
-        sendBroadcastToAll(intent);
-        Log.v(TAG, "updating focussed RCC change to RCD: CallingPackageName:"
-                + packageName);
     }
 
     /**
      * @hide
      */
     public void updateRemoteControllerOnExistingMediaPlayers() {
-        Log.v(TAG, "updateRemoteControllerOnExistingMediaPlayers: size of Player list: " +
+        synchronized(mMediaPlayers) {
+            Log.v(TAG, "updateRemoteControllerOnExistingMediaPlayers: size of Player list: " +
                                                                 mMediaPlayers.size());
-        if (mMediaPlayers.size() > 0) {
-            Log.v(TAG, "Inform RemoteController regarding existing RCC entry");
-            final Iterator<MediaPlayerInfo> rccIterator = mMediaPlayers.iterator();
-            while (rccIterator.hasNext()) {
-                final MediaPlayerInfo player = rccIterator.next();
-                Intent intent = new Intent(AudioManager.RCC_CHANGED_ACTION);
-                intent.putExtra(AudioManager.EXTRA_CALLING_PACKAGE_NAME,
-                                                    player.getPackageName());
-                intent.putExtra(AudioManager.EXTRA_FOCUS_CHANGED_VALUE,
-                                                    player.isFocussed());
-                intent.putExtra(AudioManager.EXTRA_AVAILABLITY_CHANGED_VALUE, true);
-                sendBroadcastToAll(intent);
-                Log.v(TAG, "updating RCC change: CallingPackageName:" +
-                                                    player.getPackageName());
+            if (mMediaPlayers.size() > 0) {
+                Log.v(TAG, "Inform RemoteController regarding existing RCC entry");
+                final Iterator<MediaPlayerInfo> rccIterator = mMediaPlayers.iterator();
+                while (rccIterator.hasNext()) {
+                    final MediaPlayerInfo player = rccIterator.next();
+                    Intent intent = new Intent(AudioManager.RCC_CHANGED_ACTION);
+                    intent.putExtra(AudioManager.EXTRA_CALLING_PACKAGE_NAME,
+                                                        player.getPackageName());
+                    intent.putExtra(AudioManager.EXTRA_FOCUS_CHANGED_VALUE,
+                                                        player.isFocussed());
+                    intent.putExtra(AudioManager.EXTRA_AVAILABLITY_CHANGED_VALUE, true);
+                    sendBroadcastToAll(intent);
+                    Log.v(TAG, "updating RCC change: CallingPackageName:" +
+                                                        player.getPackageName());
+                }
+            } else {
+                Log.e(TAG, "No RCC entry present to update");
             }
-        } else {
-            Log.e(TAG, "No RCC entry present to update");
         }
     }
 
@@ -971,34 +975,36 @@ public class AudioService extends IAudioService.Stub {
      * @hide
      */
     public void removeMediaPlayerAndUpdateRemoteController (String packageName) {
-        Log.v(TAG, "removeMediaPlayerAndUpdateRemoteController: size of existing list: " +
-                                                                mMediaPlayers.size());
-        boolean playerToRemove = false;
-        int index = -1;
-        if (mMediaPlayers.size() > 0) {
-            final Iterator<MediaPlayerInfo> rccIterator = mMediaPlayers.iterator();
-            while (rccIterator.hasNext()) {
-                index++;
-                final MediaPlayerInfo player = rccIterator.next();
-                if (packageName.equals(player.getPackageName())) {
-                    Log.v(TAG, "Player entry present remove and update RemoteController");
-                    playerToRemove = true;
-                    break;
-                } else {
-                    Log.v(TAG, "Player entry for " + player.getPackageName()+ " is not present");
+        synchronized(mMediaPlayers) {
+            Log.v(TAG, "removeMediaPlayerAndUpdateRemoteController: size of existing list: " +
+                                                                    mMediaPlayers.size());
+            boolean playerToRemove = false;
+            int index = -1;
+            if (mMediaPlayers.size() > 0) {
+                final Iterator<MediaPlayerInfo> rccIterator = mMediaPlayers.iterator();
+                while (rccIterator.hasNext()) {
+                    index++;
+                    final MediaPlayerInfo player = rccIterator.next();
+                    if (packageName.equals(player.getPackageName())) {
+                        Log.v(TAG, "Player entry present remove and update RemoteController");
+                        playerToRemove = true;
+                        break;
+                    } else {
+                        Log.v(TAG, "Player entry for " + player.getPackageName()+ " is not present");
+                    }
                 }
             }
+            if (playerToRemove) {
+                Log.e(TAG, "Removing Player: " + packageName + " from index" + index);
+                mMediaPlayers.remove(index);
+            }
+            Intent intent = new Intent(AudioManager.RCC_CHANGED_ACTION);
+            intent.putExtra(AudioManager.EXTRA_CALLING_PACKAGE_NAME, packageName);
+            intent.putExtra(AudioManager.EXTRA_FOCUS_CHANGED_VALUE, false);
+            intent.putExtra(AudioManager.EXTRA_AVAILABLITY_CHANGED_VALUE, false);
+            sendBroadcastToAll(intent);
+            Log.v(TAG, "Updated List size: " + mMediaPlayers.size());
         }
-        if (playerToRemove) {
-            Log.e(TAG, "Removing Player: " + packageName + " from index" + index);
-            mMediaPlayers.remove(index);
-        }
-        Intent intent = new Intent(AudioManager.RCC_CHANGED_ACTION);
-        intent.putExtra(AudioManager.EXTRA_CALLING_PACKAGE_NAME, packageName);
-        intent.putExtra(AudioManager.EXTRA_FOCUS_CHANGED_VALUE, false);
-        intent.putExtra(AudioManager.EXTRA_AVAILABLITY_CHANGED_VALUE, false);
-        sendBroadcastToAll(intent);
-        Log.v(TAG, "Updated List size: " + mMediaPlayers.size());
     }
 
     private void checkAllAliasStreamVolumes() {
@@ -4003,8 +4009,29 @@ public class AudioService extends IAudioService.Stub {
             int index;
             if (mIsMuted) {
                 index = 0;
-            } else if (((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported)
-                    || ((device & mFullVolumeDevices) != 0)) {
+            } else if ((device & AudioSystem.DEVICE_OUT_ALL_A2DP) != 0 && mAvrcpAbsVolSupported) {
+                /* Special handling for Bluetooth Absolute Volume scenario
+                 * If we send full audio gain, some accessories are too loud even at its lowest
+                 * volume. We are not able to enumerate all such accessories, so here is the
+                 * workaround from phone side.
+                 * For the lowest volume steps 1 and 2, restrict audio gain to 50% and 75%.
+                 * For volume step 0, set audio gain to 0 as some accessories won't mute on their end.
+                 */
+                int i = (getIndex(device) + 5)/10;
+                if (i == 0) {
+                    // 0% for volume 0
+                    index = 0;
+                } else if (i == 1) {
+                    // 50% for volume 1
+                    index = (int)(mIndexMax * 0.5) /10;
+                } else if (i == 2) {
+                    // 75% for volume 2
+                    index = (int)(mIndexMax * 0.75) /10;
+                } else {
+                    // otherwise, full gain
+                    index = (mIndexMax + 5)/10;
+                }
+            } else if ((device & mFullVolumeDevices) != 0) {
                 index = (mIndexMax + 5)/10;
             } else {
                 index = (getIndex(device) + 5)/10;
@@ -4628,7 +4655,11 @@ public class AudioService extends IAudioService.Stub {
                     break;
 
                 case MSG_PLAY_SOUND_EFFECT:
-                    onPlaySoundEffect(msg.arg1, msg.arg2);
+                    if (isStreamMute(AudioSystem.STREAM_SYSTEM)) {
+                        Log.d(TAG, "Stream muted, skip playback");
+                    } else {
+                        onPlaySoundEffect(msg.arg1, msg.arg2);
+                    }
                     break;
 
                 case MSG_BTA2DP_DOCK_TIMEOUT:
diff --git a/services/core/java/com/android/server/connectivity/PacManager.java b/services/core/java/com/android/server/connectivity/PacManager.java
index 7d1da01..58c76ec 100644
--- a/services/core/java/com/android/server/connectivity/PacManager.java
+++ b/services/core/java/com/android/server/connectivity/PacManager.java
@@ -27,6 +27,7 @@ import android.content.ServiceConnection;
 import android.net.ProxyInfo;
 import android.net.Uri;
 import android.os.Handler;
+import android.os.HandlerThread;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.os.ServiceManager;
@@ -39,10 +40,10 @@ import com.android.internal.annotations.GuardedBy;
 import com.android.net.IProxyCallback;
 import com.android.net.IProxyPortListener;
 import com.android.net.IProxyService;
-import com.android.server.IoThread;
 
 import libcore.io.Streams;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -66,6 +67,7 @@ public class PacManager {
     private static final int DELAY_1 = 0;
     private static final int DELAY_4 = 3;
     private static final int DELAY_LONG = 4;
+    private static final long MAX_PAC_SIZE = 20 * 1000 * 1000;
 
     /** Keep these values up-to-date with ProxyService.java */
     public static final String KEY_PROXY = "keyProxy";
@@ -123,15 +125,21 @@ public class PacManager {
         }
     };
 
+    private final HandlerThread mNetThread = new HandlerThread("android.pacmanager",
+            android.os.Process.THREAD_PRIORITY_DEFAULT);
+    private final Handler mNetThreadHandler;
+
     class PacRefreshIntentReceiver extends BroadcastReceiver {
         public void onReceive(Context context, Intent intent) {
-            IoThread.getHandler().post(mPacDownloader);
+            mNetThreadHandler.post(mPacDownloader);
         }
     }
 
     public PacManager(Context context, Handler handler, int proxyMessage) {
         mContext = context;
         mLastPort = -1;
+        mNetThread.start();
+        mNetThreadHandler = new Handler(mNetThread.getLooper());
 
         mPacRefreshIntent = PendingIntent.getBroadcast(
                 context, 0, new Intent(ACTION_PAC_REFRESH), 0);
@@ -199,7 +207,25 @@ public class PacManager {
     private static String get(Uri pacUri) throws IOException {
         URL url = new URL(pacUri.toString());
         URLConnection urlConnection = url.openConnection(java.net.Proxy.NO_PROXY);
-        return new String(Streams.readFully(urlConnection.getInputStream()));
+        long contentLength = -1;
+        try {
+            contentLength = Long.parseLong(urlConnection.getHeaderField("Content-Length"));
+        } catch (NumberFormatException e) {
+            // Ignore
+        }
+        if (contentLength > MAX_PAC_SIZE) {
+            throw new IOException("PAC too big: " + contentLength + " bytes");
+        }
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        byte[] buffer = new byte[1024];
+        int count;
+        while ((count = urlConnection.getInputStream().read(buffer)) != -1) {
+            bytes.write(buffer, 0, count);
+            if (bytes.size() > MAX_PAC_SIZE) {
+                throw new IOException("PAC too big");
+            }
+        }
+        return bytes.toString();
     }
 
     private int getNextDelay(int currentDelay) {
@@ -267,7 +293,7 @@ public class PacManager {
         intent.setClassName(PAC_PACKAGE, PAC_SERVICE);
         if ((mProxyConnection != null) && (mConnection != null)) {
             // Already bound no need to bind again, just download the new file.
-            IoThread.getHandler().post(mPacDownloader);
+            mNetThreadHandler.post(mPacDownloader);
             return;
         }
         mConnection = new ServiceConnection() {
@@ -297,7 +323,7 @@ public class PacManager {
                         } catch (RemoteException e) {
                             Log.e(TAG, "Unable to reach ProxyService - PAC will not be started", e);
                         }
-                        IoThread.getHandler().post(mPacDownloader);
+                        mNetThreadHandler.post(mPacDownloader);
                     }
                 }
             }
diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java
index 3472db2..60d6772 100644
--- a/services/core/java/com/android/server/connectivity/Tethering.java
+++ b/services/core/java/com/android/server/connectivity/Tethering.java
@@ -59,6 +59,7 @@ import com.android.internal.util.IState;
 import com.android.internal.util.State;
 import com.android.internal.util.StateMachine;
 import com.android.server.IoThread;
+import com.android.server.NetPluginDelegate;
 import com.android.server.net.BaseNetworkObserver;
 
 import java.io.FileDescriptor;
@@ -1595,6 +1596,8 @@ public class Tethering extends BaseNetworkObserver {
                         sendMessageDelayed(CMD_RETRY_UPSTREAM, UPSTREAM_SETTLE_TIME_MS);
                     }
                 } else {
+                    Network network = getConnectivityManager().getNetworkForType(upType);
+                    NetPluginDelegate.setUpstream(network);
                     LinkProperties linkProperties =
                             getConnectivityManager().getLinkProperties(upType);
                     if (linkProperties != null) {
@@ -1629,7 +1632,6 @@ public class Tethering extends BaseNetworkObserver {
                             }
                         }
                         try {
-                            Network network = getConnectivityManager().getNetworkForType(upType);
                             if (network == null) {
                                 Log.e(TAG, "No Network for upstream type " + upType + "!");
                             }
diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java
index b766894..f581a7f 100644
--- a/services/core/java/com/android/server/content/ContentService.java
+++ b/services/core/java/com/android/server/content/ContentService.java
@@ -815,9 +815,13 @@ public final class ContentService extends IContentService.Stub {
         mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_STATS,
                 "no permission to read the sync stats");
 
+        final boolean canAccessAccounts =
+            mContext.checkCallingOrSelfPermission(Manifest.permission.GET_ACCOUNTS)
+                == PackageManager.PERMISSION_GRANTED;
         long identityToken = clearCallingIdentity();
         try {
-            return getSyncManager().getSyncStorageEngine().getCurrentSyncsCopy(userId);
+            return getSyncManager().getSyncStorageEngine()
+                .getCurrentSyncsCopy(userId, canAccessAccounts);
         } finally {
             restoreCallingIdentity(identityToken);
         }
diff --git a/services/core/java/com/android/server/content/SyncManager.java b/services/core/java/com/android/server/content/SyncManager.java
index ef086da..53c36ff 100644
--- a/services/core/java/com/android/server/content/SyncManager.java
+++ b/services/core/java/com/android/server/content/SyncManager.java
@@ -2435,10 +2435,9 @@ public class SyncManager {
                     final long shiftedLastPollTimeAbsolute =
                             (0 < lastPollTimeAbsolute - mSyncRandomOffsetMillis) ?
                                     (lastPollTimeAbsolute - mSyncRandomOffsetMillis) : 0;
-                    long remainingMillis
-                        = periodInMillis - (shiftedNowAbsolute % periodInMillis);
                     long timeSinceLastRunMillis
                         = (nowAbsolute - lastPollTimeAbsolute);
+                    long remainingMillis = periodInMillis - timeSinceLastRunMillis;
                     // Schedule this periodic sync to run early if it's close enough to its next
                     // runtime, and far enough from its last run time.
                     // If we are early, there will still be time remaining in this period.
diff --git a/services/core/java/com/android/server/content/SyncStorageEngine.java b/services/core/java/com/android/server/content/SyncStorageEngine.java
index cca0c16..96a7bb4 100644
--- a/services/core/java/com/android/server/content/SyncStorageEngine.java
+++ b/services/core/java/com/android/server/content/SyncStorageEngine.java
@@ -45,6 +45,7 @@ import android.util.Pair;
 import android.util.SparseArray;
 import android.util.ArrayMap;
 import android.util.Xml;
+import android.util.EventLog;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.util.ArrayUtils;
@@ -1458,15 +1459,23 @@ public class SyncStorageEngine extends Handler {
     }
 
     /**
-     * @return a copy of the current syncs data structure. Will not return
-     * null.
+     * @param userId Id of user to return current sync info.
+     * @param canAccessAccounts Determines whether to redact Account information from the result.
+     * @return a copy of the current syncs data structure. Will not return null.
      */
-    public List<SyncInfo> getCurrentSyncsCopy(int userId) {
+    public List<SyncInfo> getCurrentSyncsCopy(int userId, boolean canAccessAccounts) {
         synchronized (mAuthorities) {
             final List<SyncInfo> syncs = getCurrentSyncsLocked(userId);
             final List<SyncInfo> syncsCopy = new ArrayList<SyncInfo>();
             for (SyncInfo sync : syncs) {
-                syncsCopy.add(new SyncInfo(sync));
+                SyncInfo copy;
+                if (!canAccessAccounts) {
+                    copy = SyncInfo.createAccountRedacted(
+                        sync.authorityId, sync.authority, sync.startTime);
+                } else {
+                    copy = new SyncInfo(sync);
+                }
+                syncsCopy.add(copy);
             }
             return syncsCopy;
         }
@@ -1892,8 +1901,13 @@ public class SyncStorageEngine extends Handler {
                             if ("authority".equals(tagName)) {
                                 authority = parseAuthority(parser, version);
                                 periodicSync = null;
-                                if (authority.ident > highestAuthorityId) {
-                                    highestAuthorityId = authority.ident;
+                                if (authority != null) {
+                                    if (authority.ident > highestAuthorityId) {
+                                        highestAuthorityId = authority.ident;
+                                    }
+                                } else {
+                                    EventLog.writeEvent(0x534e4554, "26513719", -1,
+                                            "Malformed authority");
                                 }
                             } else if (XML_TAG_LISTEN_FOR_TICKLES.equals(tagName)) {
                                 parseListenForTickles(parser);
diff --git a/services/core/java/com/android/server/display/AutomaticBrightnessController.java b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
index 1925ed3..eca6a2e 100644
--- a/services/core/java/com/android/server/display/AutomaticBrightnessController.java
+++ b/services/core/java/com/android/server/display/AutomaticBrightnessController.java
@@ -194,9 +194,6 @@ class AutomaticBrightnessController {
     private int mBrightnessAdjustmentSampleOldBrightness;
     private float mBrightnessAdjustmentSampleOldGamma;
 
-    // Night mode color temperature adjustments
-    private final LiveDisplayController mLiveDisplay;
-
     // Period of time in which to consider light samples in milliseconds.
     private int mAmbientLightHorizon;
 
@@ -212,7 +209,7 @@ class AutomaticBrightnessController {
             int lightSensorRate, long brighteningLightDebounceConfig,
             long brighteningLightFastDebounceConfig, long darkeningLightDebounceConfig,
             boolean resetAmbientLuxAfterWarmUpConfig,
-            int ambientLightHorizon, LiveDisplayController ldc) {
+            int ambientLightHorizon) {
         mContext = context;
         mCallbacks = callbacks;
         mTwilight = LocalServices.getService(TwilightManager.class);
@@ -227,7 +224,6 @@ class AutomaticBrightnessController {
         mBrighteningLightFastDebounceConfig = brighteningLightFastDebounceConfig;
         mDarkeningLightDebounceConfig = darkeningLightDebounceConfig;
         mResetAmbientLuxAfterWarmUpConfig = resetAmbientLuxAfterWarmUpConfig;
-        mLiveDisplay = ldc;
         mAmbientLightHorizon = ambientLightHorizon;
         mWeightingIntercept = ambientLightHorizon;
 
@@ -503,9 +499,6 @@ class AutomaticBrightnessController {
             }
         }
 
-        // Update LiveDisplay with the current lux
-        mLiveDisplay.updateLiveDisplay(mAmbientLux);
-
         if (USE_TWILIGHT_ADJUSTMENT) {
             TwilightState state = mTwilight.getCurrentState();
             if (state != null && state.isNight()) {
diff --git a/services/core/java/com/android/server/display/DisplayManagerService.java b/services/core/java/com/android/server/display/DisplayManagerService.java
index e8a857b..6a6570b 100644
--- a/services/core/java/com/android/server/display/DisplayManagerService.java
+++ b/services/core/java/com/android/server/display/DisplayManagerService.java
@@ -287,8 +287,6 @@ public final class DisplayManagerService extends SystemService {
             mOnlyCore = onlyCore;
         }
 
-        mDisplayPowerController.systemReady();
-
         mHandler.sendEmptyMessage(MSG_REGISTER_ADDITIONAL_DISPLAY_ADAPTERS);
     }
 
diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java
index ae596cb..25e59d5 100644
--- a/services/core/java/com/android/server/display/DisplayPowerController.java
+++ b/services/core/java/com/android/server/display/DisplayPowerController.java
@@ -251,9 +251,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
     // The controller for the automatic brightness level.
     private AutomaticBrightnessController mAutomaticBrightnessController;
 
-    // The controller for LiveDisplay
-    private final LiveDisplayController mLiveDisplayController;
-
     // Animators.
     private ObjectAnimator mColorFadeOnAnimator;
     private ObjectAnimator mColorFadeOffAnimator;
@@ -275,8 +272,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         mBlanker = blanker;
         mContext = context;
 
-        mLiveDisplayController = new LiveDisplayController(context, handler.getLooper());
-
         final Resources resources = context.getResources();
         final int screenBrightnessSettingMinimum = clampAbsoluteBrightness(resources.getInteger(
                 com.android.internal.R.integer.config_screenBrightnessSettingMinimum));
@@ -363,7 +358,7 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
                         mScreenBrightnessRangeMaximum, dozeScaleFactor, lightSensorRate,
                         brighteningLightDebounce, brighteningLightFastDebounce,
                         darkeningLightDebounce, autoBrightnessResetAmbientLuxAfterWarmUp,
-                        ambientLightHorizon, mLiveDisplayController);
+                        ambientLightHorizon);
             }
         }
 
@@ -716,9 +711,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
             }
         }
 
-        // Update LiveDisplay now
-        mLiveDisplayController.updateLiveDisplay();
-
         // Determine whether the display is ready for use in the newly requested state.
         // Note that we do not wait for the brightness ramp animation to complete before
         // reporting the display is ready because we only need to ensure the screen is in the
@@ -1157,8 +1149,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         if (mAutomaticBrightnessController != null) {
             mAutomaticBrightnessController.dump(pw);
         }
-
-        mLiveDisplayController.dump(pw);
     }
 
     private static String proximityToString(int state) {
@@ -1220,10 +1210,6 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call
         return MathUtils.constrain(value, PowerManager.BRIGHTNESS_OFF, PowerManager.BRIGHTNESS_ON);
     }
 
-    void systemReady() {
-        mLiveDisplayController.systemReady();
-    }
-
     private final class DisplayControllerHandler extends Handler {
         public DisplayControllerHandler(Looper looper) {
             super(looper, null, true /*async*/);
diff --git a/services/core/java/com/android/server/display/LiveDisplayController.java b/services/core/java/com/android/server/display/LiveDisplayController.java
deleted file mode 100644
index 28f2432..0000000
--- a/services/core/java/com/android/server/display/LiveDisplayController.java
+++ /dev/null
@@ -1,650 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod 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.server.display;
-
-import android.animation.ValueAnimator;
-import android.animation.ValueAnimator.AnimatorUpdateListener;
-import android.app.Notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.database.ContentObserver;
-import android.net.Uri;
-import android.os.Handler;
-import android.os.IBinder;
-import android.os.Looper;
-import android.os.Message;
-import android.os.Parcel;
-import android.os.PowerManagerInternal;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.UserHandle;
-import android.provider.Settings;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.util.MathUtils;
-import android.util.Slog;
-
-import com.android.server.LocalServices;
-import com.android.server.accessibility.DisplayAdjustmentUtils;
-import com.android.server.pm.UserContentObserver;
-import com.android.server.twilight.TwilightListener;
-import com.android.server.twilight.TwilightManager;
-import com.android.server.twilight.TwilightState;
-
-import cyanogenmod.hardware.CMHardwareManager;
-import cyanogenmod.providers.CMSettings;
-import cyanogenmod.util.ColorUtils;
-
-import java.io.PrintWriter;
-import java.util.List;
-
-public class LiveDisplayController {
-
-    private static final String TAG = "LiveDisplay";
-
-    private static final String DELIMITER = "|";
-    private static final long TWILIGHT_ADJUSTMENT_TIME = DateUtils.HOUR_IN_MILLIS * 1;
-
-    private static final int OFF_TEMPERATURE = 6500;
-
-    public static final int MODE_OFF = 0;
-    public static final int MODE_NIGHT = 1;
-    public static final int MODE_AUTO = 2;
-    public static final int MODE_OUTDOOR = 3;
-    public static final int MODE_DAY = 4;
-
-    private int mColorTemperature = OFF_TEMPERATURE;
-    private float mCurrentLux = 0.0f;
-
-    private int mHintCounter;
-    private int mMode;
-
-    private boolean mOutdoorMode;
-    private boolean mColorEnhancement;
-    private boolean mLowPower;
-
-    private final Context mContext;
-    private final Handler mHandler;
-
-    private CMHardwareManager mHardware;
-
-    private int mDayTemperature;
-    private int mNightTemperature;
-
-    private boolean mUseOutdoorMode;
-    private boolean mUseColorEnhancement;
-    private boolean mUseLowPower;
-
-    private boolean mOutdoorModeIsSelfManaged;
-
-    private final float[] mColorAdjustment = new float[] { 1.0f, 1.0f, 1.0f };
-    private final float[] mRGB = new float[] { 0.0f, 0.0f, 0.0f };
-
-    private TwilightManager mTwilightManager;
-    private boolean mSunset = false;
-
-    private SettingsObserver mObserver;
-
-    private ValueAnimator mAnimator;
-
-    private int mDefaultDayTemperature;
-    private int mDefaultNightTemperature;
-    private int mDefaultOutdoorLux;
-
-    private boolean mInitialized = false;
-
-    private static final int MSG_UPDATE_LIVE_DISPLAY = 1;
-
-    // Display postprocessing can have power impact. Disable it if powersave mode is on.
-    private boolean mLowPerformance = false;
-    private PowerManagerInternal.LowPowerModeListener mLowPowerModeListener =
-            new PowerManagerInternal.LowPowerModeListener() {
-        @Override
-        public void onLowPowerModeChanged(boolean enabled) {
-            mLowPerformance = enabled;
-            updateLiveDisplay(mCurrentLux);
-         }
-    };
-
-    LiveDisplayController(Context context, Looper looper) {
-        mContext = context;
-        mHandler = new LiveDisplayHandler(looper);
-    }
-
-    void systemReady() {
-        mHardware = CMHardwareManager.getInstance(mContext);
-
-        mDefaultDayTemperature = mContext.getResources().getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_dayColorTemperature);
-        mDefaultNightTemperature = mContext.getResources().getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_nightColorTemperature);
-        mDefaultOutdoorLux = mContext.getResources().getInteger(
-                org.cyanogenmod.platform.internal.R.integer.config_outdoorAmbientLux);
-
-        mUseOutdoorMode =
-                mHardware.isSupported(CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT);
-        mOutdoorModeIsSelfManaged = mUseOutdoorMode ?
-                mHardware.isSunlightEnhancementSelfManaged() : false;
-
-        mUseLowPower =
-                mHardware.isSupported(CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT);
-        if (mUseLowPower) {
-            mLowPower = mHardware.get(CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT);
-        }
-
-        mUseColorEnhancement =
-                mHardware.isSupported(CMHardwareManager.FEATURE_COLOR_ENHANCEMENT);
-        if (mUseColorEnhancement) {
-            mColorEnhancement =
-                mHardware.get(CMHardwareManager.FEATURE_COLOR_ENHANCEMENT);
-        }
-
-        updateSettings();
-
-        mObserver = new SettingsObserver();
-        mObserver.register(true);
-
-        PowerManagerInternal pmi = LocalServices.getService(PowerManagerInternal.class);
-        pmi.registerLowPowerModeObserver(mLowPowerModeListener);
-        mLowPerformance = pmi.getLowPowerModeEnabled();
-
-        mTwilightManager = LocalServices.getService(TwilightManager.class);
-        mTwilightManager.registerListener(mTwilightListener, mHandler);
-
-        mInitialized = true;
-    }
-
-    private void updateSettings() {
-        mDayTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_DAY,
-                mDefaultDayTemperature,
-                UserHandle.USER_CURRENT);
-        mNightTemperature = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_NIGHT,
-                mDefaultNightTemperature,
-                UserHandle.USER_CURRENT);
-        mMode = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_TEMPERATURE_MODE,
-                MODE_OFF,
-                UserHandle.USER_CURRENT);
-        // Counter used to determine when we should tell the user about this feature.
-        // If it's not used after 3 sunsets, we'll show the hint once.
-        mHintCounter = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.LIVE_DISPLAY_HINTED,
-                -3,
-                UserHandle.USER_CURRENT);
-
-        // Clear the hint forever
-        if (mMode != MODE_OFF) {
-            saveUserHint(1);
-        }
-
-        // Manual color adjustment will be set as a space separated string of float values
-        String colorAdjustmentTemp = CMSettings.System.getStringForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_COLOR_ADJUSTMENT,
-                UserHandle.USER_CURRENT);
-        String[] colorAdjustment = colorAdjustmentTemp == null ?
-                null : colorAdjustmentTemp.split(" ");
-        if (colorAdjustment == null || colorAdjustment.length != 3) {
-            colorAdjustment = new String[] { "1.0", "1.0", "1.0" };
-        }
-        try {
-            mColorAdjustment[0] = Float.parseFloat(colorAdjustment[0]);
-            mColorAdjustment[1] = Float.parseFloat(colorAdjustment[1]);
-            mColorAdjustment[2] = Float.parseFloat(colorAdjustment[2]);
-        } catch (NumberFormatException e) {
-            Slog.e(TAG, e.getMessage(), e);
-            mColorAdjustment[0] = 1.0f;
-            mColorAdjustment[1] = 1.0f;
-            mColorAdjustment[2] = 1.0f;
-        }
-
-        updateLiveDisplay(mCurrentLux);
-        updateGamma();
-    }
-
-    private void updateGamma() {
-        if (!mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
-            return;
-        }
-        ContentResolver contentResolver = mContext.getContentResolver();
-        for (int i = 0; i < mHardware.getNumGammaControls(); i++) {
-            List<String> gammaValue = CMSettings.Secure.getDelimitedStringAsList(
-                    contentResolver, DELIMITER,
-                    CMSettings.Secure.DISPLAY_GAMMA_CALIBRATION_PREFIX + i);
-            if (gammaValue != null) {
-                mHardware.setDisplayGammaCalibration(i, stringArrayToIntArray(gammaValue));
-            }
-        }
-    }
-
-    private int[] stringArrayToIntArray(List<String> value) {
-        int[] result = new int[value.size()];
-        for (int i = 0; i < value.size(); i++) {
-            result[i] = Integer.parseInt(value.get(i));
-        }
-        return result;
-    }
-
-    private final class SettingsObserver extends UserContentObserver {
-        private final Uri DISPLAY_TEMPERATURE_DAY_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_DAY);
-        private final Uri DISPLAY_TEMPERATURE_NIGHT_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_NIGHT);
-        private final Uri DISPLAY_TEMPERATURE_MODE_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_TEMPERATURE_MODE);
-        private final Uri DISPLAY_AUTO_OUTDOOR_MODE_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_AUTO_OUTDOOR_MODE);
-        private final Uri DISPLAY_LOW_POWER_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_LOW_POWER);
-        private final Uri DISPLAY_COLOR_ENHANCE_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_COLOR_ENHANCE);
-        private final Uri DISPLAY_COLOR_ADJUSTMENT_URI =
-                CMSettings.System.getUriFor(CMSettings.System.DISPLAY_COLOR_ADJUSTMENT);
-        public SettingsObserver() {
-            super(mHandler);
-        }
-
-        public void register(boolean register) {
-            final ContentResolver cr = mContext.getContentResolver();
-            if (register) {
-                cr.registerContentObserver(DISPLAY_TEMPERATURE_DAY_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_TEMPERATURE_NIGHT_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_TEMPERATURE_MODE_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_AUTO_OUTDOOR_MODE_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_LOW_POWER_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_COLOR_ENHANCE_URI, false, this, UserHandle.USER_ALL);
-                cr.registerContentObserver(DISPLAY_COLOR_ADJUSTMENT_URI, false, this, UserHandle.USER_ALL);
-                if (mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_GAMMA_CALIBRATION)) {
-                    for (int i = 0; i < mHardware.getNumGammaControls(); i++) {
-                        Uri gammaUri = CMSettings.Secure.getUriFor(
-                                CMSettings.Secure.DISPLAY_GAMMA_CALIBRATION_PREFIX + i);
-                        cr.registerContentObserver(gammaUri, false, this, UserHandle.USER_ALL);
-                    }
-                }
-                observe();
-            } else {
-                cr.unregisterContentObserver(this);
-                unobserve();
-            }
-        }
-
-        @Override
-        protected void update() {
-            updateSettings();
-        }
-    }
-
-    public void updateLiveDisplay() {
-        updateLiveDisplay(mCurrentLux);
-    }
-
-    synchronized void updateLiveDisplay(float lux) {
-        mCurrentLux = lux;
-        mHandler.removeMessages(MSG_UPDATE_LIVE_DISPLAY);
-        mHandler.sendEmptyMessage(MSG_UPDATE_LIVE_DISPLAY);
-    }
-
-    private synchronized void updateColorTemperature(TwilightState twilight) {
-        int temperature = mDayTemperature;
-        if (mMode == MODE_OFF || mLowPerformance) {
-            temperature = OFF_TEMPERATURE;
-        } else if (mMode == MODE_NIGHT) {
-            temperature = mNightTemperature;
-        } else if (mMode == MODE_AUTO) {
-            temperature = getTwilightK(twilight);
-        }
-
-        if (mAnimator != null) {
-            mAnimator.cancel();
-        }
-        mAnimator = ValueAnimator.ofInt(mColorTemperature, temperature);
-        mAnimator.setDuration(Math.abs(mColorTemperature - temperature) / 2);
-        mAnimator.addUpdateListener(new AnimatorUpdateListener() {
-            @Override
-            public void onAnimationUpdate(ValueAnimator animation) {
-                setDisplayTemperature((Integer)animation.getAnimatedValue());
-            }
-        });
-        mAnimator.start();
-    }
-
-    private synchronized void setDisplayTemperature(int temperature) {
-        mColorTemperature = temperature;
-
-        final float[] rgb = ColorUtils.temperatureToRGB(temperature);
-
-        if (!mLowPerformance) {
-            rgb[0] *= mColorAdjustment[0];
-            rgb[1] *= mColorAdjustment[1];
-            rgb[2] *= mColorAdjustment[2];
-        }
-
-        if (rgb[0] == mRGB[0] && rgb[1] == mRGB[1] && rgb[2] == mRGB[2]) {
-            // no changes
-            return;
-        }
-
-        System.arraycopy(rgb, 0, mRGB, 0, 3);
-
-        Slog.d(TAG, "Adjust display temperature to " + temperature +
-                "K [r=" + rgb[0] + " g=" + rgb[1] + " b=" + rgb[2] + "]");
-
-        if (mHardware.isSupported(CMHardwareManager.FEATURE_DISPLAY_COLOR_CALIBRATION)) {
-            // Clear this out in case of an upgrade
-            CMSettings.Secure.putStringForUser(mContext.getContentResolver(),
-                    CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX,
-                    null,
-                    UserHandle.USER_CURRENT);
-
-            int max = mHardware.getDisplayColorCalibrationMax();
-            mHardware.setDisplayColorCalibration(new int[] {
-                (int) Math.ceil(rgb[0] * max),
-                (int) Math.ceil(rgb[1] * max),
-                (int) Math.ceil(rgb[2] * max)
-            });
-            screenRefresh();
-        } else {
-            String colorMatrixStr = null;
-            if (rgb[0] != 1.0f || rgb[1] != 1.0f || rgb[2] != 1.0f) {
-                 final Float[] colorMatrix = new Float[] {
-                        rgb[0], 0.0f, 0.0f, 0.0f,
-                        0.0f, rgb[1], 0.0f, 0.0f,
-                        0.0f, 0.0f, rgb[2], 0.0f,
-                        0.0f, 0.0f, 0.0f, 1.0f };
-                 colorMatrixStr = TextUtils.join(" ", colorMatrix);
-            }
-
-            // For GPU color transform, go thru DisplayAdjustmentUtils in
-            // order to coexist with accessibility settings
-            CMSettings.Secure.putStringForUser(mContext.getContentResolver(),
-                    CMSettings.Secure.LIVE_DISPLAY_COLOR_MATRIX,
-                    colorMatrixStr,
-                    UserHandle.USER_CURRENT);
-
-           DisplayAdjustmentUtils.applyAdjustments(mContext, UserHandle.USER_CURRENT);
-        }
-    }
-
-    /**
-     * Outdoor mode is optionally enabled when ambient lux > 10000 and it's daytime
-     * Melt faces!
-     *
-     * TODO: Use the camera or RGB sensor to determine if it's really sunlight
-     */
-    private synchronized void updateOutdoorMode(TwilightState twilight) {
-        if (!mUseOutdoorMode) {
-            return;
-        }
-
-        boolean value = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_AUTO_OUTDOOR_MODE,
-                1,
-                UserHandle.USER_CURRENT) == 1;
-
-        boolean enabled;
-        if (mOutdoorModeIsSelfManaged) {
-            enabled = value;
-        } else {
-            enabled = !mLowPerformance &&
-                ((mMode == MODE_OUTDOOR) ||
-                 (value && mMode == MODE_AUTO &&
-                  twilight != null && !twilight.isNight() &&
-                  mCurrentLux > mDefaultOutdoorLux));
-        }
-
-        if (enabled == mOutdoorMode) {
-            return;
-        }
-
-        mHardware.set(CMHardwareManager.FEATURE_SUNLIGHT_ENHANCEMENT, enabled);
-        mOutdoorMode = enabled;
-    }
-
-    /**
-     * Color enhancement is optional, but can look bad with night mode
-     */
-    private synchronized void updateColorEnhancement(TwilightState twilight) {
-        if (!mUseColorEnhancement) {
-            return;
-        }
-
-        boolean value = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_COLOR_ENHANCE,
-                1,
-                UserHandle.USER_CURRENT) == 1;
-
-        boolean enabled = !mLowPerformance && value &&
-                !(mMode == MODE_NIGHT ||
-                 (mMode == MODE_AUTO && twilight != null && twilight.isNight()));
-
-        if (enabled == mColorEnhancement) {
-            return;
-        }
-
-        mHardware.set(CMHardwareManager.FEATURE_COLOR_ENHANCEMENT, enabled);
-        mColorEnhancement = enabled;
-    }
-
-    /**
-     * Adaptive backlight / low power mode. Turn it off when under very bright light.
-     */
-    private synchronized void updateLowPowerMode() {
-        if (!mUseLowPower) {
-            return;
-        }
-
-        boolean value = CMSettings.System.getIntForUser(mContext.getContentResolver(),
-                CMSettings.System.DISPLAY_LOW_POWER,
-                1,
-                UserHandle.USER_CURRENT) == 1;
-
-        boolean enabled = value && (mCurrentLux < mDefaultOutdoorLux);
-
-        if (enabled == mLowPower) {
-            return;
-        }
-
-        mHardware.set(CMHardwareManager.FEATURE_ADAPTIVE_BACKLIGHT, enabled);
-        mLowPower = enabled;
-    }
-
-    /**
-     * Where is the sun anyway? This calculation determines day or night, and scales
-     * the value around sunset/sunrise for a smooth transition.
-     *
-     * @param now
-     * @param sunset
-     * @param sunrise
-     * @return float between 0 and 1
-     */
-    private static float adj(long now, long sunset, long sunrise) {
-        if (sunset < 0 || sunrise < 0
-                || now < sunset || now > sunrise) {
-            return 1.0f;
-        }
-
-        if (now < sunset + TWILIGHT_ADJUSTMENT_TIME) {
-            return MathUtils.lerp(1.0f, 0.0f,
-                    (float)(now - sunset) / TWILIGHT_ADJUSTMENT_TIME);
-        }
-
-        if (now > sunrise - TWILIGHT_ADJUSTMENT_TIME) {
-            return MathUtils.lerp(1.0f, 0.0f,
-                    (float)(sunrise - now) / TWILIGHT_ADJUSTMENT_TIME);
-        }
-
-        return 0.0f;
-    }
-
-    /**
-     * Determine the color temperature we should use for the display based on
-     * the position of the sun.
-     *
-     * @param state
-     * @return color temperature in Kelvin
-     */
-    private int getTwilightK(TwilightState state) {
-        float adjustment = 1.0f;
-
-        if (state != null) {
-            final long now = System.currentTimeMillis();
-            adjustment = adj(now, state.getYesterdaySunset(), state.getTodaySunrise()) *
-                         adj(now, state.getTodaySunset(), state.getTomorrowSunrise());
-        }
-
-        return (int)MathUtils.lerp(mNightTemperature, mDayTemperature, adjustment);
-    }
-
-    /**
-     * Tell SurfaceFlinger to repaint the screen. This is called after updating
-     * hardware registers for display calibration to have an immediate effect.
-     */
-    private static void screenRefresh() {
-        try {
-            final IBinder flinger = ServiceManager.getService("SurfaceFlinger");
-            if (flinger != null) {
-                final Parcel data = Parcel.obtain();
-                data.writeInterfaceToken("android.ui.ISurfaceComposer");
-                flinger.transact(1004, data, null, 0);
-                data.recycle();
-            }
-        } catch (RemoteException ex) {
-            Slog.e(TAG, "Failed to refresh screen", ex);
-        }
-    }
-
-    private void saveUserHint(int value) {
-        if (mHintCounter == value) {
-            return;
-        }
-        CMSettings.System.putIntForUser(mContext.getContentResolver(),
-                CMSettings.System.LIVE_DISPLAY_HINTED,
-                value,
-                UserHandle.USER_CURRENT);
-        mHintCounter = value;
-    }
-
-    /**
-     * Show a friendly notification to the user about the potential benefits of decreasing
-     * blue light at night. Do this only once if the feature has not been used after
-     * three sunsets. It would be great to enable this by default, but we don't want
-     * the change of screen color to be considered a "bug" by a user who doesn't
-     * understand what's happening.
-     *
-     * @param state
-     */
-    private void updateUserHint(TwilightState state) {
-        // check if we should send the hint only once after sunset
-        if (state == null || mHintCounter == 1) {
-            return;
-        }
-        boolean transition = state.isNight() && !mSunset;
-        mSunset = state.isNight();
-        if (!transition) {
-            return;
-        }
-
-        if (mHintCounter <= 0) {
-            mHintCounter++;
-            saveUserHint(mHintCounter);
-        }
-        if (mHintCounter == 0) {
-            //show the notification and don't come back here
-            final Intent intent = new Intent("android.settings.LIVEDISPLAY_SETTINGS");
-            PendingIntent result = PendingIntent.getActivity(
-                    mContext, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-            Notification.Builder builder = new Notification.Builder(mContext)
-                    .setContentTitle(mContext.getResources().getString(
-                            org.cyanogenmod.platform.internal.R.string.live_display_title))
-                    .setContentText(mContext.getResources().getString(
-                            org.cyanogenmod.platform.internal.R.string.live_display_hint))
-                    .setSmallIcon(org.cyanogenmod.platform.internal.R.drawable.ic_livedisplay_notif)
-                    .setStyle(new Notification.BigTextStyle().bigText(mContext.getResources()
-                             .getString(
-                                     org.cyanogenmod.platform.internal.R.string.live_display_hint)))
-                    .setContentIntent(result)
-                    .setAutoCancel(true);
-
-            NotificationManager nm =
-                    (NotificationManager)mContext.getSystemService(Context.NOTIFICATION_SERVICE);
-            nm.notifyAsUser(null, 1, builder.build(), UserHandle.CURRENT);
-
-            saveUserHint(1);
-        }
-    }
-
-    private final TwilightListener mTwilightListener = new TwilightListener() {
-        @Override
-        public void onTwilightStateChanged() {
-            updateLiveDisplay(mCurrentLux);
-        }
-    };
-
-    private final class LiveDisplayHandler extends Handler {
-        public LiveDisplayHandler(Looper looper) {
-            super(looper, null, true /*async*/);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case MSG_UPDATE_LIVE_DISPLAY:
-                    if (!mInitialized) {
-                        break;
-                    }
-                    TwilightState twilight = mTwilightManager.getCurrentState();
-
-                    updateColorTemperature(twilight);
-                    updateOutdoorMode(twilight);
-                    updateColorEnhancement(twilight);
-                    updateLowPowerMode();
-                    updateUserHint(twilight);
-
-                    boolean transition = mMode == MODE_AUTO &&
-                            mColorTemperature != mDayTemperature &&
-                            mColorTemperature != mNightTemperature;
-                    if (transition) {
-                        // fire again in a minute
-                        sendEmptyMessageDelayed(MSG_UPDATE_LIVE_DISPLAY,
-                                DateUtils.MINUTE_IN_MILLIS);
-                    }
-                    break;
-            }
-        }
-    }
-
-    public void dump(PrintWriter pw) {
-        pw.println();
-        pw.println("LiveDisplay Controller Configuration:");
-        pw.println("  mDayTemperature=" + mDayTemperature);
-        pw.println("  mNightTemperature=" + mNightTemperature);
-        pw.println();
-        pw.println("LiveDisplay Controller State:");
-        pw.println("  mMode=" + (mLowPerformance ? "disabled in powersave mode" : mMode));
-        pw.println("  mSunset=" + mSunset);
-        pw.println("  mColorTemperature=" + mColorTemperature);
-        pw.println("  mColorAdjustment=[r: " + mColorAdjustment[0] + " g:" + mColorAdjustment[1] +
-                " b:" + mColorAdjustment[2] + "]");
-        pw.println("  mRGB=[r:" + mRGB[0] + " g:" + mRGB[1] + " b:" + mRGB[2] + "]");
-        pw.println("  mOutdoorMode=" + (mUseOutdoorMode ? mOutdoorMode : "N/A"));
-        pw.println("  mColorEnhancement=" + (mUseColorEnhancement ? mColorEnhancement : "N/A"));
-        pw.println("  mLowPower=" + (mUseLowPower ? mLowPower : "N/A"));
-    }
-}
diff --git a/services/core/java/com/android/server/display/WifiDisplayController.java b/services/core/java/com/android/server/display/WifiDisplayController.java
index 239f8cd..eaeca01 100644
--- a/services/core/java/com/android/server/display/WifiDisplayController.java
+++ b/services/core/java/com/android/server/display/WifiDisplayController.java
@@ -78,6 +78,9 @@ final class WifiDisplayController implements DumpUtils.Dump {
     private static final int RTSP_TIMEOUT_SECONDS = 30;
     private static final int RTSP_TIMEOUT_SECONDS_CERT_MODE = 120;
 
+    // time given for RTSP teardown sequence to complete.
+    private static final int RTSP_TEARDOWN_TIMEOUT = 3;
+
     // We repeatedly issue calls to discover peers every so often for a few reasons.
     // 1. The initial request may fail and need to retried.
     // 2. Discovery will self-abort after any group is initiated, which may not necessarily
@@ -151,6 +154,12 @@ final class WifiDisplayController implements DumpUtils.Dump {
     // True if RTSP has connected.
     private boolean mRemoteDisplayConnected;
 
+    // Waiting for displayDisconnected from ERD.
+    private boolean mRemoteDisplayTearingDown;
+
+    // Timed out waiting for RTSP teardown to complete.
+    private boolean mRemoteDisplayRtspTeardownTimedOut;
+
     // The information we have most recently told WifiDisplayAdapter about.
     private WifiDisplay mAdvertisedDisplay;
     private Surface mAdvertisedDisplaySurface;
@@ -363,7 +372,15 @@ final class WifiDisplayController implements DumpUtils.Dump {
     }
 
     private void updateScanState() {
-        if (mScanRequested && mWfdEnabled && mDesiredDevice == null) {
+
+        if (true == mRemoteDisplayTearingDown) {
+            // when rtsp teardown sequence is completed or timed out, this
+            // function will be called again.
+            Slog.i(TAG, "updateScanState no-op as rtsp teardown sequence is in progress");
+            return;
+        }
+
+        if (mScanRequested && mWfdEnabled && (mDesiredDevice == null)) {
             if (!mDiscoverPeersInProgress) {
                 Slog.i(TAG, "Starting Wifi display scan.");
                 mDiscoverPeersInProgress = true;
@@ -570,7 +587,7 @@ final class WifiDisplayController implements DumpUtils.Dump {
         // Step 1. Before we try to connect to a new device, tell the system we
         // have disconnected from the old one.
         if ((mRemoteDisplay != null || mExtRemoteDisplay != null) &&
-                mConnectedDevice != mDesiredDevice) {
+                mConnectedDevice != mDesiredDevice && false == mRemoteDisplayTearingDown) {
             Slog.i(TAG, "Stopped listening for RTSP connection on "
                     + mRemoteDisplayInterface
                     + " from Wifi display: " + mConnectedDevice.deviceName);
@@ -581,16 +598,25 @@ final class WifiDisplayController implements DumpUtils.Dump {
                 ExtendedRemoteDisplayHelper.dispose(mExtRemoteDisplay);
             }
 
-            mExtRemoteDisplay = null;
-            mRemoteDisplay = null;
-            mRemoteDisplayInterface = null;
-            mRemoteDisplayConnected = false;
             mHandler.removeCallbacks(mRtspTimeout);
+            mRemoteDisplayTearingDown = true;
 
-            mWifiP2pManager.setMiracastMode(WifiP2pManager.MIRACAST_DISABLED);
-            unadvertiseDisplay();
+            // Use extended timeout value for certification, as some tests require user inputs
+            int rtspTimeout = mWifiDisplayCertMode ?
+                RTSP_TIMEOUT_SECONDS_CERT_MODE : RTSP_TIMEOUT_SECONDS;
+
+            Slog.i(TAG, "Starting wait for rtsp teardown sequence for " +
+                   rtspTimeout + " secs");
 
-            // continue to next step
+            mHandler.postDelayed(mRtspTimeout, rtspTimeout * 1000);
+
+            return;
+        }
+
+        if (true == mRemoteDisplayTearingDown && false == mRemoteDisplayRtspTeardownTimedOut) {
+            // Need to wait for ERD to notify that p2p connection is no longer needed.
+            Slog.i(TAG, "updateConnection - return as rtsp teardown sequence in progress");
+            return;
         }
 
         // Step 2. Before we try to connect to a new device, disconnect from the old one.
@@ -630,6 +656,11 @@ final class WifiDisplayController implements DumpUtils.Dump {
             return; // wait for asynchronous callback
         }
 
+        if (true == mRemoteDisplayTearingDown) {
+            Slog.i(TAG, "rtsp teardown sequence in progress");
+            return;
+        }
+
         // Step 3. Before we try to connect to a new device, stop trying to connect
         // to the old one.
         if (mCancelingDevice != null) {
@@ -771,10 +802,11 @@ final class WifiDisplayController implements DumpUtils.Dump {
 
                 @Override
                 public void onDisplayDisconnected() {
+                    Slog.i(TAG, "onDisplayDisconnected called");
                     if (mConnectedDevice == oldDevice) {
                         Slog.i(TAG, "Closed RTSP connection with Wifi display: "
                                 + mConnectedDevice.deviceName);
-                        mHandler.removeCallbacks(mRtspTimeout);
+                        FinishRtspTeardown();
                         disconnect();
                     }
                 }
@@ -907,6 +939,21 @@ final class WifiDisplayController implements DumpUtils.Dump {
         }
     }
 
+    private void FinishRtspTeardown()
+    {
+        Slog.i(TAG, "Wait for rtsp teardown sequence completed");
+        mRemoteDisplayTearingDown = false;
+
+        mExtRemoteDisplay = null;  // callbacks no longer needed
+        mRemoteDisplay = null;
+        mRemoteDisplayInterface = null;
+        mRemoteDisplayConnected = false;
+        mHandler.removeCallbacks(mRtspTimeout);
+
+        mWifiP2pManager.setMiracastMode(WifiP2pManager.MIRACAST_DISABLED);
+        unadvertiseDisplay();
+    }
+
     private final Runnable mDiscoverPeers = new Runnable() {
         @Override
         public void run() {
@@ -929,13 +976,31 @@ final class WifiDisplayController implements DumpUtils.Dump {
     private final Runnable mRtspTimeout = new Runnable() {
         @Override
         public void run() {
+            Slog.i(TAG, "mRtspTimeout triggerred");
             if (mConnectedDevice != null
-                    && (mRemoteDisplay != null || mExtRemoteDisplay != null)
-                    && !mRemoteDisplayConnected) {
-                Slog.i(TAG, "Timed out waiting for Wifi display RTSP connection after "
-                        + RTSP_TIMEOUT_SECONDS + " seconds: "
-                        + mConnectedDevice.deviceName);
-                handleConnectionFailure(true);
+                    && (mRemoteDisplay != null || mExtRemoteDisplay != null)) {
+                if (true == mRemoteDisplayTearingDown) {
+                    // rtsp teardown sequence timed out
+                    Slog.i(TAG, "Timed out waiting for RTSP teardown sequence after "
+                           + RTSP_TEARDOWN_TIMEOUT + " seconds: "
+                           + mConnectedDevice.deviceName);
+                    mRemoteDisplayRtspTeardownTimedOut = true;
+
+                    // this should close P2P
+                    disconnect();
+
+                    FinishRtspTeardown();
+
+                    // Ok to resume wifi-scans
+                    updateConnection();
+                } else if (!mRemoteDisplayConnected) {
+                    Slog.i(TAG, "Timed out waiting for Wifi display RTSP connection after "
+                           + RTSP_TIMEOUT_SECONDS + " seconds: "
+                           + mConnectedDevice.deviceName);
+                    handleConnectionFailure(true);
+                } else {
+                    Slog.i(TAG, "Timed out. no-op");
+                }
             }
         }
     };
diff --git a/services/core/java/com/android/server/fingerprint/FingerprintService.java b/services/core/java/com/android/server/fingerprint/FingerprintService.java
index 6612218..e5ab37f 100644
--- a/services/core/java/com/android/server/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/fingerprint/FingerprintService.java
@@ -127,6 +127,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
     private IFingerprintDaemon mDaemon;
     private final PowerManager mPowerManager;
     private final AlarmManager mAlarmManager;
+    private int mCurrentUserId = UserHandle.USER_NULL;
 
     private final BroadcastReceiver mLockoutReceiver = new BroadcastReceiver() {
         @Override
@@ -340,7 +341,8 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
             return;
         }
         stopPendingOperations(true);
-        mEnrollClient = new ClientMonitor(token, receiver, groupId, restricted, token.toString());
+        mEnrollClient = new ClientMonitor(token, receiver, mCurrentUserId, groupId, restricted,
+                token.toString());
         final int timeout = (int) (ENROLLMENT_TIMEOUT_MS / MS_PER_SEC);
         try {
             final int result = daemon.enroll(cryptoToken, groupId, timeout);
@@ -428,7 +430,8 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
             return;
         }
         stopPendingOperations(true);
-        mAuthClient = new ClientMonitor(token, receiver, groupId, restricted, opPackageName);
+        mAuthClient = new ClientMonitor(token, receiver, mCurrentUserId, groupId, restricted,
+                opPackageName);
         if (inLockoutMode()) {
             Slog.v(TAG, "In lockout mode; disallowing authentication");
             if (!mAuthClient.sendError(FingerprintManager.FINGERPRINT_ERROR_LOCKOUT)) {
@@ -485,7 +488,8 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
         }
 
         stopPendingOperations(true);
-        mRemoveClient = new ClientMonitor(token, receiver, userId, restricted, token.toString());
+        mRemoveClient = new ClientMonitor(token, receiver, mCurrentUserId, userId, restricted,
+                token.toString());
         // The fingerprint template ids will be removed when we get confirmation from the HAL
         try {
             final int result = daemon.remove(fingerId, userId);
@@ -623,15 +627,17 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
     private class ClientMonitor implements IBinder.DeathRecipient {
         IBinder token;
         IFingerprintServiceReceiver receiver;
-        int userId;
+        int userId; // userId of the caller
+        int currentUserId; // current user id when this was created
         boolean restricted; // True if client does not have MANAGE_FINGERPRINT permission
         String owner;
 
-        public ClientMonitor(IBinder token, IFingerprintServiceReceiver receiver, int userId,
-                boolean restricted, String owner) {
+        public ClientMonitor(IBinder token, IFingerprintServiceReceiver receiver,
+                int currentUserId, int userId, boolean restricted, String owner) {
             this.token = token;
             this.receiver = receiver;
             this.userId = userId;
+            this.currentUserId = currentUserId;
             this.restricted = restricted;
             this.owner = owner; // name of the client that owns this - for debugging
             try {
@@ -720,9 +726,9 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
                             Slog.v(TAG, "onAuthenticated(owner=" + mAuthClient.owner
                                     + ", id=" + fpId + ", gp=" + groupId + ")");
                         }
-                        Fingerprint fp = !restricted ?
-                                new Fingerprint("" /* TODO */, groupId, fpId, mHalDeviceId) : null;
-                        receiver.onAuthenticationSucceeded(mHalDeviceId, fp);
+                        Fingerprint fp = !restricted ? new Fingerprint("" /* TODO */, groupId, fpId,
+                                mHalDeviceId) : null;
+                        receiver.onAuthenticationSucceeded(mHalDeviceId, fp, currentUserId);
                     }
                 } catch (RemoteException e) {
                     Slog.w(TAG, "Failed to notify Authenticated:", e);
@@ -1147,6 +1153,7 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
                 Slog.e(TAG, "Failed to setActiveGroup():", e);
             }
         }
+        mCurrentUserId = userId;
     }
 
     private void listenForUserSwitches() {
@@ -1157,6 +1164,12 @@ public class FingerprintService extends SystemService implements IBinder.DeathRe
                     public void onUserSwitching(int newUserId, IRemoteCallback reply) {
                         mHandler.obtainMessage(MSG_USER_SWITCHING, newUserId, 0 /* unused */)
                                 .sendToTarget();
+                        if (reply != null) {
+                            try {
+                                reply.sendResult(null);
+                            } catch (RemoteException e) {
+                            }
+                        }
                     }
                     @Override
                     public void onUserSwitchComplete(int newUserId) throws RemoteException {
diff --git a/services/core/java/com/android/server/lights/LightsService.java b/services/core/java/com/android/server/lights/LightsService.java
index 16dde26..d4762bd 100644
--- a/services/core/java/com/android/server/lights/LightsService.java
+++ b/services/core/java/com/android/server/lights/LightsService.java
@@ -113,9 +113,10 @@ public class LightsService extends SystemService {
 
         private void setLightLocked(int color, int mode, int onMS, int offMS, int brightnessMode) {
             if (mModesUpdate || color != mColor || mode != mMode || onMS != mOnMS ||
-                    offMS != mOffMS) {
+                    offMS != mOffMS || mReset) {
                 if (DEBUG) Slog.v(TAG, "setLight #" + mId + ": color=#"
                         + Integer.toHexString(color));
+                mReset = false;
                 mColor = color;
                 mMode = mode;
                 mOnMS = onMS;
@@ -141,6 +142,7 @@ public class LightsService extends SystemService {
         private boolean mFlashing;
         private boolean mModesUpdate;
         private boolean mMultipleLeds;
+        private boolean mReset = true;
     }
 
     public LightsService(Context context) {
diff --git a/services/core/java/com/android/server/location/GpsLocationProvider.java b/services/core/java/com/android/server/location/GpsLocationProvider.java
index bdb77db..833c340 100644
--- a/services/core/java/com/android/server/location/GpsLocationProvider.java
+++ b/services/core/java/com/android/server/location/GpsLocationProvider.java
@@ -1118,7 +1118,7 @@ public class GpsLocationProvider implements LocationProviderInterface {
         }
 
         if (DEBUG) Log.d(TAG, "setRequest " + mProviderRequest);
-        if (mProviderRequest.reportLocation && !mDisableGps) {
+        if (mProviderRequest.reportLocation && !mDisableGps && isEnabled()) {
             // update client uids
             updateClientUids(mWorkSource);
 
diff --git a/services/core/java/com/android/server/location/GpsXtraDownloader.java b/services/core/java/com/android/server/location/GpsXtraDownloader.java
index 3585049..6310361 100644
--- a/services/core/java/com/android/server/location/GpsXtraDownloader.java
+++ b/services/core/java/com/android/server/location/GpsXtraDownloader.java
@@ -21,8 +21,11 @@ import android.util.Log;
 
 import java.net.HttpURLConnection;
 import java.net.URL;
-import libcore.io.Streams;
 
+import libcore.io.IoUtils;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
 import java.io.IOException;
 import java.util.Properties;
 import java.util.Random;
@@ -36,6 +39,7 @@ public class GpsXtraDownloader {
 
     private static final String TAG = "GpsXtraDownloader";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
+    private static final long MAXIMUM_CONTENT_LENGTH_BYTES = 1000000;  // 1MB.
     private static final String DEFAULT_USER_AGENT = "Android";
 
     private final String[] mXtraServers;
@@ -121,7 +125,19 @@ public class GpsXtraDownloader {
                 return null;
             }
 
-            return Streams.readFully(connection.getInputStream());
+            try (InputStream in = connection.getInputStream()) {
+                ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+                byte[] buffer = new byte[1024];
+                int count;
+                while ((count = in.read(buffer)) != -1) {
+                    bytes.write(buffer, 0, count);
+                    if (bytes.size() > MAXIMUM_CONTENT_LENGTH_BYTES) {
+                        if (DEBUG) Log.d(TAG, "XTRA file too large");
+                        return null;
+                    }
+                }
+                return bytes.toByteArray();
+            }
         } catch (IOException ioe) {
             if (DEBUG) Log.d(TAG, "Error downloading gps XTRA: ", ioe);
         } finally {
@@ -133,3 +149,4 @@ public class GpsXtraDownloader {
     }
 
 }
+
diff --git a/services/core/java/com/android/server/media/MediaSessionService.java b/services/core/java/com/android/server/media/MediaSessionService.java
index 7028fa6..22f9f72 100644
--- a/services/core/java/com/android/server/media/MediaSessionService.java
+++ b/services/core/java/com/android/server/media/MediaSessionService.java
@@ -47,6 +47,7 @@ import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
 import android.os.PowerManager;
+import android.os.Process;
 import android.os.RemoteException;
 import android.os.ResultReceiver;
 import android.os.ServiceManager;
@@ -760,6 +761,13 @@ public class MediaSessionService extends SystemService implements Monitor {
                             + "setup is in progress.");
                     return;
                 }
+                if (isGlobalPriorityActive() && uid != Process.SYSTEM_UID) {
+                    // Prevent dispatching key event through reflection while the global priority
+                    // session is active.
+                    Slog.i(TAG, "Only the system can dispatch media key event "
+                            + "to the global priority session.");
+                    return;
+                }
 
                 synchronized (mLock) {
                     // If we don't have a media button receiver to fall back on
diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
index da62313..4c847a2 100644
--- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
+++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java
@@ -45,6 +45,9 @@ import static android.net.NetworkPolicyManager.FIREWALL_RULE_DENY;
 import static android.net.NetworkPolicyManager.POLICY_ALLOW_BACKGROUND_BATTERY_SAVE;
 import static android.net.NetworkPolicyManager.POLICY_NONE;
 import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_DATA;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_WLAN;
+import static android.net.NetworkPolicyManager.POLICY_REJECT_ON_WLAN_BACKGROUND;
 import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL;
 import static android.net.NetworkPolicyManager.RULE_REJECT_ALL;
 import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;
@@ -105,6 +108,7 @@ import android.net.INetworkPolicyListener;
 import android.net.INetworkPolicyManager;
 import android.net.INetworkStatsService;
 import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
 import android.net.NetworkIdentity;
 import android.net.NetworkInfo;
 import android.net.NetworkPolicy;
@@ -159,6 +163,7 @@ import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.DeviceIdleController;
 import com.android.server.EventLogTags;
 import com.android.server.LocalServices;
+import com.android.server.NetPluginDelegate;
 import com.google.android.collect.Lists;
 
 import org.xmlpull.v1.XmlPullParser;
@@ -1205,7 +1210,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
         final ArrayList<Pair<String, NetworkIdentity>> connIdents = new ArrayList<>(states.length);
         final ArraySet<String> connIfaces = new ArraySet<String>(states.length);
         for (NetworkState state : states) {
-            if (state.networkInfo.isConnected()) {
+            if (state.networkInfo.isConnected() && (state.networkCapabilities == null
+                        || !state.networkCapabilities.hasTransport(
+                                    NetworkCapabilities.TRANSPORT_CELLULAR)
+                        || state.networkCapabilities.hasCapability(
+                                    NetworkCapabilities.NET_CAPABILITY_INTERNET))) {
                 final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);
 
                 final String baseIface = state.linkProperties.getInterfaceName();
@@ -2397,6 +2406,14 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub {
             uidRules = RULE_REJECT_ALL;
         }
 
+        try {
+            mNetworkManager.restrictAppOnWlan(uid, (uidPolicy & POLICY_REJECT_ON_WLAN) != 0 ||
+                    (((uidPolicy & POLICY_REJECT_ON_WLAN_BACKGROUND) != 0) && !uidForeground));
+            mNetworkManager.restrictAppOnData(uid, (uidPolicy & POLICY_REJECT_ON_DATA) != 0);
+        } catch (RemoteException e) {
+            // ignored; service lives in system_server
+        }
+
         final int oldRules = mUidRules.get(uid);
         if (uidRules == RULE_ALLOW_ALL) {
             mUidRules.delete(uid);
diff --git a/services/core/java/com/android/server/net/NetworkStatsCollection.java b/services/core/java/com/android/server/net/NetworkStatsCollection.java
index 15b68c7..0176ec4 100644
--- a/services/core/java/com/android/server/net/NetworkStatsCollection.java
+++ b/services/core/java/com/android/server/net/NetworkStatsCollection.java
@@ -491,6 +491,21 @@ public class NetworkStatsCollection implements FileRotator.Reader {
         }
     }
 
+    /**
+     * Replace data usage history for each matching identity in the template with empty values
+     */
+    public void resetDataUsage(NetworkTemplate template) {
+        final ArrayList<Key> knownKeys = Lists.newArrayList();
+        knownKeys.addAll(mStats.keySet());
+
+        for (Key key : knownKeys) {
+            if (templateMatches(template, key.ident)) {
+                mStats.put(key, new NetworkStatsHistory(mBucketDuration, 10));
+                mDirty = true;
+            }
+        }
+    }
+
     private void noteRecordedHistory(long startMillis, long endMillis, long totalBytes) {
         if (startMillis < mStartMillis) mStartMillis = startMillis;
         if (endMillis > mEndMillis) mEndMillis = endMillis;
diff --git a/services/core/java/com/android/server/net/NetworkStatsRecorder.java b/services/core/java/com/android/server/net/NetworkStatsRecorder.java
index 6490865..3201981 100644
--- a/services/core/java/com/android/server/net/NetworkStatsRecorder.java
+++ b/services/core/java/com/android/server/net/NetworkStatsRecorder.java
@@ -290,6 +290,31 @@ public class NetworkStatsRecorder {
     }
 
     /**
+     * Reset data usage for all matching identities in {@link FileRotator} history,
+     */
+    public void resetDataUsageLocked(NetworkTemplate template) {
+        try {
+            // Reset all persisted data to empty values
+            mRotator.rewriteAll(new ResetDataUsageRewriter(mBucketDuration, template));
+        } catch (IOException e) {
+            Log.wtf(TAG, "problem resetting data stats " + e);
+            recoverFromWtf();
+        } catch (OutOfMemoryError e) {
+            Log.wtf(TAG, "problem resetting data stats " + e);
+            recoverFromWtf();
+        }
+
+        // Reset any pending stats
+        mPending.resetDataUsage(template);
+        mSinceBoot.resetDataUsage(template);
+
+        final NetworkStatsCollection complete = mComplete != null ? mComplete.get() : null;
+        if (complete != null) {
+            complete.resetDataUsage(template);
+        }
+    }
+
+    /**
      * Rewriter that will combine current {@link NetworkStatsCollection} values
      * with anything read from disk, and write combined set to disk. Clears the
      * original {@link NetworkStatsCollection} when finished writing.
@@ -359,6 +384,42 @@ public class NetworkStatsRecorder {
         }
     }
 
+    /**
+     * Rewriter that will remove any {@link NetworkStatsHistory} attributed to
+     * identities in input template, replacing it with empty values.
+     */
+    public static class ResetDataUsageRewriter implements FileRotator.Rewriter {
+        private final NetworkStatsCollection mTemp;
+        private NetworkTemplate mTemplate;
+
+        public ResetDataUsageRewriter(long bucketDuration, NetworkTemplate template) {
+            mTemp = new NetworkStatsCollection(bucketDuration);
+            mTemplate = template;
+        }
+
+        @Override
+        public void reset() {
+            mTemp.reset();
+        }
+
+        @Override
+        public void read(InputStream in) throws IOException {
+            mTemp.read(in);
+            mTemp.clearDirty();
+            mTemp.resetDataUsage(mTemplate);
+        }
+
+        @Override
+        public boolean shouldWrite() {
+            return mTemp.isDirty();
+        }
+
+        @Override
+        public void write(OutputStream out) throws IOException {
+            mTemp.write(new DataOutputStream(out));
+        }
+    }
+
     public void importLegacyNetworkLocked(File file) throws IOException {
         // legacy file still exists; start empty to avoid double importing
         mRotator.deleteAll();
diff --git a/services/core/java/com/android/server/net/NetworkStatsService.java b/services/core/java/com/android/server/net/NetworkStatsService.java
index acd05f7..baaf055 100644
--- a/services/core/java/com/android/server/net/NetworkStatsService.java
+++ b/services/core/java/com/android/server/net/NetworkStatsService.java
@@ -81,6 +81,7 @@ import android.net.INetworkManagementEventObserver;
 import android.net.INetworkStatsService;
 import android.net.INetworkStatsSession;
 import android.net.LinkProperties;
+import android.net.NetworkCapabilities;
 import android.net.NetworkIdentity;
 import android.net.NetworkInfo;
 import android.net.NetworkState;
@@ -123,6 +124,7 @@ import com.android.internal.util.FileRotator;
 import com.android.internal.util.IndentingPrintWriter;
 import com.android.server.EventLogTags;
 import com.android.server.LocalServices;
+import com.android.server.NetPluginDelegate;
 import com.android.server.connectivity.Tethering;
 
 import java.io.File;
@@ -628,6 +630,26 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
         return mXtStatsCached.getHistory(template, UID_ALL, SET_ALL, TAG_NONE, fields);
     }
 
+    /**
+     * Reset entire data usage history for all the uids in the template and update global
+     * data stats
+     */
+    @Override
+    public void resetDataUsageHistoryForAllUid(NetworkTemplate template) {
+        mContext.enforceCallingOrSelfPermission(MODIFY_NETWORK_ACCOUNTING, TAG);
+
+        synchronized (mStatsLock) {
+            mWakeLock.acquire();
+            try {
+                resetDataUsageLocked(template);
+            } catch (Exception e) {
+                // ignored; service lives in system_server
+            } finally {
+                mWakeLock.release();
+            }
+        }
+    }
+
     @Override
     public long getNetworkTotalBytes(NetworkTemplate template, long start, long end) {
         mContext.enforceCallingOrSelfPermission(READ_NETWORK_USAGE_HISTORY, TAG);
@@ -920,7 +942,11 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
 
         final ArraySet<String> mobileIfaces = new ArraySet<>();
         for (NetworkState state : states) {
-            if (state.networkInfo.isConnected()) {
+            if (state.networkInfo.isConnected() && (state.networkCapabilities == null
+                        || !state.networkCapabilities.hasTransport(
+                                    NetworkCapabilities.TRANSPORT_CELLULAR)
+                        || state.networkCapabilities.hasCapability(
+                                    NetworkCapabilities.NET_CAPABILITY_INTERNET))) {
                 final boolean isMobile = isNetworkTypeMobile(state.networkInfo.getType());
                 final NetworkIdentity ident = NetworkIdentity.buildNetworkIdentity(mContext, state);
 
@@ -1148,6 +1174,18 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
         removeUidsLocked(uids);
     }
 
+    /**
+     * Reset data usage history for all uids, uid tags, and global transfer data for the input template
+     */
+    private void resetDataUsageLocked(NetworkTemplate template) {
+        // Perform one last poll before removing
+        performPollLocked(FLAG_PERSIST_ALL);
+
+        mUidRecorder.resetDataUsageLocked(template);
+        mUidTagRecorder.resetDataUsageLocked(template);
+        mXtRecorder.resetDataUsageLocked(template);
+    }
+
     @Override
     protected void dump(FileDescriptor fd, PrintWriter rawWriter, String[] args) {
         mContext.enforceCallingOrSelfPermission(DUMP, TAG);
diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java
index 36818b5..422aee2 100644
--- a/services/core/java/com/android/server/notification/NotificationManagerService.java
+++ b/services/core/java/com/android/server/notification/NotificationManagerService.java
@@ -24,7 +24,6 @@ import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT;
 import static org.xmlpull.v1.XmlPullParser.END_TAG;
 import static org.xmlpull.v1.XmlPullParser.START_TAG;
 
-import android.annotation.Nullable;
 import android.app.ActivityManager;
 import android.app.ActivityManagerNative;
 import android.app.AppGlobals;
@@ -64,9 +63,6 @@ import android.media.AudioManager;
 import android.media.AudioManagerInternal;
 import android.media.AudioSystem;
 import android.media.IRingtonePlayer;
-import android.media.session.MediaController;
-import android.media.session.MediaSessionManager;
-import android.media.session.PlaybackState;
 import android.net.Uri;
 import android.os.Binder;
 import android.os.Build;
@@ -80,6 +76,7 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.Process;
 import android.os.RemoteException;
+import android.os.SystemClock;
 import android.os.SystemProperties;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -104,6 +101,7 @@ import android.util.Log;
 import android.util.LruCache;
 import android.util.Slog;
 import android.util.SparseIntArray;
+import android.util.TimeUtils;
 import android.util.Xml;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityManager;
@@ -124,6 +122,8 @@ import com.android.server.notification.ManagedServices.ManagedServiceInfo;
 import com.android.server.notification.ManagedServices.UserProfiles;
 import com.android.server.statusbar.StatusBarManagerInternal;
 
+import cyanogenmod.media.AudioSessionInfo;
+import cyanogenmod.media.CMAudioManager;
 import cyanogenmod.providers.CMSettings;
 import cyanogenmod.util.ColorUtils;
 
@@ -304,6 +304,7 @@ public class NotificationManagerService extends SystemService {
             new ArrayMap<String, NotificationRecord>();
     final ArrayList<ToastRecord> mToastQueue = new ArrayList<ToastRecord>();
     final ArrayMap<String, NotificationRecord> mSummaryByGroupKey = new ArrayMap<>();
+    final ArrayMap<String, Long> mLastSoundTimestamps = new ArrayMap<>();
     final PolicyAccess mPolicyAccess = new PolicyAccess();
 
     // The last key in this list owns the hardware.
@@ -339,6 +340,8 @@ public class NotificationManagerService extends SystemService {
     private boolean mDisableDuckingWhileMedia;
     private boolean mActiveMedia;
 
+    private boolean mMultiColorNotificationLed;
+
     private static final int MY_UID = Process.myUid();
     private static final int MY_PID = Process.myPid();
     private static final int REASON_DELEGATE_CLICK = 1;
@@ -1094,15 +1097,39 @@ public class NotificationManagerService extends SystemService {
         }
     }
 
+    private BroadcastReceiver mMediaSessionReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            updateForActiveSessions();
+        }
+    };
+
+    private void updateForActiveSessions() {
+        CMAudioManager manager = CMAudioManager.getInstance(getContext());
+        List<AudioSessionInfo> sessions = manager.listAudioSessions(AudioManager.STREAM_MUSIC);
+        mActiveMedia = false;
+        for (AudioSessionInfo sessionInfo : sessions) {
+            if (sessionInfo.getSessionId() > 0) {
+                mActiveMedia = true;
+                break;
+            }
+        }
+    }
+
     private void updateDisableDucking() {
         if (!mSystemReady) {
             return;
         }
-        final MediaSessionManager mediaSessionManager = (MediaSessionManager) getContext()
-                .getSystemService(Context.MEDIA_SESSION_SERVICE);
-        mediaSessionManager.removeOnActiveSessionsChangedListener(mSessionListener);
+        try {
+            getContext().unregisterReceiver(mMediaSessionReceiver);
+        } catch (IllegalArgumentException e) {
+            // Never registered
+        }
         if (mDisableDuckingWhileMedia) {
-            mediaSessionManager.addOnActiveSessionsChangedListener(mSessionListener, null);
+            updateForActiveSessions();
+            IntentFilter intentFilter = new IntentFilter(CMAudioManager
+                    .ACTION_AUDIO_SESSIONS_CHANGED);
+            getContext().registerReceiver(mMediaSessionReceiver, intentFilter);
         }
     }
 
@@ -1200,6 +1227,8 @@ public class NotificationManagerService extends SystemService {
         mDefaultNotificationLedOff = resources.getInteger(
                 R.integer.config_defaultNotificationLedOff);
 
+        mMultiColorNotificationLed = deviceLightsCan(NotificationManager.LIGHTS_RGB_NOTIFICATION);
+
         mNotificationPulseCustomLedValues = new HashMap<String, NotificationLedValues>();
 
         mPackageNameMappings = new HashMap<String, String>();
@@ -1220,10 +1249,10 @@ public class NotificationManagerService extends SystemService {
                 VIBRATE_PATTERN_MAXLEN,
                 DEFAULT_VIBRATE_PATTERN);
 
-        mAdjustableNotificationLedBrightness = resources.getBoolean(
-                org.cyanogenmod.platform.internal.R.bool.config_adjustableNotificationLedBrightness);
-        mMultipleNotificationLeds = resources.getBoolean(
-                org.cyanogenmod.platform.internal.R.bool.config_multipleNotificationLeds);
+        mAdjustableNotificationLedBrightness = deviceLightsCan(
+                                            NotificationManager.LIGHTS_ADJUSTABLE_NOTIFICATION_BRIGHTNESS);
+        mMultipleNotificationLeds = deviceLightsCan(
+                                            NotificationManager.LIGHTS_MULTIPLE_LED);
 
         mUseAttentionLight = resources.getBoolean(R.bool.config_useAttentionLight);
 
@@ -1237,6 +1266,7 @@ public class NotificationManagerService extends SystemService {
         }
         mZenModeHelper.initZenMode();
         mZenModeHelper.readAllowLightsFromSettings();
+        mZenModeHelper.readVibrationModeFromSettings();
         mInterruptionFilter = mZenModeHelper.getZenModeListenerInterruptionFilter();
 
         mUserProfiles.updateCache(getContext());
@@ -1365,6 +1395,47 @@ public class NotificationManagerService extends SystemService {
         scheduleInterruptionFilterChanged(interruptionFilter);
     }
 
+    private int deviceLightsCapabilities() {
+        Resources resources = getContext().getResources();
+        int capabilities = SystemProperties.getInt("sys.lights.capabilities", 0);
+
+        if (capabilities == 0) {
+            int[] deviceCaps = resources.getIntArray(
+                    com.android.internal.R.array.config_deviceLightCapabilities);
+            for (int cap : deviceCaps) {
+                capabilities |= 1<<cap;
+            }
+        }
+
+        /* Legacy format */
+        if (capabilities == 0) {
+            if (resources.getBoolean(com.android.internal.R.bool.config_multiColorNotificationLed)) {
+                capabilities |= 1<<NotificationManager.LIGHTS_RGB_NOTIFICATION;
+            }
+            if (resources.getBoolean(com.android.internal.R.bool.config_multiColorBatteryLed)) {
+                capabilities |= 1<<NotificationManager.LIGHTS_RGB_BATTERY;
+            }
+            if (resources.getBoolean(com.android.internal.R.bool.config_ledCanPulse)) {
+                capabilities |= 1<<NotificationManager.LIGHTS_LED_PULSE;
+            }
+            if (resources.getBoolean(org.cyanogenmod.platform.internal.R.bool.config_multipleNotificationLeds)) {
+                capabilities |= 1<<NotificationManager.LIGHTS_MULTIPLE_LED;
+            }
+            if (resources.getBoolean(org.cyanogenmod.platform.internal.R.bool.config_useSegmentedBatteryLed)) {
+                capabilities |= 1<<NotificationManager.LIGHTS_SEGMENTED_BATTERY_LIGHTS;
+            }
+            if (resources.getBoolean(org.cyanogenmod.platform.internal.R.bool.config_adjustableNotificationLedBrightness)) {
+                capabilities |= 1<<NotificationManager.LIGHTS_ADJUSTABLE_NOTIFICATION_BRIGHTNESS;
+            }
+        }
+        return capabilities;
+    }
+
+    /** @hide */
+    public boolean deviceLightsCan(int lightCapability) {
+        return ( (deviceLightsCapabilities() & 1<<lightCapability) != 0 );
+    }
+
     private final IBinder mService = new INotificationManager.Stub() {
         // Toasts
         // ============================================================================
@@ -1553,6 +1624,33 @@ public class NotificationManagerService extends SystemService {
             return mRankingHelper.getPackageVisibilityOverride(pkg, uid);
         }
 
+        @Override
+        public void setShowNotificationForPackageOnKeyguard(
+                String pkg, int uid, int status) {
+            checkCallerIsSystem();
+            mRankingHelper.setShowNotificationForPackageOnKeyguard(pkg, uid, status);
+            savePolicyFile();
+        }
+
+        @Override
+        public int getShowNotificationForPackageOnKeyguard(String pkg, int uid) {
+            enforceSystemOrSystemUI("INotificationManager.getShowNotificationForPackageOnKeyguard");
+            return mRankingHelper.getShowNotificationForPackageOnKeyguard(pkg, uid);
+        }
+
+        @Override
+        public void setPackageNotificationSoundTimeout(String pkg, int uid, long timeout) {
+            checkCallerIsSystem();
+            mRankingHelper.setPackageNotificationSoundTimeout(pkg, uid, timeout);
+            savePolicyFile();
+        }
+
+        @Override
+        public long getPackageNotificationSoundTimeout(String pkg, int uid) {
+            checkCallerIsSystem();
+            return mRankingHelper.getPackageNotificationSoundTimeout(pkg, uid);
+        }
+
         /**
          * System-only API for getting a list of current (i.e. not cleared) notifications.
          *
@@ -1950,6 +2048,7 @@ public class NotificationManagerService extends SystemService {
         }
 
         private void enforcePolicyAccess(String pkg, String method) {
+            checkCallerIsSameApp(pkg);
             if (!checkPolicyAccess(pkg)) {
                 Slog.w(TAG, "Notification policy access denied calling " + method);
                 throw new SecurityException("Notification policy access denied");
@@ -1989,7 +2088,7 @@ public class NotificationManagerService extends SystemService {
         }
 
         @Override
-        public boolean matchesCallFilter(Bundle extras) {
+        public boolean[] matchesCallFilter(Bundle extras) {
             enforceSystemOrSystemUI("INotificationManager.matchesCallFilter");
             return mZenModeHelper.matchesCallFilter(
                     UserHandle.getCallingUserHandle(),
@@ -2102,6 +2201,10 @@ public class NotificationManagerService extends SystemService {
                 Binder.restoreCallingIdentity(identity);
             }
         }
+
+        public boolean deviceLightsCan(int lightCapability) {
+            return ( (deviceLightsCapabilities() & 1<<lightCapability) != 0 );
+        }
     };
 
     private String disableNotificationEffects(NotificationRecord record) {
@@ -2274,6 +2377,14 @@ public class NotificationManagerService extends SystemService {
             } catch (NameNotFoundException e) {
                 // pass
             }
+
+            long now = SystemClock.elapsedRealtime();
+            pw.println("\n  Last notification sound timestamps:");
+            for (Map.Entry<String, Long> entry: mLastSoundTimestamps.entrySet()) {
+                pw.print("    " + entry.getKey() + " -> ");
+                TimeUtils.formatDuration(entry.getValue(), now, pw);
+                pw.println(" ago");
+            }
         }
     }
 
@@ -2626,21 +2737,6 @@ public class NotificationManagerService extends SystemService {
         return false;
     }
 
-    private MediaSessionManager.OnActiveSessionsChangedListener mSessionListener =
-            new MediaSessionManager.OnActiveSessionsChangedListener() {
-        @Override
-        public void onActiveSessionsChanged(@Nullable List<MediaController> controllers) {
-            for (MediaController activeSession : controllers) {
-                PlaybackState playbackState = activeSession.getPlaybackState();
-                if (playbackState != null && playbackState.getState() == PlaybackState.STATE_PLAYING) {
-                    mActiveMedia = true;
-                    return;
-                }
-            }
-            mActiveMedia = false;
-        }
-    };
-
     private void buzzBeepBlinkLocked(NotificationRecord record) {
         boolean buzz = false;
         boolean beep = false;
@@ -2671,21 +2767,29 @@ public class NotificationManagerService extends SystemService {
             ZenLog.traceDisableEffects(record, disableEffects);
         }
 
-        if ((disableEffects == null)
+        boolean readyForBeepOrBuzz = disableEffects == null
                 && (!(record.isUpdate
                     && (notification.flags & Notification.FLAG_ONLY_ALERT_ONCE) != 0 ))
                 && (record.getUserId() == UserHandle.USER_ALL ||
                     record.getUserId() == currentUser ||
                     mUserProfiles.isCurrentProfile(record.getUserId()))
-                && canInterrupt
+                && !isInSoundTimeoutPeriod(record)
                 && mSystemReady
-                && mAudioManager != null) {
+                && mAudioManager != null;
+
+        boolean canBeep = readyForBeepOrBuzz && canInterrupt;
+        boolean canBuzz = readyForBeepOrBuzz &&
+            (canInterrupt || (aboveThreshold && mZenModeHelper.allowVibrationForNotifications()));
+        boolean hasValidSound = false;
+
+        if (canBeep || canBuzz) {
             if (DBG) Slog.v(TAG, "Interrupting!");
 
             sendAccessibilityEvent(notification, record.sbn.getPackageName());
+        }
 
-            // sound
-
+        // sound
+        if (canBeep) {
             // should we use the default notification sound? (indicated either by
             // DEFAULT_SOUND or because notification.sound is pointing at
             // Settings.System.NOTIFICATION_SOUND)
@@ -2695,7 +2799,6 @@ public class NotificationManagerService extends SystemService {
                                    .equals(notification.sound);
 
             Uri soundUri = null;
-            boolean hasValidSound = false;
 
             if (useDefaultSound) {
                 soundUri = Settings.System.DEFAULT_NOTIFICATION_URI;
@@ -2736,15 +2839,17 @@ public class NotificationManagerService extends SystemService {
                     }
                 }
             }
+        }
+
 
-            // vibrate
+        // vibrate
+        if (canBuzz) {
             // Does the notification want to specify its own vibration?
             final boolean hasCustomVibrate = notification.vibrate != null;
 
             // new in 4.2: if there was supposed to be a sound and we're in vibrate
             // mode, and no other vibration is specified, we fall back to vibration
-            final boolean convertSoundToVibration =
-                       !hasCustomVibrate
+            final boolean convertSoundToVibration = !hasCustomVibrate
                     && hasValidSound
                     && (mAudioManager.getRingerModeInternal()
                                == AudioManager.RINGER_MODE_VIBRATE);
@@ -2799,6 +2904,10 @@ public class NotificationManagerService extends SystemService {
         } else if (wasShowLights) {
             updateLightsLocked();
         }
+        if (buzz || beep) {
+            mLastSoundTimestamps.put(generateLastSoundTimeoutKey(record),
+                    SystemClock.elapsedRealtime());
+        }
         if (buzz || beep || blink) {
             EventLogTags.writeNotificationAlert(record.getKey(),
                     buzz ? 1 : 0, beep ? 1 : 0, blink ? 1 : 0);
@@ -2806,6 +2915,24 @@ public class NotificationManagerService extends SystemService {
         }
     }
 
+    private boolean isInSoundTimeoutPeriod(NotificationRecord record) {
+        long timeoutMillis = mRankingHelper.getPackageNotificationSoundTimeout(
+                record.sbn.getPackageName(), record.sbn.getUid());
+        if (timeoutMillis == 0) {
+            return false;
+        }
+
+        Long value = mLastSoundTimestamps.get(generateLastSoundTimeoutKey(record));
+        if (value == null) {
+            return false;
+        }
+        return SystemClock.elapsedRealtime() - value < timeoutMillis;
+    }
+
+    private String generateLastSoundTimeoutKey(NotificationRecord record) {
+        return record.sbn.getPackageName() + "|" + record.sbn.getUid();
+    }
+
     private static AudioAttributes audioAttributesForNotification(Notification n) {
         if (n.audioAttributes != null
                 && !Notification.AUDIO_ATTRIBUTES_DEFAULT.equals(n.audioAttributes)) {
@@ -3518,6 +3645,9 @@ public class NotificationManagerService extends SystemService {
         if (!mAutoGenerateNotificationColor) {
             return mDefaultNotificationColor;
         }
+        if (!mMultiColorNotificationLed) {
+            return mDefaultNotificationColor;
+        }
         final String packageName = ledNotification.sbn.getPackageName();
         final String mapping = mapPackage(packageName);
         int color = mDefaultNotificationColor;
@@ -3600,6 +3730,10 @@ public class NotificationManagerService extends SystemService {
         if (isCallerSystem()) {
             return;
         }
+        checkCallerIsSameApp(pkg);
+    }
+
+    private static void checkCallerIsSameApp(String pkg) {
         final int uid = Binder.getCallingUid();
         try {
             ApplicationInfo ai = AppGlobals.getPackageManager().getApplicationInfo(
diff --git a/services/core/java/com/android/server/notification/RankingConfig.java b/services/core/java/com/android/server/notification/RankingConfig.java
index 803db10..320cf75 100644
--- a/services/core/java/com/android/server/notification/RankingConfig.java
+++ b/services/core/java/com/android/server/notification/RankingConfig.java
@@ -27,4 +27,9 @@ public interface RankingConfig {
     int getPackageVisibilityOverride(String packageName, int uid);
 
     void setPackageVisibilityOverride(String packageName, int uid, int visibility);
+
+    void setShowNotificationForPackageOnKeyguard(String packageName, int uid, int status);
+
+    int getShowNotificationForPackageOnKeyguard(String packageName, int uid);
+
 }
diff --git a/services/core/java/com/android/server/notification/RankingHelper.java b/services/core/java/com/android/server/notification/RankingHelper.java
index a089518..233eb0a 100644
--- a/services/core/java/com/android/server/notification/RankingHelper.java
+++ b/services/core/java/com/android/server/notification/RankingHelper.java
@@ -51,6 +51,8 @@ public class RankingHelper implements RankingConfig {
     private static final String ATT_PRIORITY = "priority";
     private static final String ATT_PEEKABLE = "peekable";
     private static final String ATT_VISIBILITY = "visibility";
+    private static final String ATT_KEYGUARD = "keyguard";
+    private static final String ATT_SOUND_TIMEOUT = "sound-timeout";
 
     private static final int DEFAULT_PRIORITY = Notification.PRIORITY_DEFAULT;
     private static final boolean DEFAULT_PEEKABLE = true;
@@ -143,6 +145,9 @@ public class RankingHelper implements RankingConfig {
                     int priority = safeInt(parser, ATT_PRIORITY, DEFAULT_PRIORITY);
                     boolean peekable = safeBool(parser, ATT_PEEKABLE, DEFAULT_PEEKABLE);
                     int vis = safeInt(parser, ATT_VISIBILITY, DEFAULT_VISIBILITY);
+                    int keyguard = safeInt(parser, ATT_KEYGUARD,
+                            Notification.SHOW_ALL_NOTI_ON_KEYGUARD);
+                    long soundTimeout = safeInt(parser, ATT_SOUND_TIMEOUT, 0);
                     String name = parser.getAttributeValue(null, ATT_NAME);
 
                     if (!TextUtils.isEmpty(name)) {
@@ -172,6 +177,12 @@ public class RankingHelper implements RankingConfig {
                         if (vis != DEFAULT_VISIBILITY) {
                             r.visibility = vis;
                         }
+                        if (keyguard != Notification.SHOW_ALL_NOTI_ON_KEYGUARD) {
+                            r.keyguard = keyguard;
+                        }
+                        if (soundTimeout != 0) {
+                            r.notificationSoundTimeout = soundTimeout;
+                        }
                     }
                 }
             }
@@ -200,8 +211,10 @@ public class RankingHelper implements RankingConfig {
         for (int i = N - 1; i >= 0; i--) {
             final Record r = mRecords.valueAt(i);
             if (r.priority == DEFAULT_PRIORITY && r.peekable == DEFAULT_PEEKABLE
-                    && r.visibility == DEFAULT_VISIBILITY) {
-                mRecords.remove(i);
+                    && r.visibility == DEFAULT_VISIBILITY
+                    && r.keyguard == Notification.SHOW_ALL_NOTI_ON_KEYGUARD
+                    && r.notificationSoundTimeout == 0) {
+                mRecords.removeAt(i);
             }
         }
     }
@@ -227,6 +240,12 @@ public class RankingHelper implements RankingConfig {
             if (r.visibility != DEFAULT_VISIBILITY) {
                 out.attribute(null, ATT_VISIBILITY, Integer.toString(r.visibility));
             }
+            if (r.keyguard != Notification.SHOW_ALL_NOTI_ON_KEYGUARD) {
+                out.attribute(null, ATT_KEYGUARD, Integer.toBinaryString(r.keyguard));
+            }
+            if (r.notificationSoundTimeout != 0) {
+                out.attribute(null, ATT_SOUND_TIMEOUT, Long.toString(r.notificationSoundTimeout));
+            }
             if (!forBackup) {
                 out.attribute(null, ATT_UID, Integer.toString(r.uid));
             }
@@ -377,6 +396,36 @@ public class RankingHelper implements RankingConfig {
         updateConfig();
     }
 
+    @Override
+    public int getShowNotificationForPackageOnKeyguard(String packageName, int uid) {
+        final Record r = mRecords.get(recordKey(packageName, uid));
+        return r != null ? r.keyguard : Notification.SHOW_ALL_NOTI_ON_KEYGUARD;
+    }
+
+    @Override
+    public void setShowNotificationForPackageOnKeyguard(
+                String packageName, int uid, int keyguard) {
+        if (keyguard == getShowNotificationForPackageOnKeyguard(packageName, uid)) {
+            return;
+        }
+        getOrCreateRecord(packageName, uid).keyguard = keyguard;
+        removeDefaultRecords();
+        updateConfig();
+    }
+
+    public long getPackageNotificationSoundTimeout(String packageName, int uid) {
+        final Record r = mRecords.get(recordKey(packageName, uid));
+        return r != null ? r.notificationSoundTimeout : 0;
+    }
+
+    public void setPackageNotificationSoundTimeout(String packageName, int uid, long timeout) {
+        if (timeout == getPackageNotificationSoundTimeout(packageName, uid)) {
+            return;
+        }
+        getOrCreateRecord(packageName, uid).notificationSoundTimeout = timeout;
+        removeDefaultRecords();
+    }
+
     public void dump(PrintWriter pw, String prefix, NotificationManagerService.DumpFilter filter) {
         if (filter == null) {
             final int N = mSignalExtractors.length;
@@ -459,6 +508,8 @@ public class RankingHelper implements RankingConfig {
         int priority = DEFAULT_PRIORITY;
         boolean peekable = DEFAULT_PEEKABLE;
         int visibility = DEFAULT_VISIBILITY;
+        int keyguard = Notification.SHOW_ALL_NOTI_ON_KEYGUARD;
+        long notificationSoundTimeout = 0;
     }
 
 }
diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java
index 468ef8d..54eac06 100644
--- a/services/core/java/com/android/server/notification/ZenModeHelper.java
+++ b/services/core/java/com/android/server/notification/ZenModeHelper.java
@@ -91,6 +91,7 @@ public class ZenModeHelper {
     private AudioManagerInternal mAudioManager;
     private boolean mEffectsSuppressed;
     private boolean mAllowLights;
+    private int mVibrationMode;
 
     public ZenModeHelper(Context context, Looper looper, ConditionProviders conditionProviders) {
         mContext = context;
@@ -117,10 +118,12 @@ public class ZenModeHelper {
         return TAG;
     }
 
-    public boolean matchesCallFilter(UserHandle userHandle, Bundle extras,
+    public boolean[] matchesCallFilter(UserHandle userHandle, Bundle extras,
             ValidateNotificationPeople validator, int contactsTimeoutMs, float timeoutAffinity) {
-        return ZenModeFiltering.matchesCallFilter(mContext, mZenMode, mConfig, userHandle, extras,
-                validator, contactsTimeoutMs, timeoutAffinity);
+        boolean matches = ZenModeFiltering.matchesCallFilter(mContext, mZenMode, mConfig,
+                userHandle, extras, validator, contactsTimeoutMs, timeoutAffinity);
+        boolean matchesForVibration = matches || allowVibrationForCalls();
+        return new boolean[] { matches, matchesForVibration };
     }
 
     public boolean isCall(NotificationRecord record) {
@@ -238,6 +241,8 @@ public class ZenModeHelper {
         pw.print(prefix); pw.print("mUser="); pw.println(mUser);
         dump(pw, prefix, "mConfig", mConfig);
         pw.print(prefix); pw.print("mEffectsSuppressed="); pw.println(mEffectsSuppressed);
+        pw.print(prefix); pw.print("mAllowLights="); pw.println(mAllowLights);
+        pw.print(prefix); pw.print("mVibrationMode="); pw.println(mVibrationMode);
         mFiltering.dump(pw, prefix);
         mConditions.dump(pw, prefix);
     }
@@ -381,6 +386,7 @@ public class ZenModeHelper {
         mZenMode = zen;
         updateRingerModeAffectedStreams();
         readAllowLightsFromSettings();
+        readVibrationModeFromSettings();
         setZenModeSetting(mZenMode);
         if (setRingerMode) {
             applyZenToRingerMode();
@@ -428,6 +434,21 @@ public class ZenModeHelper {
         }
     }
 
+    public boolean allowVibrationForCalls() {
+        return mVibrationMode > 0;
+    }
+
+    public boolean allowVibrationForNotifications() {
+        return mVibrationMode > 1;
+    }
+
+    public void readVibrationModeFromSettings() {
+        final ContentResolver cr = mContext.getContentResolver();
+        mVibrationMode = mZenMode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS
+                ? CMSettings.System.getInt(cr, CMSettings.System.ZEN_PRIORITY_VIBRATION_MODE, 0)
+                : 0;
+    }
+
     private void applyRestrictions() {
         final boolean zen = mZenMode != Global.ZEN_MODE_OFF;
 
@@ -715,9 +736,11 @@ public class ZenModeHelper {
     private final class SettingsObserver extends ContentObserver {
         private final Uri ZEN_MODE = Global.getUriFor(Global.ZEN_MODE);
         private final Uri ZEN_ALLOW_LIGHTS = CMSettings.System.getUriFor(
-                                               CMSettings.System.ZEN_ALLOW_LIGHTS);
+                CMSettings.System.ZEN_ALLOW_LIGHTS);
         private final Uri ZEN_PRIORITY_ALLOW_LIGHTS = CMSettings.System.getUriFor(
-                                               CMSettings.System.ZEN_PRIORITY_ALLOW_LIGHTS);
+                CMSettings.System.ZEN_PRIORITY_ALLOW_LIGHTS);
+        private final Uri ZEN_PRIORITY_VIBRATION_MODE = CMSettings.System.getUriFor(
+                CMSettings.System.ZEN_PRIORITY_VIBRATION_MODE);
 
         public SettingsObserver(Handler handler) {
             super(handler);
@@ -730,6 +753,8 @@ public class ZenModeHelper {
                      ZEN_ALLOW_LIGHTS, false /*notifyForDescendents*/, this);
             resolver.registerContentObserver(
                      ZEN_PRIORITY_ALLOW_LIGHTS, false /*notifyForDescendents*/, this);
+            resolver.registerContentObserver(
+                     ZEN_PRIORITY_VIBRATION_MODE, false /*notifyForDescendents*/, this);
             update(null);
         }
 
@@ -746,6 +771,8 @@ public class ZenModeHelper {
                 }
             } else if (ZEN_ALLOW_LIGHTS.equals(uri) || ZEN_PRIORITY_ALLOW_LIGHTS.equals(uri)) {
                 readAllowLightsFromSettings();
+            } else if (ZEN_PRIORITY_VIBRATION_MODE.equals(uri)) {
+                readVibrationModeFromSettings();
             }
         }
     }
diff --git a/services/core/java/com/android/server/pm/MultiTaskDealer.java b/services/core/java/com/android/server/pm/MultiTaskDealer.java
new file mode 100644
index 0000000..9b8d46e
--- /dev/null
+++ b/services/core/java/com/android/server/pm/MultiTaskDealer.java
@@ -0,0 +1,141 @@
+/*
+* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions are
+* met:
+*    * Redistributions of source code must retain the above copyright
+*      notice, this list of conditions and the following disclaimer.
+*    * Redistributions in binary form must reproduce the above
+*      copyright notice, this list of conditions and the following
+*      disclaimer in the documentation and/or other materials provided
+*      with the distribution.
+*    * Neither the name of The Linux Foundation nor the names of its
+*      contributors may be used to endorse or promote products derived
+*      from this software without specific prior written permission.
+*
+* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+* ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+* OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+package com.android.server.pm;
+
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+import android.util.Log;
+
+public class MultiTaskDealer {
+
+    public static final String TAG = "MultiTaskDealer";
+    public static final String PACKAGEMANAGER_SCANER = "packagescan";
+    private static final boolean DEBUG_TASK = false;
+
+    private static HashMap<String, WeakReference<MultiTaskDealer>> map = new HashMap<String, WeakReference<MultiTaskDealer>>();
+
+    public static MultiTaskDealer getDealer(String name) {
+        WeakReference<MultiTaskDealer> ref = map.get(name);
+        MultiTaskDealer dealer = ref!=null?ref.get():null;
+        return dealer;
+    }
+
+    public static MultiTaskDealer startDealer(String name,int taskCount) {
+        MultiTaskDealer dealer = getDealer(name);
+        if(dealer==null) {
+            dealer = new MultiTaskDealer(name,taskCount);
+            WeakReference<MultiTaskDealer> ref = new WeakReference<MultiTaskDealer>(dealer);
+            map.put(name,ref);
+        }
+        return dealer;
+    }
+
+    public void startLock() {
+        mLock.lock();
+    }
+
+    public void endLock() {
+        mLock.unlock();
+    }
+
+    private ThreadPoolExecutor mExecutor;
+    private int mTaskCount = 0;
+    private boolean mNeedNotifyEnd = false;
+    private Object mObjWaitAll = new Object();
+    private ReentrantLock mLock = new ReentrantLock();
+
+    public MultiTaskDealer(String name,int taskCount) {
+        final String taskName = name;
+        ThreadFactory factory = new ThreadFactory()
+        {
+            private final AtomicInteger mCount = new AtomicInteger(1);
+
+            public Thread newThread(final Runnable r) {
+                if (DEBUG_TASK) Log.d(TAG, "create a new thread:" + taskName);
+                return new Thread(r, taskName + "-" + mCount.getAndIncrement());
+            }
+        };
+        mExecutor = new ThreadPoolExecutor(taskCount, taskCount, 5, TimeUnit.SECONDS,
+                new LinkedBlockingQueue<Runnable>(), factory){
+            protected void afterExecute(Runnable r, Throwable t) {
+                if(t!=null) {
+                    t.printStackTrace();
+                }
+                MultiTaskDealer.this.TaskCompleteNotify(r);
+                if (DEBUG_TASK) Log.d(TAG, "end task");
+                super.afterExecute(r,t);
+            }
+            protected void beforeExecute(Thread t, Runnable r) {
+                if (DEBUG_TASK) Log.d(TAG, "start task");
+                super.beforeExecute(t,r);
+            }
+        };
+    }
+
+    public void addTask(Runnable task) {
+        synchronized (mObjWaitAll) {
+            mTaskCount+=1;
+        }
+        mExecutor.execute(task);
+        if (DEBUG_TASK) Log.d(TAG, "addTask");
+    }
+
+    private void TaskCompleteNotify(Runnable task) {
+        synchronized (mObjWaitAll) {
+            mTaskCount-=1;
+            if(mTaskCount<=0 && mNeedNotifyEnd) {
+                if (DEBUG_TASK) Log.d(TAG, "complete notify");
+                mObjWaitAll.notify();
+            }
+        }
+    }
+
+    public void waitAll() {
+        if (DEBUG_TASK) Log.d(TAG, "start wait all");
+        synchronized (mObjWaitAll) {
+            if(mTaskCount>0) {
+                mNeedNotifyEnd = true;
+                try {
+                    mObjWaitAll.wait();
+                } catch (Exception e) {
+                }
+                mNeedNotifyEnd = false;
+            }
+            if (DEBUG_TASK) Log.d(TAG, "wait finish");
+            return;
+        }
+    }
+}
diff --git a/services/core/java/com/android/server/pm/PackageDexOptimizer.java b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
index f73cb0a..fa11ff8 100644
--- a/services/core/java/com/android/server/pm/PackageDexOptimizer.java
+++ b/services/core/java/com/android/server/pm/PackageDexOptimizer.java
@@ -57,6 +57,8 @@ final class PackageDexOptimizer {
     private final PowerManager.WakeLock mDexoptWakeLock;
     private volatile boolean mSystemReady;
 
+    private Object mDeferredDexOptSync = new Object();
+
     PackageDexOptimizer(PackageManagerService packageManagerService) {
         this.mPackageManagerService = packageManagerService;
         PowerManager powerManager = (PowerManager)packageManagerService.mContext.getSystemService(
@@ -150,7 +152,9 @@ final class PackageDexOptimizer {
                     // We're deciding to defer a needed dexopt. Don't bother dexopting for other
                     // paths and instruction sets. We'll deal with them all together when we process
                     // our list of deferred dexopts.
-                    addPackageForDeferredDexopt(pkg);
+                    synchronized (mDeferredDexOptSync) {
+                        addPackageForDeferredDexopt(pkg);
+                    }
                     return DEX_OPT_DEFERRED;
                 }
 
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index d5c58df..920a850 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -1,4 +1,7 @@
 /*
+ * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
+ * Not a Contribution.
+ *
  * Copyright (C) 2006 The Android Open Source Project
  * This code has been modified.  Portions copyright (C) 2010, T-Mobile USA, Inc.
  *
@@ -248,6 +251,7 @@ import com.android.server.IntentResolver;
 import com.android.server.LocalServices;
 import com.android.server.ServiceThread;
 import com.android.server.SystemConfig;
+import com.android.server.SystemConfig.AppLink;
 import com.android.server.Watchdog;
 import com.android.server.pm.PermissionsState.PermissionState;
 import com.android.server.pm.Settings.DatabaseVersion;
@@ -333,6 +337,7 @@ public class PackageManagerService extends IPackageManager.Stub {
     private static final boolean DEBUG_PACKAGE_SCANNING = false;
     private static final boolean DEBUG_VERIFY = false;
     private static final boolean DEBUG_DEXOPT = false;
+    private static final boolean DEBUG_FILTERS = false;
     private static final boolean DEBUG_ABI_SELECTION = false;
     private static final boolean DEBUG_PREBUNDLED_SCAN = false;
     private static final boolean DEBUG_PROTECTED = false;
@@ -616,7 +621,7 @@ public class PackageManagerService extends IPackageManager.Stub {
     final ArraySet<String> mTransferedPackages = new ArraySet<String>();
 
     // Broadcast actions that are only available to the system.
-    final ArraySet<String> mProtectedBroadcasts = new ArraySet<String>();
+    final ArrayMap<String, String> mProtectedBroadcasts = new ArrayMap<>();
 
     /** List of packages waiting for verification. */
     final SparseArray<PackageVerificationState> mPendingVerification
@@ -1491,6 +1496,17 @@ public class PackageManagerService extends IPackageManager.Stub {
                             // if this was a theme, send it off to the theme service for processing
                             if(res.pkg.mIsThemeApk || res.pkg.mIsLegacyIconPackApk) {
                                 processThemeResourcesInThemeService(res.pkg.packageName);
+                            } else if (mOverlays.containsKey(res.pkg.packageName)) {
+
+                                // if this was an app and is themed send themes that theme it
+                                // for processing
+                                ArrayMap<String, PackageParser.Package> themes =
+                                        mOverlays.get(res.pkg.packageName);
+
+                                for (PackageParser.Package themePkg : themes.values()) {
+                                    processThemeResourcesInThemeService(themePkg.packageName);
+                                }
+
                             }
                             if (res.removedInfo.args != null) {
                                 // Remove the replaced package's older resources safely now
@@ -1962,9 +1978,9 @@ public class PackageManagerService extends IPackageManager.Stub {
         mAvailableFeatures = systemConfig.getAvailableFeatures();
         mSignatureAllowances = systemConfig.getSignatureAllowances();
 
-        synchronized (mInstallLock) {
+//        synchronized (mInstallLock) {
         // writer
-        synchronized (mPackages) {
+//        synchronized (mPackages) {
             mHandlerThread = new ServiceThread(TAG,
                     Process.THREAD_PRIORITY_BACKGROUND, true /*allowIo*/);
             mHandlerThread.start();
@@ -2488,8 +2504,8 @@ public class PackageManagerService extends IPackageManager.Stub {
             mIntentFilterVerifier = new IntentVerifierProxy(mContext,
                     mIntentFilterVerifierComponent);
 
-        } // synchronized (mPackages)
-        } // synchronized (mInstallLock)
+        //} // synchronized (mPackages)
+        //} // synchronized (mInstallLock)
 
         // Now after opening every single application zip, make sure they
         // are all flushed.  Not really needed, but keeps things nice and
@@ -2626,10 +2642,11 @@ public class PackageManagerService extends IPackageManager.Stub {
         }
 
         SystemConfig systemConfig = SystemConfig.getInstance();
-        ArraySet<String> packages = systemConfig.getLinkedApps();
+        ArraySet<AppLink> links = systemConfig.getLinkedApps();
         ArraySet<String> domains = new ArraySet<String>();
 
-        for (String packageName : packages) {
+        for (AppLink link : links) {
+            String packageName = link.pkgname;
             PackageParser.Package pkg = mPackages.get(packageName);
             if (pkg != null) {
                 if (!pkg.isSystemApp()) {
@@ -2654,11 +2671,11 @@ public class PackageManagerService extends IPackageManager.Stub {
                     // state w.r.t. the formal app-linkage "no verification attempted" state;
                     // and then 'always' in the per-user state actually used for intent resolution.
                     final IntentFilterVerificationInfo ivi;
-                    ivi = mSettings.createIntentFilterVerificationIfNeededLPw(packageName,
-                            new ArrayList<String>(domains));
+                    ivi = mSettings.createIntentFilterVerificationIfNeededLPw(
+                            packageName, new ArrayList<String>(domains));
                     ivi.setStatus(INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_UNDEFINED);
-                    mSettings.updateIntentFilterVerificationStatusLPw(packageName,
-                            INTENT_FILTER_DOMAIN_VERIFICATION_STATUS_ALWAYS, userId);
+                    mSettings.updateIntentFilterVerificationStatusLPw(
+                            packageName, link.state, userId);
                 } else {
                     Slog.w(TAG, "Sysconfig <app-link> package '" + packageName
                             + "' does not handle web links");
@@ -4028,7 +4045,19 @@ public class PackageManagerService extends IPackageManager.Stub {
     @Override
     public boolean isProtectedBroadcast(String actionName) {
         synchronized (mPackages) {
-            return mProtectedBroadcasts.contains(actionName);
+            return mProtectedBroadcasts.containsKey(actionName);
+        }
+    }
+
+    @Override
+    public boolean isProtectedBroadcastAllowed(String actionName, int callingUid) {
+        synchronized (mPackages) {
+            if (mProtectedBroadcasts.containsKey(actionName)) {
+               final int result = checkUidPermission(mProtectedBroadcasts.get(actionName),
+                        callingUid);
+                return result == PackageManager.PERMISSION_GRANTED;
+            }
+            return false;
         }
     }
 
@@ -4701,10 +4730,14 @@ public class PackageManagerService extends IPackageManager.Stub {
     }
 
     private boolean shouldIncludeResolveActivity(Intent intent) {
-        synchronized(mPackages) {
-            AppSuggestManager suggest = AppSuggestManager.getInstance(mContext);
-            return mResolverReplaced && (suggest != null) ? suggest.handles(intent) : false;
+        // Don't call into AppSuggestManager before it comes up later in the SystemServer init!
+        if (!mSystemReady || mOnlyCore) {
+            return false;
         }
+
+        AppSuggestManager suggest = AppSuggestManager.getInstance(mContext);
+        return mResolverReplaced && (suggest.getService() != null) ?
+                suggest.handles(intent) : false;
     }
 
     @Override
@@ -5797,7 +5830,7 @@ public class PackageManagerService extends IPackageManager.Stub {
     }
 
     private void scanDirLI(File dir, int parseFlags, int scanFlags, long currentTime,
-            UserHandle user) {
+            final UserHandle user) {
         final File[] files = dir.listFiles();
         if (ArrayUtils.isEmpty(files)) {
             Log.d(TAG, "No files in app dir " + dir);
@@ -5809,8 +5842,8 @@ public class PackageManagerService extends IPackageManager.Stub {
                     + " flags=0x" + Integer.toHexString(parseFlags));
         }
 
-        int prebundledUserId = user == null ? UserHandle.USER_OWNER : user.getIdentifier();
-        boolean isPrebundled = (parseFlags & PackageParser.PARSE_IS_PREBUNDLED_DIR) != 0;
+        final int prebundledUserId = user == null ? UserHandle.USER_OWNER : user.getIdentifier();
+        final boolean isPrebundled = (parseFlags & PackageParser.PARSE_IS_PREBUNDLED_DIR) != 0;
         if (isPrebundled) {
             synchronized (mPackages) {
                 if (DEBUG_PREBUNDLED_SCAN) Log.d(TAG, "Reading prebundled packages for user "
@@ -5819,6 +5852,13 @@ public class PackageManagerService extends IPackageManager.Stub {
             }
         }
 
+        Log.d(TAG, "start scanDirLI:"+dir);
+        // use multi thread to speed up scanning
+        int iMultitaskNum = SystemProperties.getInt("persist.pm.multitask", 6);
+        Log.d(TAG, "max thread:" + iMultitaskNum);
+        final MultiTaskDealer dealer = (iMultitaskNum > 1) ? MultiTaskDealer.startDealer(
+                MultiTaskDealer.PACKAGEMANAGER_SCANER, iMultitaskNum) : null;
+
         for (File file : files) {
             final boolean isPackage = (isApkFile(file) || file.isDirectory())
                     && !PackageInstallerService.isStageName(file.getName());
@@ -5826,43 +5866,64 @@ public class PackageManagerService extends IPackageManager.Stub {
                 // Ignore entries which are not packages
                 continue;
             }
-            try {
-                scanPackageLI(file, parseFlags | PackageParser.PARSE_MUST_BE_APK,
-                        scanFlags, currentTime, user);
-                if (isPrebundled) {
-                    final PackageParser.Package pkg;
+
+            final File ref_file = file;
+            final int ref_parseFlags = parseFlags;
+            final int ref_scanFlags = scanFlags;
+            final long ref_currentTime = currentTime;
+
+            Runnable scanTask = new Runnable() {
+                public void run() {
+
                     try {
-                        pkg = new PackageParser().parsePackage(file, parseFlags);
-                    } catch (PackageParserException e) {
-                        throw PackageManagerException.from(e);
-                    }
-                    synchronized (mPackages) {
-                        if (DEBUG_PREBUNDLED_SCAN) Log.d(TAG,
-                                "Marking prebundled packages for user " + prebundledUserId);
-                        mSettings.markPrebundledPackageInstalledLPr(prebundledUserId,
-                                pkg.packageName);
-                        // do this for every other user
-                        for (UserInfo userInfo : sUserManager.getUsers(true)) {
-                            if (userInfo.id == prebundledUserId) continue;
-                            mSettings.markPrebundledPackageInstalledLPr(userInfo.id,
+                        scanPackageLI(ref_file, ref_parseFlags | PackageParser.PARSE_MUST_BE_APK,
+                                ref_scanFlags, ref_currentTime, user);
+                        if (isPrebundled) {
+                            final PackageParser.Package pkg;
+                            try {
+                                pkg = new PackageParser().parsePackage(ref_file, ref_parseFlags);
+                            } catch (PackageParserException e) {
+                                throw PackageManagerException.from(e);
+                            }
+                            if (DEBUG_PREBUNDLED_SCAN) Log.d(TAG,
+                                    "Marking prebundled package " + pkg.packageName +
+                                            " for user " + prebundledUserId);
+                            mSettings.markPrebundledPackageInstalledLPr(prebundledUserId,
                                     pkg.packageName);
+                            // do this for every other user
+                            for (UserInfo userInfo : sUserManager.getUsers(true)) {
+                                if (userInfo.id == prebundledUserId) continue;
+                                if (DEBUG_PREBUNDLED_SCAN) Log.d(TAG,
+                                        "Marking for secondary user " + userInfo.id);
+                                mSettings.markPrebundledPackageInstalledLPr(userInfo.id,
+                                        pkg.packageName);
+                            }
+                        }
+                    } catch (PackageManagerException e) {
+                        Slog.w(TAG, "Failed to parse " + ref_file + ": " + e.getMessage());
+
+                        // Delete invalid userdata apps
+                        if ((ref_parseFlags & PackageParser.PARSE_IS_SYSTEM) == 0 &&
+                                e.error == PackageManager.INSTALL_FAILED_INVALID_APK) {
+                            logCriticalInfo(Log.WARN, "Deleting invalid package at " + ref_file);
+                            if (ref_file.isDirectory()) {
+                                mInstaller.rmPackageDir(ref_file.getAbsolutePath());
+                            } else {
+                                ref_file.delete();
+                            }
                         }
                     }
                 }
-            } catch (PackageManagerException e) {
-                Slog.w(TAG, "Failed to parse " + file + ": " + e.getMessage());
+            };
 
-                // Delete invalid userdata apps
-                if ((parseFlags & PackageParser.PARSE_IS_SYSTEM) == 0 &&
-                        e.error == PackageManager.INSTALL_FAILED_INVALID_APK) {
-                    logCriticalInfo(Log.WARN, "Deleting invalid package at " + file);
-                    if (file.isDirectory()) {
-                        mInstaller.rmPackageDir(file.getAbsolutePath());
-                    } else {
-                        file.delete();
-                    }
-                }
-            }
+            if (dealer != null)
+                dealer.addTask(scanTask);
+            else
+                scanTask.run();
+        }
+
+        if (dealer != null) {
+            dealer.waitAll();
         }
 
         if (isPrebundled) {
@@ -5872,6 +5933,8 @@ public class PackageManagerService extends IPackageManager.Stub {
                 mSettings.writePrebundledPackagesLPr(prebundledUserId);
             }
         }
+
+        Log.d(TAG, "end scanDirLI:"+dir);
     }
 
     private static File getSettingsProblemFile() {
@@ -5885,7 +5948,7 @@ public class PackageManagerService extends IPackageManager.Stub {
         logCriticalInfo(priority, msg);
     }
 
-    static void logCriticalInfo(int priority, String msg) {
+    static synchronized void logCriticalInfo(int priority, String msg) {
         Slog.println(priority, TAG, msg);
         EventLogTags.writePmCriticalInfo(msg);
         try {
@@ -5975,15 +6038,17 @@ public class PackageManagerService extends IPackageManager.Stub {
         if ((parseFlags & PackageParser.PARSE_IS_PREBUNDLED_DIR) != 0) {
             synchronized (mPackages) {
                 PackageSetting existingSettings = mSettings.peekPackageLPr(pkg.packageName);
-                if (mSettings.wasPrebundledPackageInstalledLPr(user.getIdentifier()
-                        , pkg.packageName) && existingSettings == null) {
-                    // The prebundled app was installed at some point in time, but now it is
-                    // gone.  Assume that the user uninstalled it intentionally: do not reinstall.
+
+                if (!mSettings.shouldPrebundledPackageBeInstalledForUserLPr(existingSettings,
+                        user.getIdentifier(), pkg.packageName)) {
+                    // The prebundled app was installed at some point for the owner and isn't
+                    // currently installed for the owner, dont install it for a new user
+                    // OR the prebundled app was installed for the user at some point and isn't
+                    // current installed for the user, so skip reinstalling it
                     throw new PackageManagerException(INSTALL_FAILED_UNINSTALLED_PREBUNDLE,
                             "skip reinstall for " + pkg.packageName);
-                } else if (existingSettings == null &&
-                        !mSettings.shouldPrebundledPackageBeInstalled(mContext.getResources(),
-                                pkg.packageName, mCustomResources)) {
+                } else if (!mSettings.shouldPrebundledPackageBeInstalledForRegion(
+                        mContext.getResources(), pkg.packageName, mCustomResources)) {
                     // The prebundled app is not needed for the default mobile country code,
                     // skip installing it
                     throw new PackageManagerException(INSTALL_FAILED_REGION_LOCKED_PREBUNDLE,
@@ -6299,9 +6364,8 @@ public class PackageManagerService extends IPackageManager.Stub {
                 if (doTrim) {
                     if (!isFirstBoot()) {
                         try {
-                            ActivityManagerNative.getDefault().showBootMessage(
-                                    mContext.getResources().getString(
-                                            R.string.android_upgrading_fstrim), true);
+                            ActivityManagerNative.getDefault().updateBootProgress(
+                                    IActivityManager.BOOT_STAGE_FSTRIM, null, 0, 0, true);
                         } catch (RemoteException e) {
                         }
                     }
@@ -6428,9 +6492,9 @@ public class PackageManagerService extends IPackageManager.Stub {
             Log.i(TAG, "Optimizing app " + curr + " of " + total + ": " + pkg.packageName);
         }
         try {
-            ActivityManagerNative.getDefault().showBootMessage(
-                    mContext.getResources().getString(R.string.android_upgrading_apk,
-                            curr, total), true);
+            ActivityManagerNative.getDefault().updateBootProgress(
+                    IActivityManager.BOOT_STAGE_PREPARING_APPS,
+                    pkg.applicationInfo, curr, total, true);
         } catch (RemoteException e) {
         }
         PackageParser.Package p = pkg;
@@ -7458,6 +7522,25 @@ public class PackageManagerService extends IPackageManager.Stub {
         KeySetManagerService ksms = mSettings.mKeySetManagerService;
         ksms.assertScannedPackageValid(pkg);
 
+        // Get the current theme config. We do this outside the lock
+        // since ActivityManager might be waiting on us already
+        // and a deadlock would result.
+        final boolean isBootScan = (scanFlags & SCAN_BOOTING) != 0;
+        ThemeConfig config = mBootThemeConfig;
+        if (!isBootScan) {
+            final IActivityManager am = ActivityManagerNative.getDefault();
+            try {
+                if (am != null) {
+                    config = am.getConfiguration().themeConfig;
+                } else {
+                    Log.w(TAG, "ActivityManager getDefault() " +
+                            "returned null, cannot compile app's theme");
+                }
+            } catch(RemoteException e) {
+                Log.w(TAG, "Failed to get the theme config from ActivityManager");
+            }
+        }
+
         // writer
         synchronized (mPackages) {
             // We don't expect installation to fail beyond this point
@@ -7799,32 +7882,36 @@ public class PackageManagerService extends IPackageManager.Stub {
             if (pkg.protectedBroadcasts != null) {
                 N = pkg.protectedBroadcasts.size();
                 for (i=0; i<N; i++) {
-                    mProtectedBroadcasts.add(pkg.protectedBroadcasts.get(i));
+                    mProtectedBroadcasts.put(pkg.protectedBroadcasts.keyAt(i),
+                            pkg.protectedBroadcasts.valueAt(i));
                 }
             }
 
             pkgSetting.setTimeStamp(scanFileTime);
 
-            final boolean isBootScan = (scanFlags & SCAN_BOOTING) != 0;
             // Generate resources & idmaps if pkg is NOT a theme
             // We must compile resources here because during the initial boot process we may get
             // here before a default theme has had a chance to compile its resources
+            // During app installation we only compile applied theme here (rest will be compiled
+            // in background)
             if (pkg.mOverlayTargets.isEmpty() && mOverlays.containsKey(pkg.packageName)) {
                 ArrayMap<String, PackageParser.Package> themes = mOverlays.get(pkg.packageName);
-                for(PackageParser.Package themePkg : themes.values()) {
-                    if (!isBootScan || (mBootThemeConfig != null &&
-                            (themePkg.packageName.equals(mBootThemeConfig.getOverlayPkgName()) ||
+
+                if (config != null) {
+                    for(PackageParser.Package themePkg : themes.values()) {
+                        if (themePkg.packageName.equals(config.getOverlayPkgName()) ||
                             themePkg.packageName.equals(
-                                    mBootThemeConfig.getOverlayPkgNameForApp(pkg.packageName))))) {
-                        try {
-                            compileResourcesAndIdmapIfNeeded(pkg, themePkg);
-                        } catch (Exception e) {
-                            // Do not stop a pkg installation just because of one bad theme
-                            // Also we don't break here because we should try to compile other
-                            // themes
-                            Slog.w(TAG, "Unable to compile " + themePkg.packageName
-                                    + " for target " + pkg.packageName, e);
-                            themePkg.mOverlayTargets.remove(pkg.packageName);
+                                     config.getOverlayPkgNameForApp(pkg.packageName))) {
+                            try {
+                                compileResourcesAndIdmapIfNeeded(pkg, themePkg);
+                            } catch (Exception e) {
+                                // Do not stop a pkg installation just because of one bad theme
+                                // Also we don't break here because we should try to compile other
+                                // themes
+                                Slog.w(TAG, "Unable to compile " + themePkg.packageName
+                                        + " for target " + pkg.packageName, e);
+                                themePkg.mOverlayTargets.remove(pkg.packageName);
+                            }
                         }
                     }
                 }
@@ -7858,10 +7945,22 @@ public class PackageManagerService extends IPackageManager.Stub {
                     }
 
                     if (failedException != null) {
-                        Slog.w(TAG, "Unable to process theme " + pkgName + " for " + target,
-                                failedException);
-                        // remove target from mOverlayTargets
-                        iterator.remove();
+                        if (failedException instanceof AaptException &&
+                                ((AaptException) failedException).isCommon) {
+                            Slog.e(TAG, "Unable to process common resources for " + pkgName +
+                                    ", uninstalling theme.", failedException);
+                            uninstallThemeForAllApps(pkg);
+                            deletePackageLI(pkg.packageName, null, true, null, null, 0, null,
+                                    false);
+                            throw new PackageManagerException(
+                                    PackageManager.INSTALL_FAILED_THEME_AAPT_ERROR,
+                                    "Unable to process theme " + pkgName, failedException);
+                        } else {
+                            Slog.w(TAG, "Unable to process theme " + pkgName + " for " + target,
+                                    failedException);
+                            // remove target from mOverlayTargets
+                            iterator.remove();
+                        }
                     }
                 }
             }
@@ -8234,8 +8333,15 @@ public class PackageManagerService extends IPackageManager.Stub {
     }
 
     public class AaptException extends Exception {
+        boolean isCommon;
+
         public AaptException(String message) {
+            this(message, false);
+        }
+
+        public AaptException(String message, boolean isCommon) {
             super(message);
+            this.isCommon = isCommon;
         }
     }
 
@@ -8261,16 +8367,19 @@ public class PackageManagerService extends IPackageManager.Stub {
         String internalPath = APK_PATH_TO_OVERLAY + target + File.separator;
         String resPath = ThemeUtils.getTargetCacheDir(target, pkg);
         final int sharedGid = UserHandle.getSharedAppGid(pkg.applicationInfo.uid);
+        final boolean isCommonResources = COMMON_OVERLAY.equals(target);
         int pkgId;
         if ("android".equals(target)) {
             pkgId = Resources.THEME_FRAMEWORK_PKG_ID;
-        } else if (COMMON_OVERLAY.equals(target)) {
+        } else if ("cyanogenmod.platform".equals(target)) {
+            pkgId = Resources.THEME_CM_PKG_ID;
+        } else if (isCommonResources) {
             pkgId = Resources.THEME_COMMON_PKG_ID;
         } else {
             pkgId = Resources.THEME_APP_PKG_ID;
         }
 
-        boolean hasCommonResources = (hasCommonResources(pkg) && !COMMON_OVERLAY.equals(target));
+        boolean hasCommonResources = (hasCommonResources(pkg) && !isCommonResources);
         PackageParser.Package targetPkg = mPackages.get(target);
         String appPath = targetPkg != null ? targetPkg.baseCodePath :
                 Environment.getRootDirectory() + "/framework/framework-res.apk";
@@ -8280,7 +8389,7 @@ public class PackageManagerService extends IPackageManager.Stub {
                 appPath,
                 hasCommonResources ? ThemeUtils.getTargetCacheDir(COMMON_OVERLAY, pkg)
                         + File.separator + "resources.apk" : "") != 0) {
-            throw new AaptException("Failed to run aapt");
+            throw new AaptException("Failed to run aapt", isCommonResources);
         }
     }
 
@@ -9384,12 +9493,15 @@ public class PackageManagerService extends IPackageManager.Stub {
             mFlags = flags;
             List<ResolveInfo> list = super.queryIntent(intent, resolvedType,
                     (flags & PackageManager.MATCH_DEFAULT_ONLY) != 0, userId);
-            // Remove protected Application components
+            // Remove protected Application components if they're explicitly queried for.
+            // Implicit intent queries will be gated when the returned component is acted upon.
             int callingUid = Binder.getCallingUid();
             String[] pkgs = getPackagesForUid(callingUid);
             List<String> packages = (pkgs != null) ? Arrays.asList(pkgs) : Collections.EMPTY_LIST;
-            if (callingUid != Process.SYSTEM_UID &&
-                    (getFlagsForUid(callingUid) & ApplicationInfo.FLAG_SYSTEM) == 0) {
+            final boolean isNotSystem = callingUid != Process.SYSTEM_UID &&
+                    (getFlagsForUid(callingUid) & ApplicationInfo.FLAG_SYSTEM) == 0;
+
+            if (isNotSystem && intent.getComponent() != null) {
                Iterator<ResolveInfo> itr = list.iterator();
                 while (itr.hasNext()) {
                     ActivityInfo activityInfo = itr.next().activityInfo;
@@ -9427,6 +9539,255 @@ public class PackageManagerService extends IPackageManager.Stub {
             return super.queryIntentFromList(intent, resolvedType, defaultOnly, listCut, userId);
         }
 
+        /**
+         * Finds a privileged activity that matches the specified activity names.
+         */
+        private PackageParser.Activity findMatchingActivity(
+                List<PackageParser.Activity> activityList, ActivityInfo activityInfo) {
+            for (PackageParser.Activity sysActivity : activityList) {
+                if (sysActivity.info.name.equals(activityInfo.name)) {
+                    return sysActivity;
+                }
+                if (sysActivity.info.name.equals(activityInfo.targetActivity)) {
+                    return sysActivity;
+                }
+                if (sysActivity.info.targetActivity != null) {
+                    if (sysActivity.info.targetActivity.equals(activityInfo.name)) {
+                        return sysActivity;
+                    }
+                    if (sysActivity.info.targetActivity.equals(activityInfo.targetActivity)) {
+                        return sysActivity;
+                    }
+                }
+            }
+            return null;
+        }
+
+        public class IterGenerator<E> {
+            public Iterator<E> generate(ActivityIntentInfo info) {
+                return null;
+            }
+        }
+
+        public class ActionIterGenerator extends IterGenerator<String> {
+            @Override
+            public Iterator<String> generate(ActivityIntentInfo info) {
+                return info.actionsIterator();
+            }
+        }
+
+        public class CategoriesIterGenerator extends IterGenerator<String> {
+            @Override
+            public Iterator<String> generate(ActivityIntentInfo info) {
+                return info.categoriesIterator();
+            }
+        }
+
+        public class SchemesIterGenerator extends IterGenerator<String> {
+            @Override
+            public Iterator<String> generate(ActivityIntentInfo info) {
+                return info.schemesIterator();
+            }
+        }
+
+        public class AuthoritiesIterGenerator extends IterGenerator<IntentFilter.AuthorityEntry> {
+            @Override
+            public Iterator<IntentFilter.AuthorityEntry> generate(ActivityIntentInfo info) {
+                return info.authoritiesIterator();
+            }
+        }
+
+        /**
+         * <em>WARNING</em> for performance reasons, the passed in intentList WILL BE
+         * MODIFIED. Do not pass in a list that should not be changed.
+         */
+        private <T> void getIntentListSubset(List<ActivityIntentInfo> intentList,
+                IterGenerator<T> generator, Iterator<T> searchIterator) {
+            // loop through the set of actions; every one must be found in the intent filter
+            while (searchIterator.hasNext()) {
+                // we must have at least one filter in the list to consider a match
+                if (intentList.size() == 0) {
+                    break;
+                }
+
+                final T searchAction = searchIterator.next();
+
+                // loop through the set of intent filters
+                final Iterator<ActivityIntentInfo> intentIter = intentList.iterator();
+                while (intentIter.hasNext()) {
+                    final ActivityIntentInfo intentInfo = intentIter.next();
+                    boolean selectionFound = false;
+
+                    // loop through the intent filter's selection criteria; at least one
+                    // of them must match the searched criteria
+                    final Iterator<T> intentSelectionIter = generator.generate(intentInfo);
+                    while (intentSelectionIter != null && intentSelectionIter.hasNext()) {
+                        final T intentSelection = intentSelectionIter.next();
+                        if (intentSelection != null && intentSelection.equals(searchAction)) {
+                            selectionFound = true;
+                            break;
+                        }
+                    }
+
+                    // the selection criteria wasn't found in this filter's set; this filter
+                    // is not a potential match
+                    if (!selectionFound) {
+                        intentIter.remove();
+                    }
+                }
+            }
+        }
+
+        /**
+         * Adjusts the priority of the given intent filter according to policy.
+         * <p>
+         * <ul>
+         * <li>The priority for unbundled updates to system applications is capped to the
+         *      priority defined on the system partition</li>
+         * </ul>
+         */
+        private void adjustPriority(
+                List<PackageParser.Activity> systemActivities, ActivityIntentInfo intent) {
+            // nothing to do; priority is fine as-is
+            if (intent.getPriority() <= 0) {
+                return;
+            }
+
+            final ActivityInfo activityInfo = intent.activity.info;
+            final ApplicationInfo applicationInfo = activityInfo.applicationInfo;
+
+            final boolean systemApp = applicationInfo.isSystemApp();
+            if (!systemApp) {
+                // non-system applications can never define a priority >0
+                Slog.w(TAG, "Non-system app; cap priority to 0;"
+                        + " package: " + applicationInfo.packageName
+                        + " activity: " + intent.activity.className
+                        + " origPrio: " + intent.getPriority());
+                intent.setPriority(0);
+                return;
+            }
+
+            if (systemActivities == null) {
+                // the system package is not disabled; we're parsing the system partition
+                // apps on the system image get whatever priority they request
+                return;
+            }
+
+            // system app unbundled update ... try to find the same activity
+            final PackageParser.Activity foundActivity =
+                    findMatchingActivity(systemActivities, activityInfo);
+            if (foundActivity == null) {
+                // this is a new activity; it cannot obtain >0 priority
+                if (DEBUG_FILTERS) {
+                    Slog.i(TAG, "New activity; cap priority to 0;"
+                            + " package: " + applicationInfo.packageName
+                            + " activity: " + intent.activity.className
+                            + " origPrio: " + intent.getPriority());
+                }
+                intent.setPriority(0);
+                return;
+            }
+
+            // found activity, now check for filter equivalence
+
+            // a shallow copy is enough; we modify the list, not its contents
+            final List<ActivityIntentInfo> intentListCopy =
+                    new ArrayList<>(foundActivity.intents);
+            final List<ActivityIntentInfo> foundFilters = findFilters(intent);
+
+            // find matching action subsets
+            final Iterator<String> actionsIterator = intent.actionsIterator();
+            if (actionsIterator != null) {
+                getIntentListSubset(
+                        intentListCopy, new ActionIterGenerator(), actionsIterator);
+                if (intentListCopy.size() == 0) {
+                    // no more intents to match; we're not equivalent
+                    if (DEBUG_FILTERS) {
+                        Slog.i(TAG, "Mismatched action; cap priority to 0;"
+                                + " package: " + applicationInfo.packageName
+                                + " activity: " + intent.activity.className
+                                + " origPrio: " + intent.getPriority());
+                    }
+                    intent.setPriority(0);
+                    return;
+                }
+            }
+
+            // find matching category subsets
+            final Iterator<String> categoriesIterator = intent.categoriesIterator();
+            if (categoriesIterator != null) {
+                getIntentListSubset(intentListCopy, new CategoriesIterGenerator(),
+                        categoriesIterator);
+                if (intentListCopy.size() == 0) {
+                    // no more intents to match; we're not equivalent
+                    if (DEBUG_FILTERS) {
+                        Slog.i(TAG, "Mismatched category; cap priority to 0;"
+                                + " package: " + applicationInfo.packageName
+                                + " activity: " + intent.activity.className
+                                + " origPrio: " + intent.getPriority());
+                    }
+                    intent.setPriority(0);
+                    return;
+                }
+            }
+
+            // find matching schemes subsets
+            final Iterator<String> schemesIterator = intent.schemesIterator();
+            if (schemesIterator != null) {
+                getIntentListSubset(intentListCopy, new SchemesIterGenerator(),
+                        schemesIterator);
+                if (intentListCopy.size() == 0) {
+                    // no more intents to match; we're not equivalent
+                    if (DEBUG_FILTERS) {
+                        Slog.i(TAG, "Mismatched scheme; cap priority to 0;"
+                                + " package: " + applicationInfo.packageName
+                                + " activity: " + intent.activity.className
+                                + " origPrio: " + intent.getPriority());
+                    }
+                    intent.setPriority(0);
+                    return;
+                }
+            }
+
+            // find matching authorities subsets
+            final Iterator<IntentFilter.AuthorityEntry>
+                    authoritiesIterator = intent.authoritiesIterator();
+            if (authoritiesIterator != null) {
+                getIntentListSubset(intentListCopy,
+                        new AuthoritiesIterGenerator(),
+                        authoritiesIterator);
+                if (intentListCopy.size() == 0) {
+                    // no more intents to match; we're not equivalent
+                    if (DEBUG_FILTERS) {
+                        Slog.i(TAG, "Mismatched authority; cap priority to 0;"
+                                + " package: " + applicationInfo.packageName
+                                + " activity: " + intent.activity.className
+                                + " origPrio: " + intent.getPriority());
+                    }
+                    intent.setPriority(0);
+                    return;
+                }
+            }
+
+            // we found matching filter(s); app gets the max priority of all intents
+            int cappedPriority = 0;
+            for (int i = intentListCopy.size() - 1; i >= 0; --i) {
+                cappedPriority = Math.max(cappedPriority, intentListCopy.get(i).getPriority());
+            }
+            if (intent.getPriority() > cappedPriority) {
+                if (DEBUG_FILTERS) {
+                    Slog.i(TAG, "Found matching filter(s);"
+                            + " cap priority to " + cappedPriority + ";"
+                            + " package: " + applicationInfo.packageName
+                            + " activity: " + intent.activity.className
+                            + " origPrio: " + intent.getPriority());
+                }
+                intent.setPriority(cappedPriority);
+                return;
+            }
+            // all this for nothing; the requested priority was <= what was on the system
+        }
+
         public final void addActivity(PackageParser.Activity a, String type) {
             final boolean systemApp = a.info.applicationInfo.isSystemApp();
             mActivities.put(a.getComponentName(), a);
@@ -9439,10 +9800,12 @@ public class PackageManagerService extends IPackageManager.Stub {
             final int NI = a.intents.size();
             for (int j=0; j<NI; j++) {
                 PackageParser.ActivityIntentInfo intent = a.intents.get(j);
-                if (!systemApp && intent.getPriority() > 0 && "activity".equals(type)) {
-                    intent.setPriority(0);
-                    Log.w(TAG, "Package " + a.info.applicationInfo.packageName + " has activity "
-                            + a.className + " with priority > 0, forcing to 0");
+                if ("activity".equals(type)) {
+                    final PackageSetting ps =
+                            mSettings.getDisabledSystemPkgLPr(intent.activity.info.packageName);
+                    final List<PackageParser.Activity> systemActivities =
+                            ps != null && ps.pkg != null ? ps.pkg.activities : null;
+                    adjustPriority(systemActivities, intent);
                 }
                 if (DEBUG_SHOW_INFO) {
                     Log.v(TAG, "    IntentFilter:");
@@ -9596,18 +9959,6 @@ public class PackageManagerService extends IPackageManager.Stub {
             out.println();
         }
 
-//        List<ResolveInfo> filterEnabled(List<ResolveInfo> resolveInfoList) {
-//            final Iterator<ResolveInfo> i = resolveInfoList.iterator();
-//            final List<ResolveInfo> retList = Lists.newArrayList();
-//            while (i.hasNext()) {
-//                final ResolveInfo resolveInfo = i.next();
-//                if (isEnabledLP(resolveInfo.activityInfo)) {
-//                    retList.add(resolveInfo);
-//                }
-//            }
-//            return retList;
-//        }
-
         // Keys are String (activity class name), values are Activity.
         private final ArrayMap<ComponentName, PackageParser.Activity> mActivities
                 = new ArrayMap<ComponentName, PackageParser.Activity>();
@@ -10175,10 +10526,10 @@ public class PackageManagerService extends IPackageManager.Stub {
 
     void startCleaningPackages() {
         // reader
+        if (!isExternalMediaAvailable()) {
+            return;
+        }
         synchronized (mPackages) {
-            if (!isExternalMediaAvailable()) {
-                return;
-            }
             if (mSettings.mPackagesToBeCleaned.isEmpty()) {
                 return;
             }
@@ -11154,7 +11505,7 @@ public class PackageManagerService extends IPackageManager.Stub {
         final IPackageInstallObserver2 observer;
         int installFlags;
         final String installerPackageName;
-        final String volumeUuid;
+        String volumeUuid;
         final VerificationParams verificationParams;
         private InstallArgs mArgs;
         private int mRet;
@@ -11359,6 +11710,28 @@ public class PackageManagerService extends IPackageManager.Stub {
                 }
             }
 
+            // Check whether we're replacing an existing package that's
+            // installed on adopted storage.  If yes, override the new
+            // package location to match.
+            if (move == null && (installFlags & PackageManager.INSTALL_REPLACE_EXISTING) != 0) {
+                synchronized (mPackages) {
+                    PackageParser.Package pkg = mPackages.get(pkgLite.packageName);
+                    if (pkg != null && isExternalAdopted(pkg)) {
+                        // Check whether anything will actually change
+                        // so that we log only when a fixup was needed
+                        if (!((installFlags & PackageManager.INSTALL_INTERNAL) != 0
+                                && (installFlags & PackageManager.INSTALL_EXTERNAL) == 0
+                                && Objects.equals(volumeUuid, pkg.volumeUuid))) {
+                            installFlags |= PackageManager.INSTALL_INTERNAL;
+                            installFlags &= ~PackageManager.INSTALL_EXTERNAL;
+                            volumeUuid = pkg.volumeUuid;
+                            Slog.w(TAG, "Replacing package on adopted storage, updating "
+                                    +"new package destination to volumeUuid "+volumeUuid);
+                        }
+                    }
+                }
+            }
+
             final InstallArgs args = createInstallArgs(this);
             mArgs = args;
 
@@ -11667,8 +12040,6 @@ public class PackageManagerService extends IPackageManager.Stub {
          * Called after the source arguments are copied. This is used mostly for
          * MoveParams when it needs to read the source file to put it in the
          * destination.
-         *
-         * @return
          */
         int doPostCopy(int uid) {
             return PackageManager.INSTALL_SUCCEEDED;
@@ -13312,6 +13683,14 @@ public class PackageManagerService extends IPackageManager.Stub {
         return (info.flags & ApplicationInfo.FLAG_EXTERNAL_STORAGE) != 0;
     }
 
+    // Package is assumed to be on adopted storage if:
+    //   FLAG_EXTERNAL_STORAGE is set
+    //   volumeUuid is neither private internal (null) nor primary physical
+    private static boolean isExternalAdopted(PackageParser.Package pkg) {
+        return isExternal(pkg) && !TextUtils.isEmpty(pkg.volumeUuid)
+                && !Objects.equals(pkg.volumeUuid, StorageManager.UUID_PRIMARY_PHYSICAL);
+    }
+
     private static boolean isSystemApp(PackageParser.Package pkg) {
         return (pkg.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) != 0;
     }
@@ -17205,10 +17584,12 @@ public class PackageManagerService extends IPackageManager.Stub {
     }
 
     @Override
-    public boolean isComponentProtected(String callingPackage,
+    public boolean isComponentProtected(String callingPackage, int callingUid,
             ComponentName componentName, int userId) {
         if (DEBUG_PROTECTED) Log.d(TAG, "Checking if component is protected "
-                + componentName.flattenToShortString() + " from calling package " + callingPackage);
+                + componentName.flattenToShortString() + " from calling package " + callingPackage
+                + " and callinguid " + callingUid);
+
         enforceCrossUserPermission(Binder.getCallingUid(), userId, false, false, "set protected");
 
         //Allow managers full access
@@ -17229,8 +17610,24 @@ public class PackageManagerService extends IPackageManager.Stub {
             return false;
         }
 
+        //If this component is launched from a validation component, allow it.
         if (TextUtils.equals(PROTECTED_APPS_TARGET_VALIDATION_COMPONENT,
-                componentName.flattenToString())) {
+                componentName.flattenToString()) && callingUid == Process.SYSTEM_UID) {
+            return false;
+        }
+
+        //If this component is launched from the system or a uid of a protected component, allow it.
+        boolean fromProtectedComponentUid = false;
+        for (String protectedComponentManager : protectedComponentManagers) {
+            int packageUid = getPackageUid(protectedComponentManager, userId);
+            if (packageUid != -1 && callingUid == packageUid) {
+                fromProtectedComponentUid = true;
+            }
+        }
+
+        if (TextUtils.equals(callingPackage, "android") && callingUid == Process.SYSTEM_UID
+                || callingPackage == null && fromProtectedComponentUid) {
+            if (DEBUG_PROTECTED) Log.d(TAG, "Calling package is android or manager, allow");
             return false;
         }
 
@@ -17240,14 +17637,8 @@ public class PackageManagerService extends IPackageManager.Stub {
         synchronized (mPackages) {
             pkgSetting = mSettings.mPackages.get(packageName);
 
-            if (pkgSetting == null) {
-                if (className == null) {
-                    throw new IllegalArgumentException(
-                            "Unknown package: " + packageName);
-                }
-                throw new IllegalArgumentException(
-                        "Unknown component: " + packageName
-                                + "/" + className);
+            if (pkgSetting == null || className == null) {
+                return false;
             }
             // Get all the protected components
             components = pkgSetting.getProtectedComponents(userId);
@@ -17752,10 +18143,20 @@ public class PackageManagerService extends IPackageManager.Stub {
             }
 
             if (failedException != null) {
-                Slog.w(TAG, "Unable to process theme " + pkg.packageName + " for " + target,
-                        failedException);
-                // remove target from mOverlayTargets
-                iterator.remove();
+                if (failedException instanceof AaptException &&
+                        ((AaptException) failedException).isCommon) {
+                    Slog.e(TAG, "Unable to process common resources for " + pkg.packageName +
+                            ", uninstalling theme.", failedException);
+                    uninstallThemeForAllApps(pkg);
+                    deletePackageX(pkg.packageName, getCallingUid(),
+                            PackageManager.DELETE_ALL_USERS);
+                    return PackageManager.INSTALL_FAILED_THEME_AAPT_ERROR;
+                } else {
+                    Slog.w(TAG, "Unable to process theme " + pkg.packageName + " for " + target,
+                            failedException);
+                    // remove target from mOverlayTargets
+                    iterator.remove();
+                }
             }
         }
 
@@ -17812,6 +18213,8 @@ public class PackageManagerService extends IPackageManager.Stub {
         for (String themePkgName : themesToProcess) {
             processThemeResources(themePkgName);
         }
+
+        updateIconMapping(themeConfig.getIconPackPkgName());
     }
 
     private void createAndSetCustomResources() {
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index 7b95106..38478c2 100755
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -338,7 +338,7 @@ final class Settings {
     // Packages that have been uninstalled and still need their external
     // storage data deleted.
     final ArrayList<PackageCleanItem> mPackagesToBeCleaned = new ArrayList<PackageCleanItem>();
-    
+
     // Packages that have been renamed since they were first installed.
     // Keys are the new names of the packages, values are the original
     // names.  The packages appear everwhere else under their original
@@ -2459,11 +2459,16 @@ final class Settings {
     private void readPrebundledPackagesForUserFromFileLPr(int userId, File file) {
         BufferedReader reader = null;
         try {
+            HashSet<String> ppkg = mPrebundledPackages.get(userId);
+            if (ppkg == null) {
+                Slog.e(PackageManagerService.TAG, "Unable to get packages for user " + userId);
+                return;
+            }
             reader = new BufferedReader(new FileReader(file));
             String packageName = reader.readLine();
             while (packageName != null) {
                 if (!TextUtils.isEmpty(packageName)) {
-                    mPrebundledPackages.get(userId).add(packageName);
+                    ppkg.add(packageName);
                 }
                 packageName = reader.readLine();
             }
@@ -2519,7 +2524,7 @@ final class Settings {
         return mPrebundledPackages.get(userId).contains(packageName);
     }
 
-    boolean shouldPrebundledPackageBeInstalled(Resources res, String packageName,
+    boolean shouldPrebundledPackageBeInstalledForRegion(Resources res, String packageName,
                                             Resources configuredResources) {
         // Default fallback on lack of bad package
         if (TextUtils.isEmpty(packageName)) {
@@ -2552,6 +2557,37 @@ final class Settings {
         return !ArrayUtils.contains(prebundledArray, packageName);
     }
 
+    boolean shouldPrebundledPackageBeInstalledForUserLPr(PackageSetting existingSettings,
+            int userIdentifier, String packageName) {
+
+        // Check if package installed for the user
+        final boolean isInstalledForUser = (existingSettings != null
+                && existingSettings.getInstalled(userIdentifier));
+
+        // Check if package installed for the owner
+        final boolean isInstalledForOwner = (existingSettings != null
+                && existingSettings.getInstalled(UserHandle.USER_OWNER));
+
+        // Check if the user is the owner
+        final boolean isOwner = userIdentifier == UserHandle.USER_OWNER;
+
+        // If the given user is not the owner, and the prebundle was installed for the owner
+        // but is no longer installed, and isn't currently installed for the user,
+        // skip installing it.
+        if (!isOwner && wasPrebundledPackageInstalledLPr(UserHandle.USER_OWNER, packageName)
+                && !isInstalledForOwner && !isInstalledForUser) {
+            return false;
+        }
+
+        // If the given package was installed for the user and isn't currently, skip reinstalling it
+        if (wasPrebundledPackageInstalledLPr(userIdentifier, packageName) &&
+                !isInstalledForUser) {
+            return false;
+        }
+
+        return true;
+    }
+
     void writeDisabledSysPackageLPr(XmlSerializer serializer, final PackageSetting pkg)
             throws java.io.IOException {
         serializer.startTag(null, "updated-package");
@@ -3751,7 +3787,7 @@ final class Settings {
                 }
 
                 String tagName = parser.getName();
-                // Legacy 
+                // Legacy
                 if (tagName.equals(TAG_DISABLED_COMPONENTS)) {
                     readDisabledComponentsLPw(packageSetting, parser, 0);
                 } else if (tagName.equals(TAG_ENABLED_COMPONENTS)) {
@@ -4029,7 +4065,7 @@ final class Settings {
     private String compToString(ArraySet<String> cmp) {
         return cmp != null ? Arrays.toString(cmp.toArray()) : "[]";
     }
- 
+
     boolean isEnabledLPr(ComponentInfo componentInfo, int flags, int userId) {
         if ((flags&PackageManager.GET_DISABLED_COMPONENTS) != 0) {
             return true;
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
index 06c3682..583d764 100644
--- a/services/core/java/com/android/server/pm/UserManagerService.java
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
@@ -125,6 +125,11 @@ public class UserManagerService extends IUserManager.Stub {
     private static final String RESTRICTIONS_FILE_PREFIX = "res_";
     private static final String XML_SUFFIX = ".xml";
 
+    private static final int ALLOWED_FLAGS_FOR_CREATE_USERS_PERMISSION =
+            UserInfo.FLAG_MANAGED_PROFILE
+            | UserInfo.FLAG_RESTRICTED
+            | UserInfo.FLAG_GUEST;
+
     private static final int MIN_USER_ID = 10;
 
     private static final int USER_VERSION = 5;
@@ -262,11 +267,22 @@ public class UserManagerService extends IUserManager.Stub {
                 Log.w(LOG_TAG, "Unable to notify AppOpsService of UserRestrictions");
             }
         }
+        UserInfo currentGuestUser = null;
+        synchronized (mPackagesLock) {
+            currentGuestUser = findCurrentGuestUserLocked();
+        }
+        if (currentGuestUser != null && !hasUserRestriction(
+                UserManager.DISALLOW_CONFIG_WIFI, currentGuestUser.id)) {
+            // If a guest user currently exists, apply the DISALLOW_CONFIG_WIFI option
+            // to it, in case this guest was created in a previous version where this
+            // user restriction was not a default guest restriction.
+            setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, currentGuestUser.id);
+        }
     }
 
     @Override
     public List<UserInfo> getUsers(boolean excludeDying) {
-        checkManageUsersPermission("query users");
+        checkManageOrCreateUsersPermission("query users");
         synchronized (mPackagesLock) {
             ArrayList<UserInfo> users = new ArrayList<UserInfo>(mUsers.size());
             for (int i = 0; i < mUsers.size(); i++) {
@@ -285,7 +301,7 @@ public class UserManagerService extends IUserManager.Stub {
     @Override
     public List<UserInfo> getProfiles(int userId, boolean enabledOnly) {
         if (userId != UserHandle.getCallingUserId()) {
-            checkManageUsersPermission("getting profiles related to user " + userId);
+            checkManageOrCreateUsersPermission("getting profiles related to user " + userId);
         }
         final long ident = Binder.clearCallingIdentity();
         try {
@@ -377,7 +393,7 @@ public class UserManagerService extends IUserManager.Stub {
 
     @Override
     public UserInfo getUserInfo(int userId) {
-        checkManageUsersPermission("query user");
+        checkManageOrCreateUsersPermission("query user");
         synchronized (mPackagesLock) {
             return getUserInfoLocked(userId);
         }
@@ -509,6 +525,7 @@ public class UserManagerService extends IUserManager.Stub {
         if (mGuestRestrictions.isEmpty()) {
             mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true);
             mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true);
+            mGuestRestrictions.putBoolean(UserManager.DISALLOW_CONFIG_WIFI, true);
         }
     }
 
@@ -664,6 +681,71 @@ public class UserManagerService extends IUserManager.Stub {
         }
     }
 
+    /**
+     * Enforces that only the system UID or root's UID or apps that have the
+     * {@link android.Manifest.permission#MANAGE_USERS MANAGE_USERS} or
+     * {@link android.Manifest.permission#CREATE_USERS CREATE_USERS}
+     * can make certain calls to the UserManager.
+     *
+     * @param message used as message if SecurityException is thrown
+     * @throws SecurityException if the caller is not system or root
+     * @see #hasManageOrCreateUsersPermission()
+     */
+    private static final void checkManageOrCreateUsersPermission(String message) {
+        if (!hasManageOrCreateUsersPermission()) {
+            throw new SecurityException(
+                    "You either need MANAGE_USERS or CREATE_USERS permission to: " + message);
+        }
+    }
+
+    /**
+     * Similar to {@link #checkManageOrCreateUsersPermission(String)} but when the caller is tries
+     * to create user/profiles other than what is allowed for
+     * {@link android.Manifest.permission#CREATE_USERS CREATE_USERS} permission, then it will only
+     * allow callers with {@link android.Manifest.permission#MANAGE_USERS MANAGE_USERS} permission.
+     */
+    private static final void checkManageOrCreateUsersPermission(int creationFlags) {
+        if ((creationFlags & ~ALLOWED_FLAGS_FOR_CREATE_USERS_PERMISSION) == 0) {
+            if (!hasManageOrCreateUsersPermission()) {
+                throw new SecurityException("You either need MANAGE_USERS or CREATE_USERS "
+                        + "permission to create an user with flags: " + creationFlags);
+            }
+        } else if (!hasManageUsersPermission()) {
+            throw new SecurityException("You need MANAGE_USERS permission to create an user "
+                    + " with flags: " + creationFlags);
+        }
+    }
+
+    /**
+     * @return whether the calling UID is system UID or root's UID or the calling app has the
+     * {@link android.Manifest.permission#MANAGE_USERS MANAGE_USERS}.
+     */
+    private static final boolean hasManageUsersPermission() {
+        final int callingUid = Binder.getCallingUid();
+        return UserHandle.isSameApp(callingUid, Process.SYSTEM_UID)
+                || callingUid == Process.ROOT_UID
+                || ActivityManager.checkComponentPermission(
+                        android.Manifest.permission.MANAGE_USERS,
+                        callingUid, -1, true) == PackageManager.PERMISSION_GRANTED;
+    }
+
+    /**
+     * @return whether the calling UID is system UID or root's UID or the calling app has the
+     * {@link android.Manifest.permission#MANAGE_USERS MANAGE_USERS} or
+     * {@link android.Manifest.permission#CREATE_USERS CREATE_USERS}.
+     */
+    private static final boolean hasManageOrCreateUsersPermission() {
+        final int callingUid = Binder.getCallingUid();
+        return UserHandle.isSameApp(callingUid, Process.SYSTEM_UID)
+                || callingUid == Process.ROOT_UID
+                || ActivityManager.checkComponentPermission(
+                        android.Manifest.permission.MANAGE_USERS,
+                        callingUid, -1, true) == PackageManager.PERMISSION_GRANTED
+                || ActivityManager.checkComponentPermission(
+                        android.Manifest.permission.CREATE_USERS,
+                        callingUid, -1, true) == PackageManager.PERMISSION_GRANTED;
+    }
+
     private static void checkSystemOrRoot(String message) {
         final int uid = Binder.getCallingUid();
         if (uid != Process.SYSTEM_UID && uid != 0) {
@@ -1215,7 +1297,7 @@ public class UserManagerService extends IUserManager.Stub {
 
     @Override
     public UserInfo createProfileForUser(String name, int flags, int userId) {
-        checkManageUsersPermission("Only the system can create users");
+        checkManageOrCreateUsersPermission(flags);
         if (userId != UserHandle.USER_OWNER) {
             Slog.w(LOG_TAG, "Only user owner can have profiles");
             return null;
@@ -1225,7 +1307,7 @@ public class UserManagerService extends IUserManager.Stub {
 
     @Override
     public UserInfo createUser(String name, int flags) {
-        checkManageUsersPermission("Only the system can create users");
+        checkManageOrCreateUsersPermission(flags);
         return createUserInternal(name, flags, UserHandle.USER_NULL);
     }
 
@@ -1390,7 +1472,7 @@ public class UserManagerService extends IUserManager.Stub {
      * @param userHandle the user's id
      */
     public boolean removeUser(int userHandle) {
-        checkManageUsersPermission("Only the system can remove users");
+        checkManageOrCreateUsersPermission("Only the system can remove users");
         if (getUserRestrictions(UserHandle.getCallingUserId()).getBoolean(
                 UserManager.DISALLOW_REMOVE_USER, false)) {
             Log.w(LOG_TAG, "Cannot remove user. DISALLOW_REMOVE_USER is enabled.");
diff --git a/services/core/java/com/android/server/policy/GlobalActions.java b/services/core/java/com/android/server/policy/GlobalActions.java
index 9b5f5d0..96e1c70 100644
--- a/services/core/java/com/android/server/policy/GlobalActions.java
+++ b/services/core/java/com/android/server/policy/GlobalActions.java
@@ -49,7 +49,6 @@ import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.Manifest;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.os.Build;
@@ -72,6 +71,8 @@ import android.service.dreams.DreamService;
 import android.service.dreams.IDreamManager;
 import android.telephony.PhoneStateListener;
 import android.telephony.ServiceState;
+import android.telephony.SubscriptionInfo;
+import android.telephony.SubscriptionManager;
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.ArraySet;
@@ -98,8 +99,8 @@ import android.widget.TextView;
 import cyanogenmod.providers.CMSettings;
 
 import java.util.ArrayList;
+import java.util.BitSet;
 import java.util.List;
-import java.util.UUID;
 
 import org.cyanogenmod.internal.util.ThemeUtils;
 
@@ -141,6 +142,9 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
     // Power menu customizations
     String mActions;
 
+    private BitSet mAirplaneModeBits;
+    private final List<PhoneStateListener> mPhoneStateListeners = new ArrayList<>();
+
     /**
      * @param context everything needs a context :(
      */
@@ -164,9 +168,15 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
         mHasTelephony = cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE);
 
         // get notified of phone state changes
-        TelephonyManager telephonyManager =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        telephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_SERVICE_STATE);
+        SubscriptionManager.from(mContext).addOnSubscriptionsChangedListener(
+                new SubscriptionManager.OnSubscriptionsChangedListener() {
+            @Override
+            public void onSubscriptionsChanged() {
+                super.onSubscriptionsChanged();
+                setupAirplaneModeListeners();
+            }
+        });
+        setupAirplaneModeListeners();
         mContext.getContentResolver().registerContentObserver(
                 Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON), true,
                 mAirplaneModeObserver);
@@ -176,10 +186,59 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
         mShowSilentToggle = SHOW_SILENT_TOGGLE && !mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_useFixedVolume);
 
+        updatePowerMenuActions();
+    }
+
+    /**
+     * Since there are two ways of handling airplane mode (with telephony, we depend on the internal
+     * device telephony state), and MSIM devices do not report phone state for missing SIMs, we
+     * need to dynamically setup listeners based on subscription changes.
+     *
+     * So if there is _any_ active SIM in the device, we can depend on the phone state,
+     * otherwise fall back to {@link Settings.Global#AIRPLANE_MODE_ON}.
+     */
+    private void setupAirplaneModeListeners() {
+        TelephonyManager telephonyManager =
+                (TelephonyManager) mContext.getSystemService(Context.TELEPHONY_SERVICE);
+
+        for (PhoneStateListener listener : mPhoneStateListeners) {
+            telephonyManager.listen(listener, PhoneStateListener.LISTEN_NONE);
+        }
+        mPhoneStateListeners.clear();
+
+        final List<SubscriptionInfo> subInfoList = SubscriptionManager.from(mContext)
+                .getActiveSubscriptionInfoList();
+        if (subInfoList != null) {
+            mHasTelephony = true;
+            mAirplaneModeBits = new BitSet(subInfoList.size());
+            for (int i = 0; i < subInfoList.size(); i++) {
+                final int finalI = i;
+                PhoneStateListener subListener = new PhoneStateListener(subInfoList.get(finalI)
+                        .getSubscriptionId()) {
+                    @Override
+                    public void onServiceStateChanged(ServiceState serviceState) {
+                        final boolean inAirplaneMode = serviceState.getState()
+                                == ServiceState.STATE_POWER_OFF;
+                        mAirplaneModeBits.set(finalI, inAirplaneMode);
+
+                        // we're in airplane mode if _any_ of the subscriptions say we are
+                        mAirplaneState = mAirplaneModeBits.cardinality() > 0
+                                ? ToggleAction.State.On : ToggleAction.State.Off;
+
+                        mAirplaneModeOn.updateState(mAirplaneState);
+                        if (mAdapter != null) {
+                            mAdapter.notifyDataSetChanged();
+                        }
+                    }
+                };
+                mPhoneStateListeners.add(subListener);
+                telephonyManager.listen(subListener, PhoneStateListener.LISTEN_SERVICE_STATE);
+            }
+        } else {
+            mHasTelephony = false;
+        }
         // Set the initial status of airplane mode toggle
         mAirplaneState = getUpdatedAirplaneToggleState();
-
-        updatePowerMenuActions();
     }
 
     /**
@@ -189,14 +248,12 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
     public void showDialog(boolean keyguardShowing, boolean isDeviceProvisioned) {
         mKeyguardShowing = keyguardShowing;
         mDeviceProvisioned = isDeviceProvisioned;
-        if (mDialog != null && mUiContext == null) {
+        if (mDialog != null) {
             mDialog.dismiss();
             mDialog = null;
-            mDialog = createDialog();
             // Show delayed, so that the dismiss of the previous dialog completes
             mHandler.sendEmptyMessage(MESSAGE_SHOW);
         } else {
-            mDialog = createDialog();
             handleShow();
         }
     }
@@ -215,6 +272,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
 
     private void handleShow() {
         awakenIfNecessary();
+        mDialog = createDialog();
         prepareDialog();
 
         // If we only have 1 item and it's a simple press action, just do this action.
@@ -234,7 +292,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
     private Context getUiContext() {
         if (mUiContext == null) {
             mUiContext = ThemeUtils.createUiContext(mContext);
-            mUiContext.setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+            mUiContext.setTheme(com.android.internal.R.style.Theme_Power_Dialog);
         }
         return mUiContext != null ? mUiContext : mContext;
     }
@@ -358,7 +416,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
         params.mOnClickListener = this;
         params.mForceInverseBackground = true;
 
-        GlobalActionsDialog dialog = new GlobalActionsDialog(getUiContext(), params);
+        GlobalActionsDialog dialog = new GlobalActionsDialog(/** system context **/ mContext,
+                /** themed context **/ getUiContext(), params);
         dialog.setCanceledOnTouchOutside(false); // Handled by the custom class.
 
         dialog.getListView().setItemsCanFocus(true);
@@ -1153,6 +1212,12 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
     private final class SilentModeTriStateAction implements Action, View.OnClickListener {
 
         private final int[] ITEM_IDS = { R.id.option1, R.id.option2, R.id.option3, R.id.option4 };
+        private final int[] ITEM_INDEX_TO_ZEN_MODE = {
+                Global.ZEN_MODE_NO_INTERRUPTIONS,
+                Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS,
+                Global.ZEN_MODE_OFF,
+                Global.ZEN_MODE_OFF
+        };
 
         private final AudioManager mAudioManager;
         private final Handler mHandler;
@@ -1236,21 +1301,15 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
             if (!(v.getTag() instanceof Integer)) return;
 
             int index = (Integer) v.getTag();
-            if (index == 0 || index == 1) {
-                int zenMode = index == 0
-                        ? Global.ZEN_MODE_NO_INTERRUPTIONS
-                        : Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
-                // ZenModeHelper will revert zen mode back to the previous value if we just
-                // put the value into the Settings db, so use INotificationManager instead
-                INotificationManager noMan = INotificationManager.Stub.asInterface(
-                        ServiceManager.getService(Context.NOTIFICATION_SERVICE));
-                try {
-                    noMan.setZenMode(zenMode, null, TAG);
-                } catch (RemoteException e) {
-                    Log.e(TAG, "Unable to set zen mode", e);
-                }
-            } else {
-                Global.putInt(mContext.getContentResolver(), Global.ZEN_MODE, Global.ZEN_MODE_OFF);
+            int zenMode = ITEM_INDEX_TO_ZEN_MODE[index];
+            // ZenModeHelper will revert zen mode back to the previous value if we just
+            // put the value into the Settings db, so use INotificationManager instead
+            INotificationManager noMan = INotificationManager.Stub.asInterface(
+                    ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+            try {
+                noMan.setZenMode(zenMode, null, TAG);
+            } catch (RemoteException e) {
+                Log.e(TAG, "Unable to set zen mode", e);
             }
 
             if (index == 2 || index == 3) {
@@ -1297,17 +1356,6 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
         }
     };
 
-    PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
-        @Override
-        public void onServiceStateChanged(ServiceState serviceState) {
-            if (!mHasTelephony) return;
-            final boolean inAirplaneMode = serviceState.getState() == ServiceState.STATE_POWER_OFF;
-            mAirplaneState = inAirplaneMode ? ToggleAction.State.On : ToggleAction.State.Off;
-            mAirplaneModeOn.updateState(mAirplaneState);
-            mAdapter.notifyDataSetChanged();
-        }
-    };
-
     private BroadcastReceiver mRingerModeReceiver = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
@@ -1409,6 +1457,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
 
     private static final class GlobalActionsDialog extends Dialog implements DialogInterface {
         private final Context mContext;
+        private Context mSystemContext = null;
         private final int mWindowTouchSlop;
         private final AlertController mAlert;
         private final MyAdapter mAdapter;
@@ -1418,7 +1467,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
         private boolean mIntercepted;
         private boolean mCancelOnUp;
 
-        public GlobalActionsDialog(Context context, AlertParams params) {
+        private GlobalActionsDialog(Context context, AlertParams params) {
             super(context, getDialogTheme(context));
             mContext = getContext();
             mAlert = new AlertController(mContext, this, getWindow());
@@ -1427,6 +1476,19 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
             params.apply(mAlert);
         }
 
+        /**
+         * Utilized for a working global actions dialog for both accessibility services (which
+         * require a system context) and
+         * @param systemContext Base context (should be from system process)
+         * @param themedContext Themed context (created from system ui)
+         * @param params
+         */
+        public GlobalActionsDialog(Context systemContext, Context themedContext,
+                AlertParams params) {
+            this(themedContext, params);
+            mSystemContext = systemContext;
+        }
+
         private static int getDialogTheme(Context context) {
             TypedValue outValue = new TypedValue();
             context.getTheme().resolveAttribute(com.android.internal.R.attr.alertDialogTheme,
@@ -1440,8 +1502,8 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac
             // of dismissing the dialog on touch outside. This is because the dialog
             // is dismissed on the first down while the global gesture is a long press
             // with two fingers anywhere on the screen.
-            if (EnableAccessibilityController.canEnableAccessibilityViaGesture(mContext)) {
-                mEnableAccessibilityController = new EnableAccessibilityController(mContext,
+            if (EnableAccessibilityController.canEnableAccessibilityViaGesture(mSystemContext)) {
+                mEnableAccessibilityController = new EnableAccessibilityController(mSystemContext,
                         new Runnable() {
                     @Override
                     public void run() {
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java
index 9cb969c..6339007 100644
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -22,7 +22,6 @@ import android.app.ActivityManagerInternal.SleepToken;
 import android.app.ActivityManagerNative;
 import android.app.AppOpsManager;
 import android.app.IUiModeManager;
-import android.app.ProgressDialog;
 import android.app.SearchManager;
 import android.app.StatusBarManager;
 import android.app.UiModeManager;
@@ -36,6 +35,7 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.ServiceConnection;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.CompatibilityInfo;
@@ -137,6 +137,8 @@ import com.android.server.LocalServices;
 import com.android.server.policy.keyguard.KeyguardServiceDelegate;
 import com.android.server.policy.keyguard.KeyguardServiceDelegate.DrawnListener;
 
+import org.cyanogenmod.internal.BootDexoptDialog;
+
 import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
@@ -152,6 +154,7 @@ import static android.view.WindowManagerPolicy.WindowManagerFuncs.LID_CLOSED;
 import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVER_ABSENT;
 import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_UNCOVERED;
 import static android.view.WindowManagerPolicy.WindowManagerFuncs.CAMERA_LENS_COVERED;
+import static org.cyanogenmod.platform.internal.Manifest.permission.THIRD_PARTY_KEYGUARD;
 
 /**
  * WindowManagerPolicy implementation for the Android phone UI.  This
@@ -273,6 +276,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     // app shows again. If that doesn't happen for 30s we drop the gesture.
     private static final long PANIC_GESTURE_EXPIRATION = 30000;
 
+    private static final String DEPRECATED_THIRD_PARTY_KEYGUARD_PERMISSION =
+            "android.permission.THIRD_PARTY_KEYGUARD";
+
     /**
      * Keyguard stuff
      */
@@ -489,7 +495,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     // During wakeup by volume keys, we still need to capture subsequent events
     // until the key is released. This is required since the beep sound is produced
     // post keypressed.
-    boolean mVolumeWakeTriggered;
+    boolean mVolumeDownWakeTriggered;
+    boolean mVolumeUpWakeTriggered;
+    boolean mVolumeMuteWakeTriggered;
 
     int mPointerLocationMode = 0; // guarded by mLock
 
@@ -749,6 +757,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     private boolean mClearedBecauseOfForceShow;
     private boolean mTopWindowIsKeyguard;
     private CMHardwareManager mCMHardware;
+    private boolean mShowKeyguardOnLeftSwipe;
 
     private class PolicyHandler extends Handler {
         @Override
@@ -892,8 +901,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             resolver.registerContentObserver(Settings.System.getUriFor(
                     Settings.System.ACCELEROMETER_ROTATION_ANGLES), false, this,
                     UserHandle.USER_ALL);
-            resolver.registerContentObserver(CMSettings.Secure.getUriFor(
-                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR), false, this,
+            resolver.registerContentObserver(CMSettings.Global.getUriFor(
+                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR), false, this,
                     UserHandle.USER_ALL);
             resolver.registerContentObserver(CMSettings.System.getUriFor(
                     CMSettings.System.VOLBTN_MUSIC_CONTROLS), false, this,
@@ -1434,8 +1443,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     }
 
     boolean isUserSetupComplete() {
-        return Settings.Secure.getIntForUser(mContext.getContentResolver(),
-                Settings.Secure.USER_SETUP_COMPLETE, 0, UserHandle.USER_CURRENT) != 0;
+        return CMSettings.Secure.getIntForUser(mContext.getContentResolver(),
+                CMSettings.Secure.CM_SETUP_WIZARD_COMPLETED, 0, UserHandle.USER_CURRENT) != 0;
     }
 
     private void handleShortPressOnHome() {
@@ -1758,6 +1767,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                                 mNavigationBarLeftInLandscape) {
                             requestTransientBars(mNavigationBar);
                         }
+                        if (mShowKeyguardOnLeftSwipe && isKeyguardShowingOrOccluded()
+                                && mKeyguardDelegate.isKeyguardPanelFocused()) {
+                            // Show keyguard
+                            mKeyguardDelegate.showKeyguard();
+                        }
                     }
                     @Override
                     public void onFling(int duration) {
@@ -2122,8 +2136,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 updateWakeGestureListenerLp();
             }
 
-            boolean devForceNavbar = CMSettings.Secure.getIntForUser(resolver,
-                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;
+            boolean devForceNavbar = CMSettings.Global.getIntForUser(resolver,
+                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;
             if (devForceNavbar != mDevForceNavbar) {
                 mDevForceNavbar = devForceNavbar;
                 if (mCMHardware.isSupported(CMHardwareManager.FEATURE_KEY_DISABLE)) {
@@ -2299,8 +2313,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 outAppOp[0] = AppOpsManager.OP_SYSTEM_ALERT_WINDOW;
                 break;
             case TYPE_KEYGUARD_PANEL:
-                permission =
-                        org.cyanogenmod.platform.internal.Manifest.permission.THIRD_PARTY_KEYGUARD;
+                permission = THIRD_PARTY_KEYGUARD;
                 break;
             default:
                 permission = android.Manifest.permission.INTERNAL_SYSTEM_WINDOW;
@@ -2335,6 +2348,14 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                             return WindowManagerGlobal.ADD_OKAY;
                         }
                 }
+            } else if (permission == THIRD_PARTY_KEYGUARD) {
+                // check if caller has the old permission and if so allow adding window
+                if (mContext.checkCallingOrSelfPermission(
+                        DEPRECATED_THIRD_PARTY_KEYGUARD_PERMISSION)
+                        == PackageManager.PERMISSION_GRANTED) {
+                    return WindowManagerGlobal.ADD_OKAY;
+                }
+                // fall through to the normal check below
             }
 
             if (mContext.checkCallingOrSelfPermission(permission)
@@ -2426,6 +2447,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             attrs.subtreeSystemUiVisibility |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
                     | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;
         }
+
+        if ((attrs.privateFlags & (WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS |
+                            WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY)) != 0) {
+            mContext.enforceCallingOrSelfPermission(android.Manifest.permission.PREVENT_SYSTEM_KEYS,
+                    "No permission to prevent system key");
+        }
     }
 
     void readLidState() {
@@ -2669,6 +2696,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         return mWinShowWhenLocked;
     }
 
+    @Override
+    public WindowState getWinKeyguardPanelLw() {
+        return mKeyguardPanel;
+    }
+
     /** {@inheritDoc} */
     @Override
     public View addStartingWindow(IBinder appToken, String packageName, int theme,
@@ -2864,9 +2896,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                         "PhoneWindowManager");
                 break;
             case TYPE_KEYGUARD_PANEL:
-                mContext.enforceCallingOrSelfPermission(
-                        org.cyanogenmod.platform.internal.Manifest.permission.THIRD_PARTY_KEYGUARD,
-                        "PhoneWindowManager");
+                // check deprecated perm first and if not granted enforce the new permission name
+                if (mContext.checkCallingOrSelfPermission(
+                        DEPRECATED_THIRD_PARTY_KEYGUARD_PERMISSION)
+                        != PackageManager.PERMISSION_GRANTED) {
+                    mContext.enforceCallingOrSelfPermission(THIRD_PARTY_KEYGUARD,
+                            "PhoneWindowManager");
+                }
                 if (mKeyguardPanel != null) {
                     return WindowManagerGlobal.ADD_MULTIPLE_SINGLETON;
                 }
@@ -3130,6 +3166,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         // timeout.
         if (keyCode == KeyEvent.KEYCODE_HOME) {
 
+            if (mTopFullscreenOpaqueWindowState != null &&
+                    (mTopFullscreenOpaqueWindowState.getAttrs().privateFlags
+                            & WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS) != 0
+                    && mScreenOnFully) {
+                return 0;
+            }
             // If we have released the home key, and didn't do anything else
             // while it was pressed, then it is time to go home!
             if (!down) {
@@ -3230,6 +3272,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 return 0;
             }
 
+            if (mTopFullscreenOpaqueWindowState != null &&
+                    (mTopFullscreenOpaqueWindowState.getAttrs().privateFlags
+                            & WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS) != 0
+                    && mScreenOnFully) {
+                return 0;
+            }
+
             if (down) {
                 if (mPressOnMenuBehavior == KEY_ACTION_APP_SWITCH
                         || mLongPressOnMenuBehavior == KEY_ACTION_APP_SWITCH) {
@@ -3295,6 +3344,13 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             }
             return 0;
         } else if (keyCode == KeyEvent.KEYCODE_APP_SWITCH) {
+            if (mTopFullscreenOpaqueWindowState != null &&
+                    (mTopFullscreenOpaqueWindowState.getAttrs().privateFlags
+                            & WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS) != 0
+                    && mScreenOnFully) {
+                return 0;
+            }
+
             if (!keyguardOn) {
                 if (down) {
                     if (mPressOnAppSwitchBehavior == KEY_ACTION_APP_SWITCH
@@ -5007,7 +5063,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             if ((attrs.privateFlags & PRIVATE_FLAG_FORCE_STATUS_BAR_VISIBLE_TRANSPARENT) != 0) {
                 mForceStatusBarTransparent = true;
             }
-        }
+        } else if (attrs.type == TYPE_KEYGUARD_PANEL) {
+            if (mKeyguardDelegate.isKeyguardPanelFocused()) {
+                attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+                attrs.flags |= WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
+            } else {
+                attrs.flags |= WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE;
+                attrs.flags &= ~WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM;
+            }
+       }
 
         boolean appWindow = attrs.type >= FIRST_APPLICATION_WINDOW
                 && attrs.type < FIRST_SYSTEM_WINDOW;
@@ -5510,6 +5574,36 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         }
     }
 
+    private void setVolumeWakeTriggered(final int keyCode, boolean triggered) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+                mVolumeDownWakeTriggered = triggered;
+                break;
+            case KeyEvent.KEYCODE_VOLUME_UP:
+                mVolumeUpWakeTriggered = triggered;
+                break;
+            case KeyEvent.KEYCODE_VOLUME_MUTE:
+                mVolumeMuteWakeTriggered = triggered;
+                break;
+            default:
+                Log.w(TAG, "setVolumeWakeTriggered: unexpected keyCode=" + keyCode);
+        }
+    }
+
+    private boolean getVolumeWakeTriggered(final int keyCode) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_VOLUME_DOWN:
+                return mVolumeDownWakeTriggered;
+            case KeyEvent.KEYCODE_VOLUME_UP:
+                return mVolumeUpWakeTriggered;
+            case KeyEvent.KEYCODE_VOLUME_MUTE:
+                return mVolumeMuteWakeTriggered;
+            default:
+                Log.w(TAG, "getVolumeWakeTriggered: unexpected keyCode=" + keyCode);
+                return false;
+        }
+    }
+
     /** {@inheritDoc} */
     @Override
     public int interceptKeyBeforeQueueing(KeyEvent event, int policyFlags) {
@@ -5605,11 +5699,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                 // Eat all down & up keys when using volume wake.
                 // This disables volume control, music control, and "beep" on key up.
                 if (isWakeKey && mVolumeWakeScreen) {
-                    mVolumeWakeTriggered = true;
+                    setVolumeWakeTriggered(keyCode, true);
                     break;
-                } else if (mVolumeWakeTriggered && !down) {
+                } else if (getVolumeWakeTriggered(keyCode) && !down) {
                     result &= ~ACTION_PASS_TO_USER;
-                    mVolumeWakeTriggered = false;
+                    setVolumeWakeTriggered(keyCode, false);
                     break;
                 }
 
@@ -5807,7 +5901,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             case KeyEvent.KEYCODE_POWER: {
                 if (mTopFullscreenOpaqueWindowState != null &&
                         (mTopFullscreenOpaqueWindowState.getAttrs().privateFlags
-                        & WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY) != 0
+                        & (WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_SYSTEM_KEYS |
+                            WindowManager.LayoutParams.PRIVATE_FLAG_PREVENT_POWER_KEY)) != 0
                         && mScreenOnFully) {
                     return result;
                 }
@@ -5919,7 +6014,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         }
 
         if (isWakeKey) {
-            wakeUp(event.getEventTime(), mAllowTheaterModeWakeFromKey, "android.policy:KEY", true);
+            wakeUp(event.getEventTime(), mAllowTheaterModeWakeFromKey, "android.policy:KEY",
+                    event.getKeyCode() == KeyEvent.KEYCODE_WAKEUP /* check prox only on wake key*/);
         }
 
         return result;
@@ -6357,7 +6453,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
     }
 
     private void wakeUpFromPowerKey(long eventTime) {
-        wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey, "android.policy:POWER", true);
+        wakeUp(eventTime, mAllowTheaterModeWakeFromPowerKey, "android.policy:POWER");
     }
 
     private boolean wakeUp(long wakeTime, boolean wakeInTheaterMode, String reason) {
@@ -6954,68 +7050,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
         screenTurnedOn();
     }
 
-    ProgressDialog mBootMsgDialog = null;
+    BootDexoptDialog mBootMsgDialog = null;
 
     /** {@inheritDoc} */
     @Override
-    public void showBootMessage(final CharSequence msg, final boolean always) {
+    public void updateBootProgress(final int stage, final ApplicationInfo optimizedApp,
+            final int currentAppPos, final int totalAppCount) {
         mHandler.post(new Runnable() {
             @Override public void run() {
                 if (mBootMsgDialog == null) {
-                    int theme;
-                    if (mContext.getPackageManager().hasSystemFeature(
-                            PackageManager.FEATURE_WATCH)) {
-                        theme = com.android.internal.R.style.Theme_Micro_Dialog_Alert;
-                    } else if (mContext.getPackageManager().hasSystemFeature(
-                            PackageManager.FEATURE_TELEVISION)) {
-                        theme = com.android.internal.R.style.Theme_Leanback_Dialog_Alert;
-                    } else {
-                        theme = 0;
-                    }
-
-                    mBootMsgDialog = new ProgressDialog(mContext, theme) {
-                        // This dialog will consume all events coming in to
-                        // it, to avoid it trying to do things too early in boot.
-                        @Override public boolean dispatchKeyEvent(KeyEvent event) {
-                            return true;
-                        }
-                        @Override public boolean dispatchKeyShortcutEvent(KeyEvent event) {
-                            return true;
-                        }
-                        @Override public boolean dispatchTouchEvent(MotionEvent ev) {
-                            return true;
-                        }
-                        @Override public boolean dispatchTrackballEvent(MotionEvent ev) {
-                            return true;
-                        }
-                        @Override public boolean dispatchGenericMotionEvent(MotionEvent ev) {
-                            return true;
-                        }
-                        @Override public boolean dispatchPopulateAccessibilityEvent(
-                                AccessibilityEvent event) {
-                            return true;
-                        }
-                    };
-                    if (mContext.getPackageManager().isUpgrade()) {
-                        mBootMsgDialog.setTitle(R.string.android_upgrading_title);
-                    } else {
-                        mBootMsgDialog.setTitle(R.string.android_start_title);
-                    }
-                    mBootMsgDialog.setProgressStyle(ProgressDialog.STYLE_SPINNER);
-                    mBootMsgDialog.setIndeterminate(true);
-                    mBootMsgDialog.getWindow().setType(
-                            WindowManager.LayoutParams.TYPE_BOOT_PROGRESS);
-                    mBootMsgDialog.getWindow().addFlags(
-                            WindowManager.LayoutParams.FLAG_DIM_BEHIND
-                            | WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
-                    mBootMsgDialog.getWindow().setDimAmount(1);
-                    WindowManager.LayoutParams lp = mBootMsgDialog.getWindow().getAttributes();
-                    lp.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_NOSENSOR;
-                    mBootMsgDialog.getWindow().setAttributes(lp);
-                    mBootMsgDialog.setCancelable(false);
-                    mBootMsgDialog.show();
-                }
-                mBootMsgDialog.setMessage(msg);
+                    mBootMsgDialog = BootDexoptDialog.create(mContext);
+                }
+                mBootMsgDialog.setProgress(stage, optimizedApp, currentAppPos, totalAppCount);
             }
         });
     }
@@ -7932,4 +7978,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
             mKeyguardDelegate.dump(prefix, pw);
         }
     }
+
+    @Override
+    public void setLiveLockscreenEdgeDetector(boolean enable) {
+        mShowKeyguardOnLeftSwipe = enable;
+    }
 }
diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
index cb09dd4..a223d05 100644
--- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
+++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceDelegate.java
@@ -431,4 +431,15 @@ public class KeyguardServiceDelegate {
             mKeyguardService.dump(prefix, pw);
         }
     }
+
+    public void showKeyguard() {
+        mKeyguardService.showKeyguard();
+    }
+
+    public boolean isKeyguardPanelFocused() {
+        if (mKeyguardService != null) {
+           return mKeyguardService.isKeyguardPanelFocused();
+        }
+        return false;
+    }
 }
diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java
index 429b188..31c7a04 100644
--- a/services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java
+++ b/services/core/java/com/android/server/policy/keyguard/KeyguardServiceWrapper.java
@@ -245,4 +245,16 @@ public class KeyguardServiceWrapper implements IKeyguardService {
     public void dump(String prefix, PrintWriter pw) {
         mKeyguardStateMonitor.dump(prefix, pw);
     }
+
+    public void showKeyguard() {
+        try {
+            mService.showKeyguard();
+        } catch (RemoteException e) {
+            Slog.w(TAG, "Remote Exception", e);
+        }
+    }
+
+    public boolean isKeyguardPanelFocused() {
+        return mKeyguardStateMonitor.isKeyguardPanelFocused();
+    }
 }
\ No newline at end of file
diff --git a/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java b/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java
index 30cff03..09f9087 100644
--- a/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java
+++ b/services/core/java/com/android/server/policy/keyguard/KeyguardStateMonitor.java
@@ -43,6 +43,7 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub {
     private volatile boolean mIsShowing = true;
     private volatile boolean mSimSecure = true;
     private volatile boolean mInputRestricted = true;
+    private volatile boolean mKeyguardPanelFocused = false;
 
     private int mCurrentUserId;
 
@@ -70,6 +71,10 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub {
         return mInputRestricted;
     }
 
+    public boolean isKeyguardPanelFocused() {
+        return mKeyguardPanelFocused;
+    }
+
     @Override // Binder interface
     public void onShowingStateChanged(boolean showing) {
         mIsShowing = showing;
@@ -80,6 +85,11 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub {
         mSimSecure = simSecure;
     }
 
+    @Override // Binder interface
+    public void onKeyguardPanelFocusChanged(boolean focused) {
+        mKeyguardPanelFocused = focused;
+    }
+
     public synchronized void setCurrentUser(int userId) {
         mCurrentUserId = userId;
     }
@@ -100,5 +110,6 @@ public class KeyguardStateMonitor extends IKeyguardStateCallback.Stub {
         pw.println(prefix + "mSimSecure=" + mSimSecure);
         pw.println(prefix + "mInputRestricted=" + mInputRestricted);
         pw.println(prefix + "mCurrentUserId=" + mCurrentUserId);
+        pw.println(prefix + "mKeyguardPanelFocused=" + mKeyguardPanelFocused);
     }
 }
\ No newline at end of file
diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java
index 1fd1fbd..a197c6e 100644
--- a/services/core/java/com/android/server/power/PowerManagerService.java
+++ b/services/core/java/com/android/server/power/PowerManagerService.java
@@ -17,14 +17,18 @@
 package com.android.server.power;
 
 import android.app.ActivityManager;
+import android.os.IDeviceIdleController;
+import android.os.ServiceManager;
 import android.util.SparseIntArray;
 
 import com.android.internal.app.IAppOpsService;
 import com.android.internal.app.IBatteryStats;
 import com.android.internal.os.BackgroundThread;
+import com.android.internal.util.ArrayUtils;
 import com.android.server.EventLogTags;
 import com.android.server.LocalServices;
 import com.android.server.ServiceThread;
+import com.android.server.SystemConfig;
 import com.android.server.SystemService;
 import com.android.server.am.BatteryStatsService;
 import com.android.server.lights.Light;
@@ -108,6 +112,8 @@ public final class PowerManagerService extends SystemService
     private static final int MSG_SANDMAN = 2;
     // Message: Sent when the screen brightness boost expires.
     private static final int MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT = 3;
+    // Message: Sent when the sandman fails to acknowledge the dream state change.
+    private static final int MSG_SANDMAN_TIMEOUT = 4;
 
     private static final int MSG_WAKE_UP = 5;
 
@@ -135,6 +141,8 @@ public final class PowerManagerService extends SystemService
     private static final int DIRTY_DOCK_STATE = 1 << 10;
     // Dirty bit: brightness boost changed
     private static final int DIRTY_SCREEN_BRIGHTNESS_BOOST = 1 << 11;
+    // Dirty bit: sandman state changed
+    private static final int DIRTY_SANDMAN_STATE = 1 << 12;
 
     // Summarizes the state of all active wakelocks.
     private static final int WAKE_LOCK_CPU = 1 << 0;
@@ -179,6 +187,9 @@ public final class PowerManagerService extends SystemService
     // Max time (microseconds) to allow a CPU boost for
     private static final int MAX_CPU_BOOST_TIME = 5000000;
 
+    // Max time (milliseconds) to wait for the sandman to acknowledge dream state changes
+    private static final int SANDMAN_RESPONSE_TIMEOUT = 2 * 1000;
+
     private final Context mContext;
     private final ServiceThread mHandlerThread;
     private final PowerManagerHandler mHandler;
@@ -278,6 +289,13 @@ public final class PowerManagerService extends SystemService
     // True if the display suspend blocker has been acquired.
     private boolean mHoldingDisplaySuspendBlocker;
 
+    // The suspend blocker used to keep the CPU alive when dreams are requesting to be
+    // started.
+    private final SuspendBlocker mDreamSuspendBlocker;
+
+    // True if the dream suspend blocker has been acquired.
+    private boolean mHoldingDreamSuspendBlocker;
+
     // True if systemReady() has been called.
     private boolean mSystemReady;
 
@@ -539,6 +557,7 @@ public final class PowerManagerService extends SystemService
         synchronized (mLock) {
             mWakeLockSuspendBlocker = createSuspendBlockerLocked("PowerManagerService.WakeLocks");
             mDisplaySuspendBlocker = createSuspendBlockerLocked("PowerManagerService.Display");
+            mDreamSuspendBlocker = createSuspendBlockerLocked("PowerManagerService.Dreams");
             mDisplaySuspendBlocker.acquire();
             mHoldingDisplaySuspendBlocker = true;
             mHalAutoSuspendModeEnabled = false;
@@ -699,8 +718,8 @@ public final class PowerManagerService extends SystemService
             resolver.registerContentObserver(CMSettings.Global.getUriFor(
                     CMSettings.Global.WAKE_WHEN_PLUGGED_OR_UNPLUGGED),
                     false, mSettingsObserver, UserHandle.USER_ALL);
-            resolver.registerContentObserver(CMSettings.Secure.getUriFor(
-                    CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR),
+            resolver.registerContentObserver(CMSettings.Global.getUriFor(
+                    CMSettings.Global.DEV_FORCE_SHOW_NAVBAR),
                     false, mSettingsObserver, UserHandle.USER_ALL);
 
             // Go.
@@ -846,8 +865,8 @@ public final class PowerManagerService extends SystemService
         mKeyboardBrightness = CMSettings.Secure.getIntForUser(resolver,
                 CMSettings.Secure.KEYBOARD_BRIGHTNESS, mKeyboardBrightnessSettingDefault,
                 UserHandle.USER_CURRENT);
-        mForceNavbar = CMSettings.Secure.getIntForUser(resolver,
-                CMSettings.Secure.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;
+        mForceNavbar = CMSettings.Global.getIntForUser(resolver,
+                CMSettings.Global.DEV_FORCE_SHOW_NAVBAR, 0, UserHandle.USER_CURRENT) == 1;
         mDirty |= DIRTY_SETTINGS;
     }
 
@@ -1923,15 +1942,16 @@ public final class PowerManagerService extends SystemService
                 | DIRTY_PROXIMITY_POSITIVE
                 | DIRTY_BATTERY_STATE)) != 0 || displayBecameReady) {
             if (mDisplayReady) {
-                scheduleSandmanLocked();
+                scheduleSandmanLocked(false);
             }
         }
     }
 
-    private void scheduleSandmanLocked() {
+    private void scheduleSandmanLocked(boolean fromDreamService) {
         if (!mSandmanScheduled) {
             mSandmanScheduled = true;
             Message msg = mHandler.obtainMessage(MSG_SANDMAN);
+            msg.arg1 = fromDreamService ? 1 : 0;
             msg.setAsynchronous(true);
             mHandler.sendMessage(msg);
         }
@@ -1944,7 +1964,7 @@ public final class PowerManagerService extends SystemService
      * the dream and we don't want to hold our lock while doing so.  There is a risk that
      * the device will wake or go to sleep in the meantime so we have to handle that case.
      */
-    private void handleSandman() { // runs on handler thread
+    private void handleSandman(boolean fromDreamService) { // runs on handler thread
         // Handle preconditions.
         final boolean startDreaming;
         final int wakefulness;
@@ -1957,6 +1977,30 @@ public final class PowerManagerService extends SystemService
             } else {
                 startDreaming = false;
             }
+            // We hold the display suspend blocker as long as mSandmanSummoned is true
+            // That guarantees this code to be run before the system enters suspend.  However,
+            // once we exit this lock, we are no longer guaranteed to stay awake.  Hold a wake
+            // lock that is released once the dream service has acknowledged the request
+            // to start.
+            if (mDreamManager != null) {
+                if (startDreaming) {
+                    if (!mHoldingDreamSuspendBlocker) {
+                        mDreamSuspendBlocker.acquire();
+                        mHoldingDreamSuspendBlocker = true;
+                        Message msg = mHandler.obtainMessage(MSG_SANDMAN_TIMEOUT);
+                        msg.setAsynchronous(true);
+                        mHandler.sendMessageDelayed(msg, SANDMAN_RESPONSE_TIMEOUT);
+                        mDirty |= DIRTY_SANDMAN_STATE;
+                        updatePowerStateLocked();
+                    }
+                } else if (fromDreamService) {
+                    mHandler.removeMessages(MSG_SANDMAN_TIMEOUT);
+                    if (mHoldingDreamSuspendBlocker) {
+                        mDreamSuspendBlocker.release();
+                        mHoldingDreamSuspendBlocker = false;
+                    }
+                }
+            }
         }
 
         // Start dreaming if needed.
@@ -2386,6 +2430,11 @@ public final class PowerManagerService extends SystemService
         if (mScreenBrightnessBoostInProgress) {
             return true;
         }
+
+        if (mSandmanSummoned) {
+            return true;
+        }
+
         // Let the system suspend if the screen is off or dozing.
         return false;
     }
@@ -2981,7 +3030,7 @@ public final class PowerManagerService extends SystemService
         @Override
         public void onReceive(Context context, Intent intent) {
             synchronized (mLock) {
-                scheduleSandmanLocked();
+                scheduleSandmanLocked(true);
             }
         }
     }
@@ -3038,7 +3087,8 @@ public final class PowerManagerService extends SystemService
                     handleUserActivityTimeout();
                     break;
                 case MSG_SANDMAN:
-                    handleSandman();
+                    boolean fromDreamService = msg.arg1 == 1;
+                    handleSandman(fromDreamService);
                     break;
                 case MSG_SCREEN_BRIGHTNESS_BOOST_TIMEOUT:
                     handleScreenBrightnessBoostTimeout();
@@ -3047,6 +3097,10 @@ public final class PowerManagerService extends SystemService
                     cleanupProximity();
                     ((Runnable) msg.obj).run();
                     break;
+                case MSG_SANDMAN_TIMEOUT:
+                    Slog.w(TAG, "Sandman unresponsive, releasing suspend blocker");
+                    handleSandman(true);
+                    break;
             }
         }
     }
@@ -3287,6 +3341,29 @@ public final class PowerManagerService extends SystemService
 
             final int uid = Binder.getCallingUid();
             final int pid = Binder.getCallingPid();
+
+            try {
+                if (mAppOps != null &&
+                        mAppOps.checkOperation(AppOpsManager.OP_WAKE_LOCK, uid, packageName)
+                                != AppOpsManager.MODE_ALLOWED) {
+
+                    // If this app is whitelisted as "allow-in-power-save" then always allow!
+                    // Current impl only looks at system-loaded ones, if we want to also include
+                    // user apps which have been manually set, we would use IDeviceIdleController
+                    if (!SystemConfig.getInstance().getAllowInPowerSave().contains(packageName)) {
+                        Slog.d(TAG, "acquireWakeLock: ignoring request from " + packageName);
+                        // For (ignore) accounting purposes
+                        mAppOps.noteOperation(AppOpsManager.OP_WAKE_LOCK, uid, packageName);
+                        // silent return
+                        return;
+                    } else {
+                        Slog.d(TAG, "wake lock requested to be ignored but " + packageName
+                                + " is marked to opt-out of all power save restrictions.");
+                    }
+                }
+            } catch (RemoteException ignored) {
+            }
+
             final long ident = Binder.clearCallingIdentity();
             try {
                 acquireWakeLockInternal(lock, flags, tag, packageName, ws, historyTag, uid, pid);
@@ -3841,10 +3918,10 @@ public final class PowerManagerService extends SystemService
                 else {
                     mBlockedUids.clear();
                 }
-            }
-            if(changed){
-                mDirty |= DIRTY_WAKE_LOCKS;
-                updatePowerStateLocked();
+                if(changed){
+                    mDirty |= DIRTY_WAKE_LOCKS;
+                    updatePowerStateLocked();
+                }
             }
         }
     }
diff --git a/services/core/java/com/android/server/power/ShutdownThread.java b/services/core/java/com/android/server/power/ShutdownThread.java
index 34b6e2b..36a9ca2 100644
--- a/services/core/java/com/android/server/power/ShutdownThread.java
+++ b/services/core/java/com/android/server/power/ShutdownThread.java
@@ -630,6 +630,16 @@ public final class ShutdownThread extends Thread {
             }
         };
 
+        final String cryptoStatus = SystemProperties.get("ro.crypto.state", "unsupported");
+        final boolean isEncrypted = "encrypted".equalsIgnoreCase(cryptoStatus);
+
+        if (mRebootUpdate && isEncrypted) {
+            sInstance.setRebootProgress(MOUNT_SERVICE_STOP_PERCENT, null);
+
+            // If it's to reboot to install update, invoke uncrypt via init service.
+            uncrypt();
+        }
+
         Log.i(TAG, "Shutting down MountService");
 
         // Set initial variables and time out time.
@@ -665,12 +675,6 @@ public final class ShutdownThread extends Thread {
                 }
             }
         }
-        if (mRebootUpdate) {
-            sInstance.setRebootProgress(MOUNT_SERVICE_STOP_PERCENT, null);
-
-            // If it's to reboot to install update, invoke uncrypt via init service.
-            uncrypt();
-        }
 
         rebootOrShutdown(mContext, mReboot, mRebootReason);
     }
@@ -1002,7 +1006,7 @@ public final class ShutdownThread extends Thread {
             if (context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
                 uiContext.setTheme(com.android.internal.R.style.Theme_Leanback_Dialog_Alert);
             } else  {
-                uiContext.setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+                uiContext.setTheme(com.android.internal.R.style.Theme_Power_Dialog);
             }
         }
         return uiContext != null ? uiContext : context;
diff --git a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
index e9ace29..0e51953 100644
--- a/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
+++ b/services/core/java/com/android/server/statusbar/StatusBarManagerService.java
@@ -249,7 +249,7 @@ public class StatusBarManagerService extends IStatusBarService.Stub {
      */
     @Override
     public void disable2(int what, IBinder token, String pkg) {
-        disableForUser(what, token, pkg, mCurrentUserId);
+        disable2ForUser(what, token, pkg, mCurrentUserId);
     }
 
     /**
diff --git a/services/core/java/com/android/server/wm/WindowAnimator.java b/services/core/java/com/android/server/wm/WindowAnimator.java
index 5de1837..362e959 100644
--- a/services/core/java/com/android/server/wm/WindowAnimator.java
+++ b/services/core/java/com/android/server/wm/WindowAnimator.java
@@ -30,6 +30,8 @@ import static com.android.server.wm.WindowManagerService.LayoutFields.SET_ORIENT
 import static com.android.server.wm.WindowManagerService.LayoutFields.SET_WALLPAPER_ACTION_PENDING;
 
 import android.content.Context;
+import android.database.ContentObserver;
+import android.os.Handler;
 import android.os.RemoteException;
 import android.util.Slog;
 import android.util.SparseArray;
@@ -44,6 +46,8 @@ import android.view.Choreographer;
 
 import com.android.server.wm.WindowManagerService.LayoutFields;
 
+import cyanogenmod.providers.CMSettings;
+
 import java.io.PrintWriter;
 import java.util.ArrayList;
 
@@ -98,7 +102,7 @@ public class WindowAnimator {
     /** Use one animation for all entering activities after keyguard is dismissed. */
     Animation mPostKeyguardExitAnimation;
 
-    private final boolean mBlurUiEnabled;
+    private boolean mKeyguardBlurEnabled;
 
     // forceHiding states.
     static final int KEYGUARD_NOT_SHOWN     = 0;
@@ -120,9 +124,14 @@ public class WindowAnimator {
         mContext = service.mContext;
         mPolicy = service.mPolicy;
 
-        mBlurUiEnabled = mContext.getResources().getBoolean(
+        boolean blurUiEnabled = mContext.getResources().getBoolean(
                 com.android.internal.R.bool.config_ui_blur_enabled);
 
+        if (blurUiEnabled) {
+            SettingsObserver observer = new SettingsObserver(new Handler());
+            observer.observe(mContext);
+        }
+
         mAnimationFrameCallback = new Choreographer.FrameCallback() {
             public void doFrame(long frameTimeNs) {
                 synchronized (mService.mWindowMap) {
@@ -211,7 +220,9 @@ public class WindowAnimator {
         // Show SHOW_WHEN_LOCKED windows that turn on the screen
         allowWhenLocked |= (win.mAttrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0 && win.mTurnOnScreen;
         // Show windows that use TYPE_STATUS_BAR_SUB_PANEL when locked
-        allowWhenLocked |= win.mAttrs.type == WindowManager.LayoutParams.TYPE_KEYGUARD_PANEL;
+        allowWhenLocked |= win.mAttrs.type == WindowManager.LayoutParams.TYPE_KEYGUARD_PANEL &&
+                winShowWhenLocked == null;
+
 
         if (appShowWhenLocked != null) {
             allowWhenLocked |= appShowWhenLocked == win.mAppToken
@@ -223,7 +234,14 @@ public class WindowAnimator {
 
         // Only hide windows if the keyguard is active and not animating away.
         boolean keyguardOn = mPolicy.isKeyguardShowingOrOccluded()
-                && (mForceHiding != KEYGUARD_ANIMATING_OUT && !mBlurUiEnabled);
+                && mForceHiding != KEYGUARD_ANIMATING_OUT;
+
+        final WindowState winKeyguardPanel = (WindowState) mPolicy.getWinKeyguardPanelLw();
+        // If a keyguard panel is currently being shown, we should
+        // continue to hide the windows as if blur is disabled.
+        if (winKeyguardPanel == null) {
+            keyguardOn &= !mKeyguardBlurEnabled;
+        }
         return keyguardOn && !allowWhenLocked && (win.getDisplayId() == Display.DEFAULT_DISPLAY);
     }
 
@@ -232,7 +250,7 @@ public class WindowAnimator {
 
         final WindowList windows = mService.getWindowListLocked(displayId);
 
-        if (mKeyguardGoingAway && !mBlurUiEnabled) {
+        if (mKeyguardGoingAway && !mKeyguardBlurEnabled) {
             for (int i = windows.size() - 1; i >= 0; i--) {
                 WindowState win = windows.get(i);
                 if (!mPolicy.isKeyguardHostWindow(win.mAttrs)) {
@@ -247,7 +265,7 @@ public class WindowAnimator {
                         // Create a new animation to delay until keyguard is gone on its own.
                         winAnimator.mAnimation = new AlphaAnimation(1.0f, 1.0f);
                         winAnimator.mAnimation.setDuration(
-                                mBlurUiEnabled ? 0 : KEYGUARD_ANIM_TIMEOUT_MS);
+                                mKeyguardBlurEnabled ? 0 : KEYGUARD_ANIM_TIMEOUT_MS);
                         winAnimator.mAnimationIsEntrance = false;
                         winAnimator.mAnimationStartTime = -1;
                         winAnimator.mKeyguardGoingAwayAnimation = true;
@@ -337,7 +355,7 @@ public class WindowAnimator {
                         if (nowAnimating && win.mWinAnimator.mKeyguardGoingAwayAnimation) {
                             mForceHiding = KEYGUARD_ANIMATING_OUT;
                         } else {
-                            mForceHiding = win.isDrawnLw()  && !mBlurUiEnabled ?
+                            mForceHiding = win.isDrawnLw()  && !mKeyguardBlurEnabled ?
                                 KEYGUARD_SHOWN : KEYGUARD_NOT_SHOWN;
                         }
                     }
@@ -890,4 +908,30 @@ public class WindowAnimator {
     private class DisplayContentsAnimator {
         ScreenRotationAnimation mScreenRotationAnimation = null;
     }
+
+    private class SettingsObserver extends ContentObserver {
+        public SettingsObserver(Handler handler) {
+            super(handler);
+        }
+
+        public void observe(Context context) {
+            context.getContentResolver().registerContentObserver(
+                    CMSettings.Secure.getUriFor(CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED),
+                    false,
+                    this);
+
+            onChange(true);
+        }
+
+        public void unobserve(Context context) {
+            context.getContentResolver().unregisterContentObserver(this);
+        }
+
+        @Override
+        public void onChange(boolean selfChange) {
+            // default to being enabled since we are here because the blur config was set to true
+            mKeyguardBlurEnabled = CMSettings.Secure.getInt(mContext.getContentResolver(),
+                    CMSettings.Secure.LOCK_SCREEN_BLUR_ENABLED, 1) == 1;
+        }
+    }
 }
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index dcb1e18..3d79757 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -29,6 +29,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.res.CompatibilityInfo;
 import android.content.res.Configuration;
@@ -65,6 +66,7 @@ import android.os.SystemProperties;
 import android.os.SystemService;
 import android.os.Trace;
 import android.os.UserHandle;
+import android.os.UserManager;
 import android.os.WorkSource;
 import android.provider.Settings;
 import android.util.ArraySet;
@@ -128,6 +130,8 @@ import com.android.server.UiThread;
 import com.android.server.Watchdog;
 import com.android.server.am.BatteryStatsService;
 import com.android.server.input.InputManagerService;
+import com.android.server.lights.Light;
+import com.android.server.lights.LightsManager;
 import com.android.server.policy.PhoneWindowManager;
 import com.android.server.power.ShutdownThread;
 
@@ -3162,7 +3166,9 @@ public class WindowManagerService extends IWindowManager.Stub
             }
 
             if (attrs != null) {
+                Binder.restoreCallingIdentity(origId);
                 mPolicy.adjustWindowParamsLw(attrs);
+                origId = Binder.clearCallingIdentity();
             }
 
             // if they don't have the permission, mask out the status bar bits
@@ -5928,6 +5934,17 @@ public class WindowManagerService extends IWindowManager.Stub
 
         mPolicy.enableScreenAfterBoot();
 
+        // clear any intrusive lighting which may still be on from the
+        // crypto landing ui
+        LightsManager lm = LocalServices.getService(LightsManager.class);
+        Light batteryLight = lm.getLight(LightsManager.LIGHT_ID_BATTERY);
+        Light notifLight = lm.getLight(LightsManager.LIGHT_ID_NOTIFICATIONS);
+        if (batteryLight != null) {
+            batteryLight.turnOff();
+        }
+        if (notifLight != null) {
+            notifLight.turnOff();
+        }
         // Make sure the last requested orientation has been applied.
         updateRotationUnchecked(false, false);
     }
@@ -5944,13 +5961,18 @@ public class WindowManagerService extends IWindowManager.Stub
         return true;
     }
 
-    public void showBootMessage(final CharSequence msg, final boolean always) {
+    public void updateBootProgress(final int stage, final ApplicationInfo optimizedApp,
+            final int currentAppPos, final int totalAppCount, final boolean always) {
         boolean first = false;
         synchronized(mWindowMap) {
             if (DEBUG_BOOT) {
                 RuntimeException here = new RuntimeException("here");
                 here.fillInStackTrace();
-                Slog.i(TAG, "showBootMessage: msg=" + msg + " always=" + always
+                Slog.i(TAG, "updateBootProgress: stage=" + stage
+                        + " optimizedApp=" + optimizedApp
+                        + " currentAppPos=" + currentAppPos
+                        + " totalAppCount=" + totalAppCount
+                        + " always=" + always
                         + " mAllowBootMessages=" + mAllowBootMessages
                         + " mShowingBootMessages=" + mShowingBootMessages
                         + " mSystemBooted=" + mSystemBooted, here);
@@ -5968,7 +5990,7 @@ public class WindowManagerService extends IWindowManager.Stub
                 return;
             }
             mShowingBootMessages = true;
-            mPolicy.showBootMessage(msg, always);
+            mPolicy.updateBootProgress(stage, optimizedApp, currentAppPos, totalAppCount);
         }
         if (first) {
             performEnableScreen();
@@ -7666,6 +7688,12 @@ public class WindowManagerService extends IWindowManager.Stub
                    + " milliseconds before attempting to detect safe mode.");
         }
 
+        UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        if (um != null && um.hasUserRestriction(UserManager.DISALLOW_SAFE_BOOT)) {
+            mSafeMode = false;
+            return false;
+        }
+
         int menuState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY,
                 KeyEvent.KEYCODE_MENU);
         int sState = mInputManager.getKeyCodeState(-1, InputDevice.SOURCE_ANY, KeyEvent.KEYCODE_S);
@@ -10166,6 +10194,7 @@ public class WindowManagerService extends IWindowManager.Stub
                             }
                         }
 
+                        winAnimator.computeShownFrameLocked();
                         winAnimator.setSurfaceBoundariesLocked(recoveringMemory);
                     }
 
@@ -11951,6 +11980,14 @@ public class WindowManagerService extends IWindowManager.Stub
         return mWindowMap;
     }
 
+    @Override
+    public void setLiveLockscreenEdgeDetector(boolean enable) {
+        if (mContext.checkCallingOrSelfPermission(android.Manifest.permission.STATUS_BAR)
+                == PackageManager.PERMISSION_GRANTED) {
+            mPolicy.setLiveLockscreenEdgeDetector(enable);
+        }
+    }
+
     private final class LocalService extends WindowManagerInternal {
         @Override
         public void requestTraversalFromDisplayManager() {
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 5169607..d19f8ac 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -18,6 +18,7 @@ package com.android.server;
 
 import android.app.ActivityManagerNative;
 import android.app.ActivityThread;
+import android.app.IActivityManager;
 import android.app.IAlarmManager;
 import android.app.INotificationManager;
 import android.app.usage.UsageStatsManagerInternal;
@@ -99,6 +100,9 @@ import cyanogenmod.providers.CMSettings;
 import dalvik.system.VMRuntime;
 
 import java.io.File;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -326,7 +330,7 @@ public final class SystemServer {
     private void createSystemContext() {
         ActivityThread activityThread = ActivityThread.systemMain();
         mSystemContext = activityThread.getSystemContext();
-        mSystemContext.setTheme(android.R.style.Theme_DeviceDefault_Light_DarkActionBar);
+        mSystemContext.setTheme(com.android.internal.R.style.Theme_Power_Dialog);
     }
 
     /**
@@ -455,8 +459,9 @@ public final class SystemServer {
         boolean disableNetwork = SystemProperties.getBoolean("config.disable_network", false);
         boolean disableNetworkTime = SystemProperties.getBoolean("config.disable_networktime", false);
         boolean isEmulator = SystemProperties.get("ro.kernel.qemu").equals("1");
-        String[] externalServices = context.getResources().getStringArray(
-                org.cyanogenmod.platform.internal.R.array.config_externalCMServices);
+        String externalServer = context.getResources().getString(
+                org.cyanogenmod.platform.internal.R.string.config_externalSystemServer);
+        boolean disableAtlas = SystemProperties.getBoolean("config.disable_atlas", false);
 
         try {
             Slog.i(TAG, "Reading configuration...");
@@ -616,10 +621,8 @@ public final class SystemServer {
         }
 
         try {
-            ActivityManagerNative.getDefault().showBootMessage(
-                    context.getResources().getText(
-                            com.android.internal.R.string.android_upgrading_starting_apps),
-                    false);
+            ActivityManagerNative.getDefault().updateBootProgress(
+                    IActivityManager.BOOT_STAGE_STARTING_APPS, null, 0, 0, false);
         } catch (RemoteException e) {
         }
 
@@ -957,7 +960,7 @@ public final class SystemServer {
                 mSystemServiceManager.startService(DreamManagerService.class);
             }
 
-            if (!disableNonCoreServices) {
+            if (!disableNonCoreServices && !disableAtlas) {
                 try {
                     Slog.i(TAG, "Assets Atlas Service");
                     atlas = new AssetAtlasService(context);
@@ -1052,13 +1055,22 @@ public final class SystemServer {
         // MMS service broker
         mmsService = mSystemServiceManager.startService(MmsServiceBroker.class);
 
-        for (String service : externalServices) {
-            try {
-                Slog.i(TAG, service);
-                mSystemServiceManager.startService(service);
-            } catch (Throwable e) {
-                reportWtf("starting " + service , e);
-            }
+        final Class<?> serverClazz;
+        try {
+            serverClazz = Class.forName(externalServer);
+            final Constructor<?> constructor = serverClazz.getDeclaredConstructor(Context.class);
+            constructor.setAccessible(true);
+            final Object baseObject = constructor.newInstance(mSystemContext);
+            final Method method = baseObject.getClass().getDeclaredMethod("run");
+            method.setAccessible(true);
+            method.invoke(baseObject);
+        } catch (ClassNotFoundException
+                | IllegalAccessException
+                | InvocationTargetException
+                | InstantiationException
+                | NoSuchMethodException e) {
+            Slog.wtf(TAG, "Unable to start  " + externalServer);
+            Slog.wtf(TAG, e);
         }
 
         // It is now time to start up the app processes...
@@ -1177,15 +1189,6 @@ public final class SystemServer {
                 Slog.i(TAG, "WebViewFactory preparation");
                 WebViewFactory.prepareWebViewInSystemServer();
 
-                // Start Nfc before SystemUi to ensure NfcTile and other apps gets a
-                // valid NfcAdapter from NfcManager
-                try {
-                    startNfcService(context);
-                } catch (Throwable e) {
-                    // Don't crash. Nfc is an optional service. Just annotate that isn't ready
-                    Slog.e(TAG, "Nfc service didn't start. Nfc will not be available.", e);
-                }
-
                 try {
                     startSystemUi(context);
                 } catch (Throwable e) {
@@ -1304,23 +1307,4 @@ public final class SystemServer {
         //Slog.d(TAG, "Starting service: " + intent);
         context.startServiceAsUser(intent, UserHandle.OWNER);
     }
-
-    static final void startNfcService(Context context) {
-        IPackageManager pm = ActivityThread.getPackageManager();
-        if (pm == null) {
-            Slog.w(TAG, "Cannot get package manager, assuming no NFC feature");
-            return;
-        }
-        try {
-            if (pm.hasSystemFeature(PackageManager.FEATURE_NFC)) {
-                Intent intent = new Intent();
-                intent.setComponent(new ComponentName("com.android.nfc",
-                            "com.android.nfc.NfcBootstrapService"));
-                context.startServiceAsUser(intent, UserHandle.OWNER);
-            }
-        } catch (RemoteException e) {
-            Slog.w(TAG, "Package manager query failed, assuming no NFC feature", e);
-            return;
-        }
-    }
 }
diff --git a/services/net/java/android/net/dhcp/DhcpPacket.java b/services/net/java/android/net/dhcp/DhcpPacket.java
index 8927bfa..f97df83 100644
--- a/services/net/java/android/net/dhcp/DhcpPacket.java
+++ b/services/net/java/android/net/dhcp/DhcpPacket.java
@@ -602,7 +602,12 @@ abstract class DhcpPacket {
     protected void addCommonClientTlvs(ByteBuffer buf) {
         addTlv(buf, DHCP_MAX_MESSAGE_SIZE, (short) MAX_LENGTH);
         addTlv(buf, DHCP_VENDOR_CLASS_ID, "android-dhcp-" + Build.VERSION.RELEASE);
-        addTlv(buf, DHCP_HOST_NAME, SystemProperties.get("net.hostname"));
+
+        /* the default 'android-dhcp' is there to make sure the hostname is
+         * never empty, because the DHCP standard forbids it (RFC2132, section
+         * 3.14) and certain DHCP forwarders and servers ignore such malformed
+         * requests */
+        addTlv(buf, DHCP_HOST_NAME, SystemProperties.get("net.hostname", "android-dhcp"));
     }
 
     /**
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
index 9c44c7a..aa8b37f 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageManagerSettingsTests.java
@@ -27,6 +27,7 @@ import android.content.res.AssetManager;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.SystemProperties;
+import android.os.UserHandle;
 import android.test.AndroidTestCase;
 import android.test.mock.MockContext;
 import android.text.TextUtils;
@@ -365,7 +366,7 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
         };
         Mockito.when(resources.getStringArray(R.array.config_restrict_to_region_locked_devices))
                 .thenReturn(regionRestrictedPackages);
-        assertFalse(settings.shouldPrebundledPackageBeInstalled(resources,
+        assertFalse(settings.shouldPrebundledPackageBeInstalledForRegion(resources,
                 expectedPackageNeededForRegion, resources));
     }
 
@@ -384,7 +385,70 @@ public class PackageManagerSettingsTests extends AndroidTestCase {
 
         Mockito.when(resources.getStringArray(R.array.config_restrict_to_region_locked_devices))
                 .thenReturn(regionLockedPackages);
-        assertTrue(settings.shouldPrebundledPackageBeInstalled(resources,
+        assertTrue(settings.shouldPrebundledPackageBeInstalledForRegion(resources,
                 expectedPackageNeededForRegion, resources));
     }
+
+    // Shamelessly kanged from KeySetManagerServiceTest
+    public PackageSetting generateFakePackageSetting(String name) {
+        return new PackageSetting(name, name, new File(mContext.getCacheDir(), "fakeCodePath"),
+                new File(mContext.getCacheDir(), "fakeResPath"), "", "", "",
+                "", 1, 0, 0);
+    }
+
+    // Checks if a package that was installed and currently isn't installed for the owner
+    // is accepted for a secondary user
+    public void testPrebundledSecondaryUserAccept() {
+        Settings settings = new Settings(getContext().getFilesDir());
+        String expectedPackageToBeInstalled = "org.cyanogenmod.secondaryuser.package";
+
+        PackageSetting packageSetting =
+                generateFakePackageSetting(expectedPackageToBeInstalled);
+
+        int userOwner = UserHandle.USER_OWNER;
+        int userSecondary = 1000;
+
+        // Return true that the package was installed for the owner at some point
+        settings.markPrebundledPackageInstalledLPr(userOwner, expectedPackageToBeInstalled);
+        assertTrue(settings.wasPrebundledPackageInstalledLPr(userOwner,
+                expectedPackageToBeInstalled));
+
+        // Return false that the package was installed for the secondary user at some point
+        // DON'T MARK PREBUNDLED PACKAGE INSTALLED
+
+        // Return false that the package is currently not installed for the owner
+        packageSetting.setInstalled(false, userOwner);
+        assertFalse(packageSetting.getInstalled(userOwner));
+
+        // Return false that the package is currently not installed for the secondary user
+        packageSetting.setInstalled(false, userSecondary);
+        assertFalse(packageSetting.getInstalled(userSecondary));
+
+        assertFalse(settings.shouldPrebundledPackageBeInstalledForUserLPr(packageSetting,
+                userSecondary, expectedPackageToBeInstalled));
+    }
+
+    // Checks if a package that was installed for a secondary user and currently isn't installed
+    // for the user is accepted to be reinstalled
+    public void testPrebundledSecondaryUserReinstallAccept() {
+        Settings settings = new Settings(getContext().getFilesDir());
+        String expectedPackageToBeInstalled = "org.cyanogenmod.secondaryuser.package";
+
+        PackageSetting packageSetting =
+                generateFakePackageSetting(expectedPackageToBeInstalled);
+
+        int userSecondary = 1000;
+
+        // Return true that the package was installed for the secondary user at some point
+        settings.markPrebundledPackageInstalledLPr(userSecondary, expectedPackageToBeInstalled);
+        assertTrue(settings.wasPrebundledPackageInstalledLPr(userSecondary,
+                expectedPackageToBeInstalled));
+
+        // Return false that the package is currently not installed for the secondary user
+        packageSetting.setInstalled(false, userSecondary);
+        assertFalse(packageSetting.getInstalled(userSecondary));
+
+        assertFalse(settings.shouldPrebundledPackageBeInstalledForUserLPr(packageSetting,
+                userSecondary, expectedPackageToBeInstalled));
+    }
 }
diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index b275c2f..583bac2 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -219,7 +219,7 @@ public class UsageStatsService extends SystemService implements
                     Context.DISPLAY_SERVICE);
             mPowerManager = getContext().getSystemService(PowerManager.class);
 
-            mDisplayManager.registerDisplayListener(mDisplayListener, mHandler);
+            mDisplayManager.registerDisplayListener(mDisplayListener, null);
             synchronized (this) {
                 updateDisplayLocked();
             }
diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
index 3fecfb6..2886ce6 100644
--- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java
+++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java
@@ -580,7 +580,13 @@ public class UsbDeviceManager {
 
             if (mConfigured && enteringAccessoryMode) {
                 // successfully entered accessory mode
-
+                if (mCurrentAccessory != null) {
+                    Slog.w(TAG, "USB accessory re-attached, detach was not announced!");
+                    if (mBootCompleted) {
+                        getCurrentSettings().accessoryDetached(mCurrentAccessory);
+                    }
+                    mCurrentAccessory = null;
+                }
                 if (mAccessoryStrings != null) {
                     mCurrentAccessory = new UsbAccessory(mAccessoryStrings);
                     Slog.d(TAG, "entering USB accessory mode: " + mCurrentAccessory);
@@ -895,6 +901,7 @@ public class UsbDeviceManager {
         private String getDefaultFunctions() {
             String func = SystemProperties.get(USB_PERSISTENT_CONFIG_PROPERTY,
                     UsbManager.USB_FUNCTION_NONE);
+            func = UsbManager.removeFunction(func, "charging");
             if (UsbManager.USB_FUNCTION_NONE.equals(func)) {
                 func = UsbManager.USB_FUNCTION_MTP;
             }
diff --git a/telecomm/java/android/telecom/Call.java b/telecomm/java/android/telecom/Call.java
index 8af52f2..438e7bb 100644
--- a/telecomm/java/android/telecom/Call.java
+++ b/telecomm/java/android/telecom/Call.java
@@ -832,6 +832,16 @@ public final class Call {
     }
 
     /**
+     * Instructs this {@link #STATE_RINGING} {@code Call} to answer.
+     * @param videoState The video state in which to answer the call.
+     * @param callWaitingResponseType Type of response for call waiting
+     * @hide
+     */
+    public void answer(int videoState, int callWaitingResponseType) {
+        mInCallAdapter.answerCall(mTelecomCallId, videoState, callWaitingResponseType);
+    }
+
+    /**
      * Instructs this {@link #STATE_RINGING} {@code Call} to reject.
      *
      * @param rejectWithMessage Whether to reject with a text message.
@@ -1172,6 +1182,7 @@ public final class Call {
                 && !parcelableCall.getCannedSmsResponses().isEmpty()) {
             mCannedTextResponses =
                     Collections.unmodifiableList(parcelableCall.getCannedSmsResponses());
+            cannedTextResponsesChanged = true;
         }
 
         boolean videoCallChanged = parcelableCall.isVideoCallProviderChanged() &&
diff --git a/telecomm/java/android/telecom/InCallAdapter.java b/telecomm/java/android/telecom/InCallAdapter.java
index 8eb62ec..d660f59 100644
--- a/telecomm/java/android/telecom/InCallAdapter.java
+++ b/telecomm/java/android/telecom/InCallAdapter.java
@@ -57,6 +57,20 @@ public final class InCallAdapter {
     }
 
     /**
+     * Instructs Telecom to answer the specified call.
+     *
+     * @param callId The identifier of the call to answer.
+     * @param videoState The video state in which to answer the call.
+     * @param callWaitingResponseType Response type for call waiting.
+     */
+    public void answerCall(String callId, int videoState, int callWaitingResponseType) {
+        try {
+            mAdapter.answerCallWithCallWaitingResponse(callId, videoState, callWaitingResponseType);
+        } catch (RemoteException e) {
+        }
+    }
+
+    /**
      * Instructs Telecom to reject the specified call.
      *
      * @param callId The identifier of the call to reject.
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index ae7c18e..ca9792b 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -443,6 +443,25 @@ public class TelecomManager {
      */
     public static final int PRESENTATION_PAYPHONE = 4;
 
+    /**
+     * The following 2 constants define how the incoming call should be handled by the Telecomm
+     * server when there is already an active call.
+     */
+
+    /**
+     * Indicates that Telecom server should end the current active call when another incoming
+     * call is detected
+     * @hide
+     */
+    public static final int CALL_WAITING_RESPONSE_NO_POPUP_END_CALL = 1;
+
+    /**
+     * Indicates that Telecom server should  hold the current active call when another incoming
+     * call is detected
+     * @hide
+     */
+    public static final int CALL_WAITING_RESPONSE_NO_POPUP_HOLD_CALL = 2;
+
     private static final String TAG = "TelecomManager";
 
     private final Context mContext;
diff --git a/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl b/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl
index 6ef8eda..3104fb2 100644
--- a/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl
+++ b/telecomm/java/com/android/internal/telecom/IInCallAdapter.aidl
@@ -64,4 +64,7 @@ oneway interface IInCallAdapter {
     void switchToOtherActiveSub(String subId);
 
     void transferCall(String callId);
+
+    void answerCallWithCallWaitingResponse(String callId, int videoState, int
+        callWaitingResponseType);
 }
diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java
index e1deb98..bd6662d 100644
--- a/telephony/java/android/telephony/CarrierConfigManager.java
+++ b/telephony/java/android/telephony/CarrierConfigManager.java
@@ -422,6 +422,13 @@ public class CarrierConfigManager {
     public static final String KEY_HIDE_IMS_APN_BOOL = "hide_ims_apn_bool";
 
     /**
+     * Determine whether HD icon should displayed when audio codec is EVS.
+     * @hide
+     */
+    public static final String KEY_IMS_SUPPORT_EVS_HD_ICON_BOOL =
+            "carrier_ims_support_evs_hd_icon_bool";
+
+    /**
      * Determine whether preferred network type can be shown.
      * @hide
      */
@@ -543,7 +550,7 @@ public class CarrierConfigManager {
         sDefaults.putBoolean(KEY_SHOW_CDMA_CHOICES_BOOL, false);
         sDefaults.putBoolean(KEY_SHOW_ONSCREEN_DIAL_BUTTON_BOOL, true);
         sDefaults.putBoolean(KEY_SIM_NETWORK_UNLOCK_ALLOW_DISMISS_BOOL, true);
-        sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, true);
+        sDefaults.putBoolean(KEY_SUPPORT_PAUSE_IMS_VIDEO_CALLS_BOOL, false);
         sDefaults.putBoolean(KEY_SUPPORT_SWAP_AFTER_MERGE_BOOL, true);
         sDefaults.putBoolean(KEY_USE_HFA_FOR_PROVISIONING_BOOL, false);
         sDefaults.putBoolean(KEY_USE_OTASP_FOR_PROVISIONING_BOOL, false);
@@ -576,6 +583,7 @@ public class CarrierConfigManager {
         sDefaults.putBoolean(KEY_SUPPORT_CONFERENCE_CALL_BOOL, true);
         sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true);
         sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false);
+        sDefaults.putBoolean(KEY_IMS_SUPPORT_EVS_HD_ICON_BOOL, false);
         sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false);
         sDefaults.putBoolean(KEY_EDITABLE_WFC_MODE_BOOL, true);
         sDefaults.putInt(KEY_CDMA_DTMF_TONE_DELAY_INT, 100);
diff --git a/telephony/java/android/telephony/PhoneNumberUtils.java b/telephony/java/android/telephony/PhoneNumberUtils.java
index 5ee1fb2..a70233f 100644
--- a/telephony/java/android/telephony/PhoneNumberUtils.java
+++ b/telephony/java/android/telephony/PhoneNumberUtils.java
@@ -1935,11 +1935,13 @@ public class PhoneNumberUtils
                 // It is not possible to append additional digits to an emergency number to dial
                 // the number in Brazil - it won't connect.
                 if (useExactMatch || "BR".equalsIgnoreCase(defaultCountryIso)) {
-                    if (number.equals(emergencyNum)) {
+                    if (number.equals(emergencyNum) &&
+                        isEmergencyNumberForCurrentIso(number, defaultCountryIso, slotId))  {
                         return true;
                     }
                 } else {
-                    if (number.startsWith(emergencyNum)) {
+                    if (number.startsWith(emergencyNum) &&
+                        isEmergencyNumberForCurrentIso(number, defaultCountryIso, slotId))  {
                         return true;
                     }
                 }
@@ -1982,6 +1984,57 @@ public class PhoneNumberUtils
     }
 
     /**
+     * When checking for ECC numbers the country (defaultCountryIso) passed in is not taken into
+     * consideration by the function isEmergencyNumberInternal(subId, number, defaultCountryIso,
+     * useExactMatchecclist) this causes the function to return TRUE even in the case when the
+     * number is not emergency for defaultCountryIso.
+     */
+     private static boolean isEmergencyNumberForCurrentIso(String number,
+                                                     String country,
+                                                     int slotId) {
+         Rlog.w(LOG_TAG, "isEmergencyNumberForCurrentIso: number =" + number + " iso=" + country);
+
+         String mccEccIso = "";
+         String mccEccIsoProp = (slotId == 0) ? "ril.mcc.ecc.iso" : ("ril.mcc.ecc.iso" + slotId);
+         mccEccIso = SystemProperties.get(mccEccIsoProp, "");
+
+         if (TextUtils.isEmpty(mccEccIso) || TextUtils.isEmpty(country) || slotId < 0 ||
+             isEmergencyIsoMatchCountryIso(mccEccIso, country)) {
+             Rlog.w(LOG_TAG, "MCC/ISO is empty or matches region for ECC#'s set via RIL db");
+             return true;
+         }
+
+         String mccEccList = "";
+         String mccEccListProp = (slotId == 0) ? "ril.mcc.ecclist" : ("ril.mcc.ecclist" + slotId);
+         mccEccList = SystemProperties.get(mccEccListProp, "");
+
+         if (!TextUtils.isEmpty(mccEccList)) {
+             for (String emergencyNum : mccEccList.split(",")) {
+                 if (number.equals(emergencyNum)) {
+                     Rlog.w(LOG_TAG, "Number " + number + " matches with  " + mccEccListProp);
+                     return false;
+                 }
+             }
+         }
+
+         return true;
+     }
+
+     /**
+      * Checks if the two strings passed are equal ignoring the case
+      */
+      private static boolean isEmergencyIsoMatchCountryIso(String iso, String country) {
+         Rlog.w(LOG_TAG, "isEmergencyIsoMatchCountryIso: iso=" + iso + " country=" + country);
+
+         if(iso.equalsIgnoreCase(country)) {
+             return true;
+         } else {
+             return false;
+         }
+
+      }
+
+    /**
      * Checks if a given number is an emergency number for the country that the user is in.
      *
      * @param number the number to look up.
diff --git a/telephony/java/android/telephony/SubscriptionManager.java b/telephony/java/android/telephony/SubscriptionManager.java
index 86021e0..3b375e2 100644
--- a/telephony/java/android/telephony/SubscriptionManager.java
+++ b/telephony/java/android/telephony/SubscriptionManager.java
@@ -1397,7 +1397,7 @@ public class SubscriptionManager {
         newConfig.setTo(config);
         if (subInfo != null) {
             newConfig.mcc = subInfo.getMcc();
-            newConfig.mnc = subInfo.getMnc();
+            newConfig.mnc = subInfo.getMnc() == 0 ? Configuration.MNC_ZERO : subInfo.getMnc();
         }
         DisplayMetrics metrics = context.getResources().getDisplayMetrics();
         DisplayMetrics newMetrics = new DisplayMetrics();
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index 7afaf7e..5ec6950 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -3069,6 +3069,50 @@ public class TelephonyManager {
     }
 
     /**
+     * Opens a logical channel to the ICC card
+     *
+     * Input parameters equivalent to TS 27.007 AT+CCHO command.
+     *
+     * @param AID application id. See ETSI 102.221 and 101.220.
+     * @param p2  byte P2 parameter
+     * @return an IccOpenLogicalChannelResponse object
+     * @hide
+     */
+    public IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID, byte p2) {
+        try {
+            ITelephony telephony = getITelephony();
+            if (telephony != null) {
+               return telephony.iccOpenLogicalChannelWithP2(AID, p2);
+            }
+        } catch (RemoteException ex) {
+        } catch (NullPointerException ex) {
+        }
+        return null;
+    }
+
+    /**
+     * Opens a logical channel to the ICC card for the given subId
+     *
+     * @param subId subid to send the command to
+     * @param AID applcation id. See ETSI 102.221 and 101.220.
+     * @param p2 byte P2 parameter
+     * @return an IccOpenLogicalChannelResponse object
+     * @hide
+     */
+    public IccOpenLogicalChannelResponse iccOpenLogicalChannel(int subId,
+                String AID, byte p2) {
+        try {
+            ITelephony telephony = getITelephony();
+            if (telephony != null) {
+                return telephony.iccOpenLogicalChannelUsingSubIdWithP2(subId, AID, p2);
+            }
+        } catch (RemoteException ex) {
+        } catch (NullPointerException ex) {
+        }
+        return null;
+    }
+
+    /**
      * Closes a previously opened logical channel to the ICC card.
      *
      * Input parameters equivalent to TS 27.007 AT+CCHC command.
diff --git a/telephony/java/com/android/internal/telephony/IExtTelephony.aidl b/telephony/java/com/android/internal/telephony/IExtTelephony.aidl
index f98a0d8..7040f80 100644
--- a/telephony/java/com/android/internal/telephony/IExtTelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/IExtTelephony.aidl
@@ -123,4 +123,49 @@ interface IExtTelephony {
     * @return true or false
     */
     boolean isFdnEnabled();
+
+    /**
+    * Get application count from card.
+    * @param - slotId user preferred slotId
+    * @return application count
+    */
+    int getUiccApplicationCount(int slotId);
+
+    /**
+    * Get application type by index.
+    * @param - slotId user preferred slotId
+    *        - appIndex application index
+    * @return application type as Integer, below are
+    *     supported return values:
+    *     '0' - APPTYPE_UNKNOWN
+    *     '1' - APPTYPE_SIM
+    *     '2' - APPTYPE_USIM
+    *     '3  - APPTYPE_RUIM
+    *     '4' - APPTYPE_CSIM
+    *     '5' - APPTYPE_ISIM
+    */
+    int getUiccApplicationType(int slotId, int appIndex);
+
+    /**
+    * Get application state by index.
+    * @param - slotId user preferred slotId
+    *        - appIndex application index
+    * @return application state as Integer, below are
+    *     supported return values:
+    *     '0' - APPSTATE_UNKNOWN
+    *     '1' - APPSTATE_DETECTED
+    *     '2' - APPSTATE_PIN
+    *     '3  - APPSTATE_PUK
+    *     '4' - APPSTATE_SUBSCRIPTION_PERSO
+    *     '5' - APPSTATE_READY
+    */
+    int getUiccApplicationState(int slotId, int appIndex);
+
+    /**
+    * Get primary stack phone id.
+    * @param - void
+    * @return phone id
+    */
+    int getPrimaryStackPhoneId();
+
 }
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index c3db8c2..291ce27 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -570,6 +570,16 @@ interface ITelephony {
      */
     IccOpenLogicalChannelResponse iccOpenLogicalChannel(String AID);
 
+    /**
+     * Opens a logical channel to the ICC card.
+     *
+     * Input parameters equivalent to TS 27.007 AT+CCHO command.
+     *
+     * @param p2 P2 parameter
+     * @param AID Application id.
+     * @return an IccOpenLogicalChannelResponse object.
+     */
+    IccOpenLogicalChannelResponse iccOpenLogicalChannelWithP2(String AID, byte p2);
 
     /**
      * Opens a logical channel to the ICC card for a particular subId.
@@ -583,6 +593,16 @@ interface ITelephony {
     IccOpenLogicalChannelResponse iccOpenLogicalChannelUsingSubId(int subId, String AID);
 
     /**
+     * Opens a logical channel to the ICC card for a particular subID
+     *
+     * @param subId user preferred subId.
+     * @param p2 P2 parameter
+     * @param AID Application id. See ETSI 102.221 and 101.220
+     */
+    IccOpenLogicalChannelResponse iccOpenLogicalChannelUsingSubIdWithP2(int subId,
+        String AID, byte p2);
+
+    /**
      * Closes a previously opened logical channel to the ICC card.
      *
      * Input parameters equivalent to TS 27.007 AT+CCHC command.
diff --git a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
index 76b69ce..ecb7dfe 100644
--- a/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephonyRegistry.aidl
@@ -61,6 +61,8 @@ interface ITelephonyRegistry {
     void notifyCellInfo(in List<CellInfo> cellInfo);
     void notifyPreciseCallState(int ringingCallState, int foregroundCallState,
             int backgroundCallState);
+    void notifyPreciseCallStateForSubscriber(int subId, int ringingCallState,
+            int foregroundCallState, int backgroundCallState);
     void notifyDisconnectCause(int disconnectCause, int preciseDisconnectCause);
     void notifyPreciseDataConnectionFailed(String reason, String apnType, String apn,
             String failCause);
diff --git a/telephony/java/com/android/internal/telephony/PhoneConstants.java b/telephony/java/com/android/internal/telephony/PhoneConstants.java
index e612be3..ca3c8a8 100755
--- a/telephony/java/com/android/internal/telephony/PhoneConstants.java
+++ b/telephony/java/com/android/internal/telephony/PhoneConstants.java
@@ -200,4 +200,7 @@ public class PhoneConstants {
     public static final int AUDIO_OUTPUT_ENABLE_SPEAKER = 0;
     public static final int AUDIO_OUTPUT_DISABLE_SPEAKER = 1;
     public static final int AUDIO_OUTPUT_DEFAULT = AUDIO_OUTPUT_ENABLE_SPEAKER;
+
+    /** Copied from ContactsCommon. See comments in ContactsCommon app for more detail. */
+    public static final String EXTRA_CALL_ORIGIN = "com.android.phone.CALL_ORIGIN";
 }
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index af79ff8..216dd38 100755
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -335,6 +335,8 @@ cat include/telephony/ril.h | \
     int RIL_REQUEST_PULL_LCEDATA = 134;
     int RIL_REQUEST_GET_ACTIVITY_INFO = 135;
     int RIL_REQUEST_SIM_GET_ATR = 136;
+    int RIL_REQUEST_CAF_SIM_OPEN_CHANNEL_WITH_P2 = 137;
+    int RIL_REQUEST_SET_MAX_TRANSMIT_POWER = 139;
 
     int RIL_UNSOL_RESPONSE_BASE = 1000;
     int RIL_UNSOL_RESPONSE_RADIO_STATE_CHANGED = 1000;
diff --git a/test-runner/src/android/test/mock/MockPackageManager.java b/test-runner/src/android/test/mock/MockPackageManager.java
index d3e2bfd..bd0a89a 100644
--- a/test-runner/src/android/test/mock/MockPackageManager.java
+++ b/test-runner/src/android/test/mock/MockPackageManager.java
@@ -904,7 +904,8 @@ public class MockPackageManager extends PackageManager {
      * @hide
      */
     @Override
-    public boolean isComponentProtected(String callingPackage, ComponentName componentName) {
+    public boolean isComponentProtected(String callingPackage, int callingUid,
+            ComponentName componentName) {
         throw new UnsupportedOperationException();
     }
 
diff --git a/tools/aapt/Android.mk b/tools/aapt/Android.mk
index 68c2fe8f..ee26729 100644
--- a/tools/aapt/Android.mk
+++ b/tools/aapt/Android.mk
@@ -63,8 +63,8 @@ aaptHostLdLibs :=
 aaptHostStaticLibs := \
     libandroidfw \
     libpng \
-    liblog \
     libutils \
+    liblog \
     libcutils \
     libexpat \
     libziparchive-host \
diff --git a/tools/aapt2/Util.cpp b/tools/aapt2/Util.cpp
index 03ecd1a..5b064e3 100644
--- a/tools/aapt2/Util.cpp
+++ b/tools/aapt2/Util.cpp
@@ -303,8 +303,10 @@ std::string utf16ToUtf8(const StringPiece16& utf16) {
     }
 
     std::string utf8;
+    // Make room for '\0' explicitly.
+    utf8.resize(utf8Length + 1);
+    utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin(), utf8Length + 1);
     utf8.resize(utf8Length);
-    utf16_to_utf8(utf16.data(), utf16.length(), &*utf8.begin());
     return utf8;
 }
 
diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp
index cd4fbe5..d37a946 100644
--- a/tools/aidl/aidl.cpp
+++ b/tools/aidl/aidl.cpp
@@ -345,6 +345,13 @@ gather_types(const char* filename, document_item_type* items)
                                         name, Type::GENERATED, false, false, false,
                                         filename, c->name.lineno);
                 NAMES.Add(proxy);
+
+                name = c->name.data;
+                name += ".NoOp";
+                Type* noOp = new Type(c->package ? c->package : "",
+                                        name, Type::GENERATED, false, false, false,
+                                        filename, c->name.lineno);
+                NAMES.Add(noOp);
             }
             else if (items->item_type == INTERFACE_TYPE_RPC) {
                 // for interfaces, also add the service base type, we don't
@@ -1064,8 +1071,13 @@ compile_aidl(Options& options)
     // make sure the folders of the output file all exists
     check_outputFilePath(options.outputFileName);
 
+    int flags = 0;
+    if (options.generateNoOpMethods) {
+        flags |= GENERATE_NO_OP_CLASS;
+    }
+
     err = generate_java(options.outputFileName, options.inputFileName.c_str(),
-                        (interface_type*)mainDoc);
+                        (interface_type*)mainDoc, flags);
 
     return err;
 }
diff --git a/tools/aidl/generate_java.cpp b/tools/aidl/generate_java.cpp
index 9e57407..8817461 100644
--- a/tools/aidl/generate_java.cpp
+++ b/tools/aidl/generate_java.cpp
@@ -59,12 +59,12 @@ append(const char* a, const char* b)
 // =================================================
 int
 generate_java(const string& filename, const string& originalSrc,
-                interface_type* iface)
+                interface_type* iface, int flags)
 {
     Class* cl;
 
     if (iface->document_item.item_type == INTERFACE_TYPE_BINDER) {
-        cl = generate_binder_interface_class(iface);
+        cl = generate_binder_interface_class(iface, flags);
     }
     else if (iface->document_item.item_type == INTERFACE_TYPE_RPC) {
         cl = generate_rpc_interface_class(iface);
diff --git a/tools/aidl/generate_java.h b/tools/aidl/generate_java.h
index 4bfcfeb..45b2703 100644
--- a/tools/aidl/generate_java.h
+++ b/tools/aidl/generate_java.h
@@ -9,9 +9,9 @@
 using namespace std;
 
 int generate_java(const string& filename, const string& originalSrc,
-                interface_type* iface);
+                interface_type* iface, int flags);
 
-Class* generate_binder_interface_class(const interface_type* iface);
+Class* generate_binder_interface_class(const interface_type* iface, int flags);
 Class* generate_rpc_interface_class(const interface_type* iface);
 
 string gather_comments(extra_text_type* extra);
@@ -29,5 +29,8 @@ private:
     int m_index;
 };
 
+//Set of flags that can be passed to generate_java
+#define GENERATE_NO_OP_CLASS 1 << 0
+
 #endif // GENERATE_JAVA_H
 
diff --git a/tools/aidl/generate_java_binder.cpp b/tools/aidl/generate_java_binder.cpp
index 1b538ca..48ac027 100644
--- a/tools/aidl/generate_java_binder.cpp
+++ b/tools/aidl/generate_java_binder.cpp
@@ -194,6 +194,36 @@ ProxyClass::~ProxyClass()
 }
 
 // =================================================
+class DefaultNoOpClass : public Class {
+public:
+    DefaultNoOpClass(Type* type, InterfaceType* interfaceType);
+    virtual ~DefaultNoOpClass();
+};
+
+DefaultNoOpClass::DefaultNoOpClass(Type* type, InterfaceType* interfaceType)
+    :Class()
+{
+    this->comment = "/** No-Op implementation  */";
+    this->comment += "\n/** @hide */";
+    this->modifiers = PUBLIC | STATIC;
+    this->what = Class::CLASS;
+    this->type = type;
+    this->interfaces.push_back(interfaceType);
+
+    // IBinder asBinder()
+    Method* asBinder = new Method;
+        asBinder->modifiers = PUBLIC | OVERRIDE;
+        asBinder->returnType = IBINDER_TYPE;
+        asBinder->name = "asBinder";
+        asBinder->statements = new StatementBlock;
+    asBinder->statements->Add(new ReturnStatement(NULL_VALUE));
+    this->elements.push_back(asBinder);
+}
+
+DefaultNoOpClass::~DefaultNoOpClass() {
+}
+
+// =================================================
 static void
 generate_new_array(Type* t, StatementBlock* addTo, Variable* v,
                             Variable* parcel)
@@ -245,10 +275,24 @@ generate_read_from_parcel(Type* t, StatementBlock* addTo, Variable* v,
     }
 }
 
+static bool
+is_numeric_java_type(const char* str) {
+    static const char* KEYWORDS[] = { "int", "byte", "char", "float", "double",
+        "short", "long", NULL };
+    const char** k = KEYWORDS;
+    while (*k) {
+        if (0 == strcmp(str, *k)) {
+            return true;
+        }
+        k++;
+    }
+    return false;
+}
 
 static void
 generate_method(const method_type* method, Class* interface,
-                    StubClass* stubClass, ProxyClass* proxyClass, int index)
+                    StubClass* stubClass, ProxyClass* proxyClass, DefaultNoOpClass* noOpClass,
+                    int index)
 {
     arg_type* arg;
     int i;
@@ -294,6 +338,39 @@ generate_method(const method_type* method, Class* interface,
 
     interface->elements.push_back(decl);
 
+    // == the no-op method ===================================================
+    if (noOpClass != NULL) {
+        Method* noOpMethod = new Method;
+            noOpMethod->comment = gather_comments(method->comments_token->extra);
+            noOpMethod->modifiers = OVERRIDE | PUBLIC;
+            noOpMethod->returnType = NAMES.Search(method->type.type.data);
+            noOpMethod->returnTypeDimension = method->type.dimension;
+            noOpMethod->name = method->name.data;
+            noOpMethod->statements = new StatementBlock;
+
+        arg = method->args;
+        while (arg != NULL) {
+            noOpMethod->parameters.push_back(new Variable(
+                                NAMES.Search(arg->type.type.data), arg->name.data,
+                                arg->type.dimension));
+            arg = arg->next;
+        }
+
+        if (0 != strcmp(method->type.type.data, "void")) {
+            bool isNumeric = is_numeric_java_type(method->type.type.data);
+            bool isBoolean = 0 == strcmp(method->type.type.data, "boolean");
+
+            if (isNumeric && method->type.dimension == 0) {
+                noOpMethod->statements->Add(new ReturnStatement(new LiteralExpression("0")));
+            } else if (isBoolean && method->type.dimension == 0) {
+                noOpMethod->statements->Add(new ReturnStatement(FALSE_VALUE));
+            } else {
+                noOpMethod->statements->Add(new ReturnStatement(NULL_VALUE));
+            }
+        }
+    noOpMethod->exceptions.push_back(REMOTE_EXCEPTION_TYPE);
+    noOpClass->elements.push_back(noOpMethod);
+    }
     // == the stub method ====================================================
 
     Case* c = new Case(transactCodeName);
@@ -520,7 +597,7 @@ generate_interface_descriptors(StubClass* stub, ProxyClass* proxy)
 }
 
 Class*
-generate_binder_interface_class(const interface_type* iface)
+generate_binder_interface_class(const interface_type* iface, int flags)
 {
     InterfaceType* interfaceType = static_cast<InterfaceType*>(
         NAMES.Find(iface->package, iface->name.data));
@@ -533,6 +610,15 @@ generate_binder_interface_class(const interface_type* iface)
         interface->type = interfaceType;
         interface->interfaces.push_back(IINTERFACE_TYPE);
 
+    // the No-Op inner class
+    DefaultNoOpClass* noOpClass = NULL;
+    if ((flags & GENERATE_NO_OP_CLASS) != 0) {
+        noOpClass = new DefaultNoOpClass(
+            NAMES.Find(iface->package, append(iface->name.data, ".NoOp").c_str()),
+            interfaceType);
+        interface->elements.push_back(noOpClass);
+    }
+
     // the stub inner class
     StubClass* stub = new StubClass(
         NAMES.Find(iface->package, append(iface->name.data, ".Stub").c_str()),
@@ -555,7 +641,8 @@ generate_binder_interface_class(const interface_type* iface)
     while (item != NULL) {
         if (item->item_type == METHOD_TYPE) {
             method_type * method_item = (method_type*) item;
-            generate_method(method_item, interface, stub, proxy, method_item->assigned_id);
+            generate_method(method_item, interface, stub, proxy, noOpClass,
+                method_item->assigned_id);
         }
         item = item->next;
         index++;
diff --git a/tools/aidl/options.cpp b/tools/aidl/options.cpp
index 7b2daeb..9de1957 100644
--- a/tools/aidl/options.cpp
+++ b/tools/aidl/options.cpp
@@ -51,6 +51,7 @@ parse_options(int argc, const char* const* argv, Options *options)
     options->task = COMPILE_AIDL;
     options->failOnParcelable = false;
     options->autoDepFile = false;
+    options->generateNoOpMethods = false;
 
     // OPTIONS
     while (i < argc) {
@@ -97,6 +98,9 @@ parse_options(int argc, const char* const* argv, Options *options)
                 else if (len == 2 && s[1] == 'b') {
                     options->failOnParcelable = true;
                 }
+                else if (s[1] == 'n') {
+                    options->generateNoOpMethods = true;
+                }
                 else {
                     // s[1] is not known
                     fprintf(stderr, "unknown option (%d): %s\n", i, s);
diff --git a/tools/aidl/options.h b/tools/aidl/options.h
index 387e37d..969cc1c 100644
--- a/tools/aidl/options.h
+++ b/tools/aidl/options.h
@@ -24,6 +24,7 @@ struct Options
     string outputBaseFolder;
     string depFileName;
     bool autoDepFile;
+    bool generateNoOpMethods;
 
     vector<string> filesToPreprocess;
 };
diff --git a/tools/split-select/Android.mk b/tools/split-select/Android.mk
index d9ddf08..54f0a1f 100644
--- a/tools/split-select/Android.mk
+++ b/tools/split-select/Android.mk
@@ -48,8 +48,8 @@ hostStaticLibs := \
     libaapt \
     libandroidfw \
     libpng \
-    liblog \
     libutils \
+    liblog \
     libcutils \
     libexpat \
     libziparchive-host \
diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
index 59b22bd..a337755 100644
--- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
+++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java
@@ -768,7 +768,9 @@ public class WifiEnterpriseConfig implements Parcelable {
     public String toString() {
         StringBuffer sb = new StringBuffer();
         for (String key : mFields.keySet()) {
-            sb.append(key).append(" ").append(mFields.get(key)).append("\n");
+            // Don't display password in toString().
+            String value = PASSWORD_KEY.equals(key) ? "<removed>" : mFields.get(key);
+            sb.append(key).append(" ").append(value).append("\n");
         }
         return sb.toString();
     }